From: Paul RASCLE Date: Sun, 16 Aug 2020 10:27:03 +0000 (+0200) Subject: fix warnings on tutorial build X-Git-Tag: SH_V2_2_0~81 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d5c9104a9d29bd86fa1d049a271654298bdd46af;p=modules%2Fhydro.git fix warnings on tutorial build --- diff --git a/doc/salome/tutorial/CMakeLists.txt b/doc/salome/tutorial/CMakeLists.txt index ff18d506..014553e0 100644 --- a/doc/salome/tutorial/CMakeLists.txt +++ b/doc/salome/tutorial/CMakeLists.txt @@ -44,8 +44,7 @@ SET(RSTFILES SET(SPHINXOPTS ) SET(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(PAPEROPT_a4 -D latex_paper_size=a4) -SET(ALLSPHINXOPTS -d doctrees ${PAPEROPT_a4} ${SPHINXOPTS} ${SOURCEDIR}) +SET(ALLSPHINXOPTS -d doctrees ${SPHINXOPTS} ${SOURCEDIR}) # install user's documentation diff --git a/doc/salome/tutorial/conf.py.in b/doc/salome/tutorial/conf.py.in index 61af32dd..81d74c52 100644 --- a/doc/salome/tutorial/conf.py.in +++ b/doc/salome/tutorial/conf.py.in @@ -186,7 +186,6 @@ htmlhelp_basename = 'module_HYDRO_tutoriel' latex_elements = { # The paper size ('letter' or 'a4'). -#latex_paper_size = 'a4' 'papersize': 'a4paper', # The font size ('10pt', '11pt' or '12pt'). diff --git a/doc/salome/tutorial/english/CMakeLists.txt b/doc/salome/tutorial/english/CMakeLists.txt index 45a9984e..8c510ddc 100644 --- a/doc/salome/tutorial/english/CMakeLists.txt +++ b/doc/salome/tutorial/english/CMakeLists.txt @@ -44,8 +44,7 @@ SET(RSTFILES SET(SPHINXOPTS ) SET(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(PAPEROPT_a4 -D latex_paper_size=a4) -SET(ALLSPHINXOPTS -d doctrees ${PAPEROPT_a4} ${SPHINXOPTS} ${SOURCEDIR}) +SET(ALLSPHINXOPTS -d doctrees ${SPHINXOPTS} ${SOURCEDIR}) # install user's documentation diff --git a/doc/salome/tutorial/english/english_casCalcul.rst b/doc/salome/tutorial/english/english_casCalcul.rst index 99190b00..f292b558 100644 --- a/doc/salome/tutorial/english/english_casCalcul.rst +++ b/doc/salome/tutorial/english/english_casCalcul.rst @@ -20,122 +20,122 @@ Calculation case set-up ######################################### -.. |createCalculationCase1| image:: /../_static/createCalculationCase1.png +.. |createCalculationCase1| image:: ../_static/createCalculationCase1.png :align: middle -.. |createCalculationCase2| image:: /../_static/createCalculationCase2.png +.. |createCalculationCase2| image:: ../_static/createCalculationCase2.png :align: middle -.. |createCalculationCase3| image:: /../_static/createCalculationCase3.png +.. |createCalculationCase3| image:: ../_static/createCalculationCase3.png :align: middle -.. |createCalculationCase4| image:: /../_static/createCalculationCase4.png +.. |createCalculationCase4| image:: ../_static/createCalculationCase4.png :align: middle -.. |createCalculationCase5| image:: /../_static/createCalculationCase5.png +.. |createCalculationCase5| image:: ../_static/createCalculationCase5.png :align: middle -.. |createCalculationCase6| image:: /../_static/createCalculationCase6.png +.. |createCalculationCase6| image:: ../_static/createCalculationCase6.png :align: middle -.. |createCalculationCase7| image:: /../_static/createCalculationCase7.png +.. |createCalculationCase7| image:: ../_static/createCalculationCase7.png :align: middle -.. |createCalculationCase8| image:: /../_static/createCalculationCase8.png +.. |createCalculationCase8| image:: ../_static/createCalculationCase8.png :align: middle -.. |createCalculationCase9| image:: /../_static/createCalculationCase9.png +.. |createCalculationCase9| image:: ../_static/createCalculationCase9.png :align: middle -.. |createCalculationCase10| image:: /../_static/createCalculationCase10.png +.. |createCalculationCase10| image:: ../_static/createCalculationCase10.png :align: middle Case creation ============= -This step consists in creating a *calculation case*, i.e. the configuration of objects that will be retained -in the example study. +This step consists in creating a *calculation case*, i.e. the configuration of objects that will be retained +in the example study. -Three objects have been created: the minor bed, the major bed and the study domain. +Three objects have been created: the minor bed, the major bed and the study domain. -To create a *calculation case*, open the context menu of the *CALCULATION CASE* folder -and name the case garonne_1 in the dialog box. +To create a *calculation case*, open the context menu of the *CALCULATION CASE* folder +and name the case garonne_1 in the dialog box. |createCalculationCase1| -**Select the domain as the limit**, then click on **manual mode** -(this mode will be explained below) and select the three objects present and include them in the case. +**Select the domain as the limit**, then click on **manual mode** +(this mode will be explained below) and select the three objects present and include them in the case. -This step must be confirmed by pressing the *next* button. +This step must be confirmed by pressing the *next* button. |createCalculationCase2| -The dialog proposes to select the groups to be preserved: these are the contours of the different objects -taken into account in the case. These groups may prove useful later to define the boundary conditions +The dialog proposes to select the groups to be preserved: these are the contours of the different objects +taken into account in the case. These groups may prove useful later to define the boundary conditions or to control the mesh. By keeping them, they can be found under their names in subsequent steps of the calculation. -Select the three available groups and include them in the case. +Select the three available groups and include them in the case. -The *next* button should then be clicked to confirm this step. +The *next* button should then be clicked to confirm this step. |createCalculationCase3| -The dialog box below enables the assignment of friction coefficients to the different domain zones, -using a Strickler coefficients table and a *land cover map* partitioning the study area into zones, -both of which need to have been previously imported and/or edited. -This step is omitted in the context of the present simple study; it will, however, be expanded upon later. +The dialog box below enables the assignment of friction coefficients to the different domain zones, +using a Strickler coefficients table and a *land cover map* partitioning the study area into zones, +both of which need to have been previously imported and/or edited. +This step is omitted in the context of the present simple study; it will, however, be expanded upon later. -The instructions must be confirmed by pressing the *next* button. +The instructions must be confirmed by pressing the *next* button. |createCalculationCase4| Choice of Bathymetry calculation for the overlapping zones ========================================================== -The following step shows the result of the *partition* of the different zones retained in the calculation case. -The original surfaces were cut along the overlapping lines. +The following step shows the result of the *partition* of the different zones retained in the calculation case. +The original surfaces were cut along the overlapping lines. The panel on the right shows as many cut *regions* as cut faces: each region contains one a cut face or *zone*. -Certain zones are coloured red: these zones are the overlap zones of the original faces. -The list of initial objects appears in the second column. +Certain zones are coloured red: these zones are the overlap zones of the original faces. +The list of initial objects appears in the second column. -Several bathymetry definitions are possible for these zones, as listed in the third column. +Several bathymetry definitions are possible for these zones, as listed in the third column. Until a rule has been defined to calculate the zone bathymetry, this zone is declared to be *in conflict*. |createCalculationCase5| -Each conflict zone must be selected, one after the other, to choose the bathymetry mode for the zone. -The selection is made from the drop-down menu associated with the zone. +Each conflict zone must be selected, one after the other, to choose the bathymetry mode for the zone. +The selection is made from the drop-down menu associated with the zone. -The following options can be selected: +The following options can be selected: - * A bathymetry among those listed + * A bathymetry among those listed - * The local minimum of all listed bathymetries + * The local minimum of all listed bathymetries - * The local maximum of all listed bathymetries + * The local maximum of all listed bathymetries |createCalculationCase6| -There should be no red zones remaining once the conflicts have been resolved. +There should be no red zones remaining once the conflicts have been resolved. -The zone colours can be regenerated (*regenerate colors* button), if necessary. +The zone colours can be regenerated (*regenerate colors* button), if necessary. |createCalculationCase7| Grouping zones into regions =========================== -The next step is to group several zones into separate regions. +The next step is to group several zones into separate regions. What purpose does this serve? A zone corresponds to a computational mode for the bathymetry. -The contour of this zone is not necessarily of interest as a *mesh constraint line*. -When several adjacent zones are grouped together into one region, only the contour of the region -will be kept as a *mesh constraint line*. +The contour of this zone is not necessarily of interest as a *mesh constraint line*. +When several adjacent zones are grouped together into one region, only the contour of the region +will be kept as a *mesh constraint line*. -Hence, group the two left bank zones together and do likewise with the two zones on the Right bank, -so as to obtain three regions. +Hence, group the two left bank zones together and do likewise with the two zones on the Right bank, +so as to obtain three regions. To move a zone, drag and drop the zone name from one region to another (in the right panel). @@ -144,17 +144,17 @@ To move a zone, drag and drop the zone name from one region to another (in the r This last step must be confirmed by clicking on the *Finish* button. The case now appears in the study tree. Select each region and give it a meaningful name (context menu). - + It can be helpful, when renaming a region, to look at the zones it contains, which are displayed in the graphic view. -By expanding the study tree for each region, the zones can be selected and then highlighted. +By expanding the study tree for each region, the zones can be selected and then highlighted. -As a rule, there is no need to rename the zones themselves, just the regions. -This is because the regions, identified by name, will subsequently be used. -A real case study could contain several dozens of regions. +As a rule, there is no need to rename the zones themselves, just the regions. +This is because the regions, identified by name, will subsequently be used. +A real case study could contain several dozens of regions. |createCalculationCase10| -  + .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_depouillementCalcul.rst b/doc/salome/tutorial/english/english_depouillementCalcul.rst index 1d1fac20..eafa0a46 100644 --- a/doc/salome/tutorial/english/english_depouillementCalcul.rst +++ b/doc/salome/tutorial/english/english_depouillementCalcul.rst @@ -20,8 +20,8 @@ Analysis of the TELEMAC numerical results ######################################### -To be completed. See the Paravis training. +To be completed. See the Paravis training. .. only:: html -  - :ref:`ref_exempleInondation` + + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_donneesPrealables.rst b/doc/salome/tutorial/english/english_donneesPrealables.rst index 48295907..c62fecaf 100644 --- a/doc/salome/tutorial/english/english_donneesPrealables.rst +++ b/doc/salome/tutorial/english/english_donneesPrealables.rst @@ -37,4 +37,4 @@ In this shell, the *CloudCompare* command launches the software. .. only:: html - :ref:`ref_notionsPrealables` + :ref:`ref_english_notionsPrealables` diff --git a/doc/salome/tutorial/english/english_format_sinusx.rst b/doc/salome/tutorial/english/english_format_sinusx.rst index 8a09a047..124b9494 100644 --- a/doc/salome/tutorial/english/english_format_sinusx.rst +++ b/doc/salome/tutorial/english/english_format_sinusx.rst @@ -17,7 +17,7 @@ along with SALOME HYDRO module. If not, see . ############################################################# -Interpretation of the SinusX format: historic (for old files) +Interpretation of the SinusX format: historic (for old files) ############################################################# File structure and line types @@ -186,7 +186,7 @@ Either a compatible export is made: Or nothing is input here: preferable. type = P xyz profile -------------------- +-------------------- Historical definition ~~~~~~~~~~~~~~~~~~~~~ @@ -553,5 +553,5 @@ During file export, .. only:: html -  - :ref:`ref_formatsSpecs` + + :ref:`ref_english_formatsSpecs` diff --git a/doc/salome/tutorial/english/english_geometrie.rst b/doc/salome/tutorial/english/english_geometrie.rst index 54ab3935..92b26d48 100644 --- a/doc/salome/tutorial/english/english_geometrie.rst +++ b/doc/salome/tutorial/english/english_geometrie.rst @@ -20,38 +20,38 @@ Geometry step ######################################### -.. |publieGeom| image:: /../_static/publieGeom.png +.. |publieGeom| image:: ../_static/publieGeom.png :align: middle -.. |activeGeom| image:: /../_static/activeGeom.png +.. |activeGeom| image:: ../_static/activeGeom.png :align: middle -.. |facesGeom| image:: /../_static/facesGeom.png +.. |facesGeom| image:: ../_static/facesGeom.png :align: middle -.. |contoursGeomLitMineurDomaine| image:: /../_static/contoursGeomLitMineurDomaine.png +.. |contoursGeomLitMineurDomaine| image:: ../_static/contoursGeomLitMineurDomaine.png :align: middle -.. |creeGroupeGeom| image:: /../_static/creeGroupeGeom.png +.. |creeGroupeGeom| image:: ../_static/creeGroupeGeom.png :align: middle -When the calculation case is ready, it must be exported to the geometry module, GEOM, +When the calculation case is ready, it must be exported to the geometry module, GEOM, using the context menu on the name of the calculation case: *Export Calculation Case*. - + The *HYDRO_Garonne_1* entry appears in the study tree, under *Geometry*. |publieGeom| -The GEOM module can be activated either in the drop-down list under the menu bar, -through the icon in the module bar or via the *Activate Geometry Module* context menu under +The GEOM module can be activated either in the drop-down list under the menu bar, +through the icon in the module bar or via the *Activate Geometry Module* context menu under the object name *HYDRO_Garonne_1* in the tree. |activeGeom| -Expanding the *HYDRO_Garonne_1* object reveals several groups created automatically +Expanding the *HYDRO_Garonne_1* object reveals several groups created automatically when the calculation case was created: -the three faces corresponding to *regions*, with the same names, and group of edges, -*garonne_1_litMineur_Outer* and *garonne_1_domaineEtendu_Outer*. +the three faces corresponding to *regions*, with the same names, and group of edges, +*garonne_1_litMineur_Outer* and *garonne_1_domaineEtendu_Outer*. To see the group of faces, select them and click on *show only* in the pop-up menu. The *auto color* context menu under the object name *HYDRO_Garonne_1* allows a better identification @@ -59,41 +59,41 @@ of the faces. |facesGeom| -The two groups of edges represent the banks of the minor bed and the outline contour of the domain. +The two groups of edges represent the banks of the minor bed and the outline contour of the domain. To see them, select them and click on show only in the pop-up menu. |contoursGeomLitMineurDomaine| -The upstream and downstream cross-sections of the minor bed still need to be identified, in order to create the mesh. +The upstream and downstream cross-sections of the minor bed still need to be identified, in order to create the mesh. To create groups in an object, it is best to start by displaying the object alone (*show only*). -Create an *edges* group type, called *SectionsGaronne* ("GaronneSections"), +Create an *edges* group type, called *SectionsGaronne* ("GaronneSections"), containing both ends of the Minor bed. -This is done using the Create Group command in the context menu. -The dialog box allows the creation of four types of group: points, edges, faces and volumes. -Select the *edges* type – second radio button in the section Shape Type. +This is done using the Create Group command in the context menu. +The dialog box allows the creation of four types of group: points, edges, faces and volumes. +Select the *edges* type – second radio button in the section Shape Type. -In the name field, type the group name: *SectionsGaronne* ("GaronneSections"). +In the name field, type the group name: *SectionsGaronne* ("GaronneSections"). -Select the the two sections in the graphic view. -Several elements can be selected by holding down the "Shift" key. -When the add button is pressed, the number of the SubGeometry appears in the Sub-shape list. +Select the the two sections in the graphic view. +Several elements can be selected by holding down the "Shift" key. +When the add button is pressed, the number of the SubGeometry appears in the Sub-shape list. -Confirm by clicking *Apply and Close*. +Confirm by clicking *Apply and Close*. |creeGroupeGeom| -Two groups of the *edges* type, *amont* ("upstream") and *aval* ("downstream"), -are also created to distinguish between the two types of boundary conditions. +Two groups of the *edges* type, *amont* ("upstream") and *aval* ("downstream"), +are also created to distinguish between the two types of boundary conditions. -Another two edge groups must likewise be created to close the contour; -named *bordDroiteDomaine* ("domainRightBoundary") and *bordGaucheDomaine* ("domainLeftBoundary"), +Another two edge groups must likewise be created to close the contour; +named *bordDroiteDomaine* ("domainRightBoundary") and *bordGaucheDomaine* ("domainLeftBoundary"), they contain the continuous boundaries on the right and left bank sides of the domain. -The mesh of this geometry can now be created. +The mesh of this geometry can now be created. .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_import.rst b/doc/salome/tutorial/english/english_import.rst index df66f893..03d1b5ca 100644 --- a/doc/salome/tutorial/english/english_import.rst +++ b/doc/salome/tutorial/english/english_import.rst @@ -20,39 +20,39 @@ Image and map background import ######################################### -.. |Hydro_module_button| image:: /../_static/HYDRO.png +.. |Hydro_module_button| image:: ../_static/HYDRO.png :align: middle :width: 16pt :height: 16pt -.. |Hydro_module_launch| image:: /../_static/LaunchHYDRO.png +.. |Hydro_module_launch| image:: ../_static/LaunchHYDRO.png :align: middle -.. |import_image| image:: /../_static/importImage.png +.. |import_image| image:: ../_static/importImage.png :align: middle -.. |import_image2| image:: /../_static/importImage2.png +.. |import_image2| image:: ../_static/importImage2.png :align: middle -.. |selection_A| image:: /../_static/selectionA.png +.. |selection_A| image:: ../_static/selectionA.png :align: middle -.. |selection_B| image:: /../_static/selectionB.png +.. |selection_B| image:: ../_static/selectionB.png :align: middle -.. |selection_B2| image:: /../_static/selectionB2.png +.. |selection_B2| image:: ../_static/selectionB2.png :align: middle -.. |fit_all| image:: /../_static/fitall.png +.. |fit_all| image:: ../_static/fitall.png :align: middle -.. |import_image_B| image:: /../_static/importImageB.png +.. |import_image_B| image:: ../_static/importImageB.png :align: middle -.. |deux_images| image:: /../_static/deuxImages.png +.. |deux_images| image:: ../_static/deuxImages.png :align: middle -.. |zoom_style| image:: /../_static/zoomStyle.png +.. |zoom_style| image:: ../_static/zoomStyle.png :align: middle Loading the HYDRO module @@ -76,17 +76,17 @@ Géoportail provides the means to find point coordinates in an image, needed for To import an image, open the pop-up menu (right click) in the SALOME HYDRO study tree *IMAGES* folder: |import_image| - + To import an image, open the pop-up menu (right click) in the SALOME HYDRO study tree IMAGES folder:: /bin/salome/test/HYDRO/garonne_ign_01.png The image is displayed with two points, *A*and *B*, which will be repositioned at locations whose coordinates in the Lambert 93 system are known, selected far enough apart to maintain -a good level of precision. +a good level of precision. |import_image2| - + The two specific points for which the coordinates were previously located with Géoportail are shown below: |selection_A| @@ -102,7 +102,7 @@ The second at the centre of the cross next to *Hautevignes*: coordinates (489400 Select point A then point B sequentially, using the *Activate point A selection* then *Activate point B selection* buttons. Once the two points have been selected, -the georeferencing dialog box looks like this: +the georeferencing dialog box looks like this: |selection_B2| @@ -111,14 +111,14 @@ column gives the geographical references. The georeferencing is validated by clicking on the *Apply and Close* button. You must ensure that the "eye" icon to the left of the image name in the tree is active -and re-centre the image using the *fit all* button: |fit_all|. +and re-centre the image using the *fit all* button: |fit_all|. - The image obtained is slightly tilted to the right. + The image obtained is slightly tilted to the right. * Note: in this view, the zoom may be performed with the mouse wheel. The zoom may be centred on the mouse position or at the centre of the image. This option is accessible in the *File/preferences* menu under the *SALOME* section, - *3D viewer* tab, *zooming style*: + *3D viewer* tab, *zooming style*: |zoom_style| @@ -131,9 +131,9 @@ of the application. the study was saved in an incomplete state*. This problem has only arisen in cases where studies incorporating data from several modules were being reloaded without the HYDRO module being activated before the save operation. - To guard against the risk of an incomplete save, check that the HYDRO module is activated before saving the study. + To guard against the risk of an incomplete save, check that the HYDRO module is activated before saving the study. -Importing a second image, georeferenced from the first +Importing a second image, georeferenced from the first ====================================================== The second image is stored in the same place as the first :: @@ -164,16 +164,16 @@ to obtain a good quality mesh. The coordinates of the new origin are entered via the *HYDRO/Change Local CS* menu. In this example, the point (430 000, 6 350 000), located to the south west of our study domain, is entered. - + After confirming the change of origin, one sees that the cursor coordinates, which are displayed in the status bar at the bottom left of the application, are provided in both coordinate systems (local and global). - + * **Note**: this change of origin can be made several times, at different points in the study, as everything that was previously imported is transposed by the application. However it is preferable to do this quite early to minimise the risks of error or inconsistency and, in any event, before exporting the HYDRO module elements, particularly the model geometry. It is recommended to set the local coordinate system early in the study, - as soon as the extent of the computational domain is known. + as soon as the extent of the computational domain is known. * After a change of origin, some entries in the study tree are marked in italic blue: they must be updated. Use the context menu *update*, then reset the view with *Fit All* command. @@ -185,15 +185,15 @@ All actions/operations completed through the graphic interface have their equiva A script dump of the study can be made using the *File/Dump Study* menu. The resulting Python script can be used to reconstruct the study data in a new SALOME study. This script is of course editable. - + The dump can be made after definition of the local coordinate system and the obtained file compared with :: /bin/salome/test/HYDRO/h003_changeLCS.py The correct execution of the dump can be checked by starting again with a new study (restart SALOME, new document or just new document), -then menu *File/Load Script* and activation of the HYDRO module. +then menu *File/Load Script* and activation of the HYDRO module. .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_importBathy.rst b/doc/salome/tutorial/english/english_importBathy.rst index 266dc2e2..cdb2c32b 100644 --- a/doc/salome/tutorial/english/english_importBathy.rst +++ b/doc/salome/tutorial/english/english_importBathy.rst @@ -20,7 +20,7 @@ Bathymetry import ####################### -.. |import_bathy1| image:: /../_static/bathy1.png +.. |import_bathy1| image:: ../_static/bathy1.png :align: middle The HYDRO module enables bathymetry file types that have .xyz or .asc extensions to be imported. @@ -28,33 +28,33 @@ These are ASCII text files. The .xyz files contain one point per line, with the whereas the .asc files are formatted in a Cartesian x, y grid structure. The .asc files contain a header which lists the number of lines and columns, the coordinates of the south western corner and the cell-size in x and in y, below which is a matrix of the z altitude values. It is also possible to import bathymetries contained -in SinusX-format files, as will be described later. +in SinusX-format files, as will be described later. -Two files need to be imported for the purposes of this study. +Two files need to be imported for the purposes of this study. They are found in the installation directory of the SALOME HYDRO application:: - /bin/salome/test/HYDRO/cloud_02.xyz + /bin/salome/test/HYDRO/cloud_02.xyz - /bin/salome/test/HYDRO/garonne_point_L93.xyz + /bin/salome/test/HYDRO/garonne_point_L93.xyz -The *cloud_02.xyz* file is an extract of IGN data on a regular grid with one point every 75 m, freely available. +The *cloud_02.xyz* file is an extract of IGN data on a regular grid with one point every 75 m, freely available. The *garonne_point_L93.xyz* file corresponds to an earlier study, covers the major bed of the river over the region -and is potentially more precise than the previous file, at least on the minor bed. +and is potentially more precise than the previous file, at least on the minor bed. These files are imported using the context menu of the *BATHYMETRIES* folder in the SALOME study tree. The import dialog box permits the user to select the file to be imported and to change its name in the study tree. -The import instructions are confirmed by clicking on the *Apply and Close* button. +The import instructions are confirmed by clicking on the *Apply and Close* button. To display the bathymetry, click on the eye opposite its name and re-centre the image using the *fit all* button. - + The points are coloured according to their altitudes and the colour ranges are adjusted according to the minimum -and maximum of all the displayed fields. The corresponding legend is always displayed. +and maximum of all the displayed fields. The corresponding legend is always displayed. You should obtain a view that looks like this: |import_bathy1| -  + .. only:: html -  - :ref:`ref_exempleInondation` + + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_installationLancementSalome.rst b/doc/salome/tutorial/english/english_installationLancementSalome.rst index 81285101..2928b354 100644 --- a/doc/salome/tutorial/english/english_installationLancementSalome.rst +++ b/doc/salome/tutorial/english/english_installationLancementSalome.rst @@ -21,7 +21,7 @@ SALOME installation and start-up procedure ########################################## -.. |fit_all| image:: /../_static/fitall.png +.. |fit_all| image:: ../_static/fitall.png :align: middle Installation diff --git a/doc/salome/tutorial/english/english_interpolationZ.rst b/doc/salome/tutorial/english/english_interpolationZ.rst index 0470ed4f..6ad79c45 100644 --- a/doc/salome/tutorial/english/english_interpolationZ.rst +++ b/doc/salome/tutorial/english/english_interpolationZ.rst @@ -20,30 +20,30 @@ Z Interpolation ######################################### -.. |HYDROSolver| image:: /../_static/HYDROSolver.png +.. |HYDROSolver| image:: ../_static/HYDROSolver.png :align: middle :width: 16pt :height: 16pt -.. |genereInterpolz| image:: /../_static/genereInterpolz.png +.. |genereInterpolz| image:: ../_static/genereInterpolz.png :align: middle - -.. |Bottom| image:: /../_static/Bottom.png + +.. |Bottom| image:: ../_static/Bottom.png :align: middle -.. |Capture_meshZ| image:: /../_static/Capture_meshZ.png +.. |Capture_meshZ| image:: ../_static/Capture_meshZ.png :align: middle -.. |occ_view_scaling| image:: /../_static/occ_view_scaling.png +.. |occ_view_scaling| image:: ../_static/occ_view_scaling.png :align: middle :width: 16pt :height: 16pt -The mesh generated in the previous step does not contain any information on the altitude. -To supply the TELEMAC code with this data, a field containing the Z-coordinate of the nodes must be added to the mesh. +The mesh generated in the previous step does not contain any information on the altitude. +To supply the TELEMAC code with this data, a field containing the Z-coordinate of the nodes must be added to the mesh. -The method for calculating the Z coordinate was described zone by zone in the calculation case set-up section of the HYDRO module. +The method for calculating the Z coordinate was described zone by zone in the calculation case set-up section of the HYDRO module. Calculation of the Z interpolation at the mesh nodes ==================================================== @@ -68,30 +68,30 @@ This may be used to help in case of problems in the zones definition in the calc The interpolation of point clouds can be done in two ways, depending on whether the clouds are denser than the mesh, or vice versa. For very dense point clouds, it suffices to take the altitude of the closest point in the cloud. -If the mesh is denser than the cloud, it is better to use linearised interpolation, obtained by previous triangulation of the point cloud. -This last method is more accurate but slightly more costly, computationally. +If the mesh is denser than the cloud, it is better to use linearised interpolation, obtained by previous triangulation of the point cloud. +This last method is more accurate but slightly more costly, computationally. The region names must be selected in correspondance of their group of faces (representing the same geometric face), -and, for the other groups, the selection should be *None*. +and, for the other groups, the selection should be *None*. |genereInterpolz| -The script produces several files, whose names are derived from the original file name of the mesh, with different suffixes, -which are stored in the original file's directory: +The script produces several files, whose names are derived from the original file name of the mesh, with different suffixes, +which are stored in the original file's directory: - * garonne_1.med: original file (z coordinate = 0) + * garonne_1.med: original file (z coordinate = 0) * garonne_1.xyz: xyz file (ASCII) of the altitudes at the nodes *(optional)* - * garonne_1F.med: calculated value of the Z coordinate and “BOTTOM” field with the Z-value at each node + * garonne_1F.med: calculated value of the Z coordinate and “BOTTOM” field with the Z-value at each node **Remark** : The Z coordinate on mesh nodes is not used by TELEMAC, but is useful for visual control in SMESH. -To run the script, the HYDRO module for the study must be active. If resuming work on a study that was previously saved, -the HYDRO module must be activated before running the script -(simply select HYDRO at least once in order for the data stored in the study file to be read). +To run the script, the HYDRO module for the study must be active. If resuming work on a study that was previously saved, +the HYDRO module must be activated before running the script +(simply select HYDRO at least once in order for the data stored in the study file to be read). The script is executed manually with the File / Load Script... menu command. -The script blocks the graphic interface during execution. -It displays an execution trace in the Python console that is displayed by default in the GEOM and SMESH modules. +The script blocks the graphic interface during execution. +It displays an execution trace in the Python console that is displayed by default in the GEOM and SMESH modules. It is also possible to edit the following script: @@ -106,13 +106,13 @@ Visualisation of the Z interpolation at the mesh nodes Visualisation with the MED module --------------------------------- -The MED module offers a simple field view of a MED mesh. +The MED module offers a simple field view of a MED mesh. The MED module must first be activated, then use the *File/Add Data Source* menu or the equivalent icon and find the *garonne_1F.med* file. Expanding the *garonne_1F.med* object in the study tree will reveal the *HYDRO_Garonne_1* mesh and the *BOTTOM* field. Select the field and click on the *scalar map* icon. -The field is displayed in 3D view. The 3D-view context menu contains the *Representation / Surface with Edges* command +The field is displayed in 3D view. The 3D-view context menu contains the *Representation / Surface with Edges* command |Bottom| @@ -123,7 +123,7 @@ When the interpolation script finishes running, the *HYDRO_Garonne_1* mesh shoul underneath the first instance in the study tree. If it is not visible, use the *Refresh* command in the study tree context menu to update the file list. -The second mesh is displayed in the SMESH module using the *show* command. For a better relief view, the Z scale needs to be modified +The second mesh is displayed in the SMESH module using the *show* command. For a better relief view, the Z scale needs to be modified with the 3D view icon |occ_view_scaling| . In this case, scaling the Z-axis by a factor of 3 is sufficient. *Remember*: objects are manipulated in 3D view using the key and the mouse buttons or the mouse wheel for zooming. @@ -134,4 +134,4 @@ The following is a group view corresponding to the study regions: .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_introCloudCompare.rst b/doc/salome/tutorial/english/english_introCloudCompare.rst index 236cb3c4..4fb90747 100644 --- a/doc/salome/tutorial/english/english_introCloudCompare.rst +++ b/doc/salome/tutorial/english/english_introCloudCompare.rst @@ -20,19 +20,19 @@ Basic help on CloudCompare ######################################### -.. |CloudCompare_01| image:: /../_static/CloudCompare_01.png +.. |CloudCompare_01| image:: ../_static/CloudCompare_01.png :align: middle -.. |CloudCompare_02| image:: /../_static/CloudCompare_02.png +.. |CloudCompare_02| image:: ../_static/CloudCompare_02.png :align: middle -.. |CloudCompare_03| image:: /../_static/CloudCompare_03.png +.. |CloudCompare_03| image:: ../_static/CloudCompare_03.png :align: middle -.. |CloudCompare_04| image:: /../_static/CloudCompare_04.png +.. |CloudCompare_04| image:: ../_static/CloudCompare_04.png :align: middle -.. |CloudCompare_05| image:: /../_static/CloudCompare_05.png +.. |CloudCompare_05| image:: ../_static/CloudCompare_05.png :align: middle Load data and scatter plot visualization @@ -68,6 +68,6 @@ The scatter plot is now colored. You can put a caption by checking the *visible* |CloudCompare_05| .. only:: html -  - :ref:`ref_outilsComplementaires` + + :ref:`ref_english_outilsComplementaires` diff --git a/doc/salome/tutorial/english/english_introQgis.rst b/doc/salome/tutorial/english/english_introQgis.rst index 6a2f66c6..a24fe05a 100644 --- a/doc/salome/tutorial/english/english_introQgis.rst +++ b/doc/salome/tutorial/english/english_introQgis.rst @@ -180,6 +180,6 @@ must be in different entities. as LandCoverMap: *Import Land Cover Map from files* .. only:: html -  - :ref:`ref_outilsComplementaires` + + :ref:`ref_english_outilsComplementaires` diff --git a/doc/salome/tutorial/english/english_lancementCalcul.rst b/doc/salome/tutorial/english/english_lancementCalcul.rst index a7a1809b..4fbd5471 100644 --- a/doc/salome/tutorial/english/english_lancementCalcul.rst +++ b/doc/salome/tutorial/english/english_lancementCalcul.rst @@ -20,65 +20,65 @@ Lancement du calcul TELEMAC ######################################### -.. |HYDROSolver| image:: /../_static/HYDROSolver.png +.. |HYDROSolver| image:: ../_static/HYDROSolver.png :align: middle :width: 16pt :height: 16pt -.. |case_pytel| image:: /../_static/case_pytel.png +.. |case_pytel| image:: ../_static/case_pytel.png :align: middle :width: 16pt :height: 16pt -.. |CreateCasePytel| image:: /../_static/CreateCasePytel.png +.. |CreateCasePytel| image:: ../_static/CreateCasePytel.png :align: middle -.. |SelectCommandPytel| image:: /../_static/SelectCommandPytel.png +.. |SelectCommandPytel| image:: ../_static/SelectCommandPytel.png :align: middle -.. |CasPytel| image:: /../_static/CasPytel.png +.. |CasPytel| image:: ../_static/CasPytel.png :align: middle -.. |CasPytelRepTravail| image:: /../_static/CasPytelRepTravail.png +.. |CasPytelRepTravail| image:: ../_static/CasPytelRepTravail.png :align: middle -.. |CasPytelFichierCas| image:: /../_static/CasPytelFichierCas.png +.. |CasPytelFichierCas| image:: ../_static/CasPytelFichierCas.png :align: middle -.. |CasPytelEntreeMedIncomplete| image:: /../_static/CasPytelEntreeMedIncomplete.png +.. |CasPytelEntreeMedIncomplete| image:: ../_static/CasPytelEntreeMedIncomplete.png :align: middle -.. |CasPytelSave| image:: /../_static/CasPytelSave.png +.. |CasPytelSave| image:: ../_static/CasPytelSave.png :align: middle -.. |CasPytelArbre| image:: /../_static/CasPytelArbre.png +.. |CasPytelArbre| image:: ../_static/CasPytelArbre.png :align: middle -.. |CasPytelComputeCase| image:: /../_static/CasPytelComputeCase.png +.. |CasPytelComputeCase| image:: ../_static/CasPytelComputeCase.png :align: middle -.. |CasPytelCalcul| image:: /../_static/CasPytelCalcul.png +.. |CasPytelCalcul| image:: ../_static/CasPytelCalcul.png :align: middle -.. |CasPytelFinCalcul| image:: /../_static/CasPytelFinCalcul.png +.. |CasPytelFinCalcul| image:: ../_static/CasPytelFinCalcul.png :align: middle -.. |eficas_05| image:: /../_static/eficas_05.png +.. |eficas_05| image:: ../_static/eficas_05.png :align: middle -.. |eficas_06| image:: /../_static/eficas_06.png +.. |eficas_06| image:: ../_static/eficas_06.png :align: middle -.. |eficas_07| image:: /../_static/eficas_07.png +.. |eficas_07| image:: ../_static/eficas_07.png :align: middle -.. |eficas_08| image:: /../_static/eficas_08.png +.. |eficas_08| image:: ../_static/eficas_08.png :align: middle -.. |eficas_09| image:: /../_static/eficas_09.png +.. |eficas_09| image:: ../_static/eficas_09.png :align: middle -.. |eficas_10| image:: /../_static/eficas_10.png +.. |eficas_10| image:: ../_static/eficas_10.png :align: middle The HYDROSolver module must now be activated via the module scrolling list or with the |HYDROSolver| icon in the ribbon. @@ -124,7 +124,7 @@ While the calculation is running, an onscreen listing of the computation (log fi The window can be closed at the end of the computation. |CasPytelFinCalcul| -  + .. only:: html -  - :ref:`ref_exempleInondation` + + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_landCoverMap.rst b/doc/salome/tutorial/english/english_landCoverMap.rst index 22b75473..3403beab 100644 --- a/doc/salome/tutorial/english/english_landCoverMap.rst +++ b/doc/salome/tutorial/english/english_landCoverMap.rst @@ -21,22 +21,22 @@ Land Cover Map ######################################### -.. |stricklerTable_1| image:: /../_static/stricklerTable_1.png +.. |stricklerTable_1| image:: ../_static/stricklerTable_1.png :align: middle -.. |importLandCoverMap| image:: /../_static/importLandCoverMap.png +.. |importLandCoverMap| image:: ../_static/importLandCoverMap.png :align: middle -.. |importLandCoverMap_2| image:: /../_static/importLandCoverMap_2.png +.. |importLandCoverMap_2| image:: ../_static/importLandCoverMap_2.png :align: middle -.. |importLandCoverMap_3| image:: /../_static/importLandCoverMap_3.png +.. |importLandCoverMap_3| image:: ../_static/importLandCoverMap_3.png :align: middle -.. |casLandCoverMap| image:: /../_static/casLandCoverMap.png +.. |casLandCoverMap| image:: ../_static/casLandCoverMap.png :align: middle -.. |BottomFriction| image:: /../_static/BottomFriction.png +.. |BottomFriction| image:: ../_static/BottomFriction.png :align: middle @@ -143,7 +143,7 @@ It is possible to use the same MED file as input and output. We can see the result field with the MED module, as for the elevation field. |BottomFriction| -  + .. only:: html -  - :ref:`ref_casParticuliers` + + :ref:`ref_english_casParticuliers` diff --git a/doc/salome/tutorial/english/english_maillage.rst b/doc/salome/tutorial/english/english_maillage.rst index 8376c848..7eb0a987 100644 --- a/doc/salome/tutorial/english/english_maillage.rst +++ b/doc/salome/tutorial/english/english_maillage.rst @@ -20,57 +20,57 @@ Mesh creation ######################################### -.. |mesh_init| image:: /../_static/mesh_init.png +.. |mesh_init| image:: ../_static/mesh_init.png :align: middle :width: 16pt :height: 16pt -.. |mesh_edit| image:: /../_static/mesh_edit.png +.. |mesh_edit| image:: ../_static/mesh_edit.png :align: middle :width: 16pt :height: 16pt -.. |mesh_hypo_edit| image:: /../_static/mesh_hypo_edit.png +.. |mesh_hypo_edit| image:: ../_static/mesh_hypo_edit.png :align: middle :width: 16pt :height: 16pt -.. |vtk_view_fitall| image:: /../_static/vtk_view_fitall.png +.. |vtk_view_fitall| image:: ../_static/vtk_view_fitall.png :align: middle :width: 16pt :height: 16pt -.. |vtk_view_top| image:: /../_static/vtk_view_top.png +.. |vtk_view_top| image:: ../_static/vtk_view_top.png :align: middle :width: 16pt :height: 16pt -.. |Capture_CreateMesh| image:: /../_static/Capture_CreateMesh.png +.. |Capture_CreateMesh| image:: ../_static/Capture_CreateMesh.png :align: middle -.. |Capture_HypothesisConstruction| image:: /../_static/Capture_HypothesisConstruction.png +.. |Capture_HypothesisConstruction| image:: ../_static/Capture_HypothesisConstruction.png :align: middle -.. |Capture_CreateSubMesh| image:: /../_static/Capture_CreateSubMesh.png +.. |Capture_CreateSubMesh| image:: ../_static/Capture_CreateSubMesh.png :align: middle -.. |Capture_HypothesisLocalLength| image:: /../_static/Capture_HypothesisLocalLength.png +.. |Capture_HypothesisLocalLength| image:: ../_static/Capture_HypothesisLocalLength.png :align: middle -.. |Capture_HypothesisNbSegments| image:: /../_static/Capture_HypothesisNbSegments.png +.. |Capture_HypothesisNbSegments| image:: ../_static/Capture_HypothesisNbSegments.png :align: middle -.. |Capture_WarningOrder| image:: /../_static/Capture_WarningOrder.png +.. |Capture_WarningOrder| image:: ../_static/Capture_WarningOrder.png :align: middle -.. |Capture_OrderingSubMeshes| image:: /../_static/Capture_OrderingSubMeshes.png +.. |Capture_OrderingSubMeshes| image:: ../_static/Capture_OrderingSubMeshes.png :align: middle -.. |Capture_MeshComputationSucceed| image:: /../_static/Capture_MeshComputationSucceed.png +.. |Capture_MeshComputationSucceed| image:: ../_static/Capture_MeshComputationSucceed.png :align: middle -.. |Capture_CreateGroupsFromGeometry| image:: /../_static/Capture_CreateGroupsFromGeometry.png +.. |Capture_CreateGroupsFromGeometry| image:: ../_static/Capture_CreateGroupsFromGeometry.png :align: middle @@ -79,13 +79,13 @@ Once the geometry is ready, the *SMESH* mesh module can be activated. Introduction to SMESH operations ================================ -To specify the mesh, a default algorithm is generally defined with its parameter values: +To specify the mesh, a default algorithm is generally defined with its parameter values: these are the underlying assumptions of the algorithm, referred to as *"hypotheses"* in the SMESH module. This algorithm and these hypotheses apply everywhere except where a part of the geometry (*sub-shape*) has been modified. -It is therefore possible to generate submeshes on a face or a group of faces, an edge or a group of edges, -in order to define specific algorithms and/or hypotheses. +It is therefore possible to generate submeshes on a face or a group of faces, an edge or a group of edges, +in order to define specific algorithms and/or hypotheses. During the meshing operation, the geometry of the part to be meshed is explored, starting with dimension 1 (edges) then dimension 2 (faces) and finally dimension 3 (volumes). In this example, there are no volumes. @@ -93,26 +93,26 @@ then dimension 2 (faces) and finally dimension 3 (volumes). In this example, th Dimension 1 meshes therefore take priority over and are a prerequisite for dimension 2 meshes. Certain algorithms manage several dimensions (in this case, edges and faces) simultaneously. -When these algorithms tolerate prescribed mesh from user-specified edges, the definition of the sub-meshes of +When these algorithms tolerate prescribed mesh from user-specified edges, the definition of the sub-meshes of the face or faces concerned will be taken into account, otherwise it will not. -Similarly, according to the algorithm selected for a face, the 1D tab of the Create mesh dialog box will -either be active or not. +Similarly, according to the algorithm selected for a face, the 1D tab of the Create mesh dialog box will +either be active or not. -As a result, there may be occasions where, for certain *sub-shapes*, several algorithms and/or hypotheses -are defined, in which case a hierarchy of priority must be established. These situations are automatically -detected and the user is offered a list of choices. +As a result, there may be occasions where, for certain *sub-shapes*, several algorithms and/or hypotheses +are defined, in which case a hierarchy of priority must be established. These situations are automatically +detected and the user is offered a list of choices. Algorithms and underlying Hypotheses for the geometry ===================================================== -In this example, a triangle mesh will be specified as the default option over the whole domain +In this example, a triangle mesh will be specified as the default option over the whole domain and the mesh of the minor bed will be customised to obtain stretched triangles oriented along the flow path. -To start defining the mesh, select the *HYDRO_garonne_1* geometry in the study tree and the +To start defining the mesh, select the *HYDRO_garonne_1* geometry in the study tree and the *Mesh / Create Mesh* menu or click on the icon |mesh_init|. -In the *Create Mesh* dialog box, select the mesh algorithm *Netgen 1D–2D*, -which will apply by default to all of the geometry. +In the *Create Mesh* dialog box, select the mesh algorithm *Netgen 1D–2D*, +which will apply by default to all of the geometry. |Capture_CreateMesh| @@ -139,45 +139,45 @@ Sub-meshes A sub-mesh is created by selecting the mesh in the study tree (context menu: *Create sub-mesh*). The geometry needs to be entered in the open dialog by clicking on the *litMineur* face listed under *HYDRO_garonne_1* -in the study tree. To make this selection, the navigation arrow on the *Geometry* line must be active, -which it is by default. +in the study tree. To make this selection, the navigation arrow on the *Geometry* line must be active, +which it is by default. -It is useful to immediately rename the sub-mesh (first line of the dialog). +It is useful to immediately rename the sub-mesh (first line of the dialog). -Next, select the *Quadrangle (Medial Axis projection)* algorithm. -This algorithm reconstructs an imaginary hydraulic axis and decomposes the river into quadrangles -at right angles to the hydraulic axis. +Next, select the *Quadrangle (Medial Axis projection)* algorithm. +This algorithm reconstructs an imaginary hydraulic axis and decomposes the river into quadrangles +at right angles to the hydraulic axis. |Capture_CreateSubMesh| The length of the quadrangles and their number in the river cross-section still need to be defined. -In the *1D* tab of the *litMineur* sub-mesh dialog, choose the *Wire Discretisation* algorithm -and the *Local Length* hypothesis and then select a length of 100 (metres). -It is desirable to rename the hypothesis at this stage. +In the *1D* tab of the *litMineur* sub-mesh dialog, choose the *Wire Discretisation* algorithm +and the *Local Length* hypothesis and then select a length of 100 (metres). +It is desirable to rename the hypothesis at this stage. -**Note**: The hypotheses and algorithms can be shared between several meshes and sub-meshes, -enabling to modify in one place everything that needs to remain consistent, -so **it is useful to give them meaningful names now that will help to identify them later**. +**Note**: The hypotheses and algorithms can be shared between several meshes and sub-meshes, +enabling to modify in one place everything that needs to remain consistent, +so **it is useful to give them meaningful names now that will help to identify them later**. |Capture_HypothesisLocalLength| The definition of the sub-mesh is validated with the *Apply and Close* button in the sub-mesh dialog. The length defined above applies both lengthwise and width wise. To control the number of transverse mesh elements, -a new sub-mesh is necessary, which will be applied to the edge group *SectionsGaronne*. +a new sub-mesh is necessary, which will be applied to the edge group *SectionsGaronne*. -Create a sub-mesh on *SectionsGaronne*, this time taking *Wire Discretisation* as algorithm +Create a sub-mesh on *SectionsGaronne*, this time taking *Wire Discretisation* as algorithm and *Nb. Segments* as the hypothesis. -Select 8 segments and *Equidistant distribution* to have a regularly distributed submesh. +Select 8 segments and *Equidistant distribution* to have a regularly distributed submesh. |Capture_HypothesisNbSegments| Use the *Apply and Close* button to validate the defined settings for this sub-mesh. -A priority needs to be established between two definitions: +A priority needs to be established between two definitions: |Capture_WarningOrder| |Capture_OrderingSubMeshes| -Select *SectionsGaronne* and move it up to the top of the list. +Select *SectionsGaronne* and move it up to the top of the list. Mesh generation =============== @@ -194,10 +194,10 @@ The mesh is still not complete for the requirements of the example case but it c To display it, click on *show* then *FitAll* |vtk_view_fitall| and top view |vtk_view_top| (*-0Z*) in the 3D viewer icon bar. -The *Modification/Cutting of Quadrangles* menu is now used to cut the quadrangles. -In the dialog, check *apply to all*, *use diagonal 1-3* then *preview*: -the proposed modification appears and can be checked by zooming in with the mouse wheel. -Validate with *Apply and Close*. +The *Modification/Cutting of Quadrangles* menu is now used to cut the quadrangles. +In the dialog, check *apply to all*, *use diagonal 1-3* then *preview*: +the proposed modification appears and can be checked by zooming in with the mouse wheel. +Validate with *Apply and Close*. Mesh control ============ @@ -209,24 +209,24 @@ Mesh orientation For XY surface meshes, **triangles may be oriented by default in SALOME in the opposite direction to the one expected by TELEMAC**, depending on the direction used to draw the lines. Thus, SALOME may orients triangles with the normal pointing downwards from the face. -This can be checked via the mesh colour (darker blue on the back than on the front) or by using the *Orientation of Faces* command -in the 3D view context menu of the mesh. This command draws one arrow per triangle. -Only a point is seen on the back of the face; the view angle has to be changed to see the arrows. +This can be checked via the mesh colour (darker blue on the back than on the front) or by using the *Orientation of Faces* command +in the 3D view context menu of the mesh. This command draws one arrow per triangle. +Only a point is seen on the back of the face; the view angle has to be changed to see the arrows. -To reorient the faces, use the *Modification / Orientation* menu and check the *Apply to All* option. -After validating the operation, the faces change colour (lighter blue). +To reorient the faces, use the *Modification / Orientation* menu and check the *Apply to All* option. +After validating the operation, the faces change colour (lighter blue). Over-constrained triangles -------------------------- -The use of different boundary conditions on two edges of a triangle should be avoided and, more generally, -avoid having imposing boundary conditions on two edges (no degrees of freedom on the triangle). +The use of different boundary conditions on two edges of a triangle should be avoided and, more generally, +avoid having imposing boundary conditions on two edges (no degrees of freedom on the triangle). -Mesh generators sometimes create such triangles in the corners of the mesh. This will happen with Netgen in the case of acute angles. -Whenever possible, avoid creating acute angles at the domain boundaries. +Mesh generators sometimes create such triangles in the corners of the mesh. This will happen with Netgen in the case of acute angles. +Whenever possible, avoid creating acute angles at the domain boundaries. -Over-constrained triangles are detected using the *Controls / Face Controls / Over-constrained faces* menu command. -To correct this problem, the *Modification / Diagonal Inversion* menu command should be used, +Over-constrained triangles are detected using the *Controls / Face Controls / Over-constrained faces* menu command. +To correct this problem, the *Modification / Diagonal Inversion* menu command should be used, selecting the internal edge of the triangle in question. Creation of groups / Saving the mesh @@ -235,16 +235,16 @@ Creation of groups / Saving the mesh Groups of mesh nodes and mesh elements are useful in the bathymetry interpolation step and for defining the boundary conditions. Mesh groups are defined with the *Create Groups from Geometry* command in the context menu of the mesh. -The **element** and **node** groups are constituted successively by selecting -all the groups and sub Shapes of the HYDRO_garonne_1 geometry. +The **element** and **node** groups are constituted successively by selecting +all the groups and sub Shapes of the HYDRO_garonne_1 geometry. |Capture_CreateGroupsFromGeometry| -These groups appear in the study tree under the mesh after validation of the dialog. -They can be seen with *show only* and it is also possible to highlight them using the *Auto Color* option in the mesh context menu. +These groups appear in the study tree under the mesh after validation of the dialog. +They can be seen with *show only* and it is also possible to highlight them using the *Auto Color* option in the mesh context menu. To save the mesh in MED file format, select the mesh and use the menu command: *File / Export / MED file*. .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_manipsPolys.rst b/doc/salome/tutorial/english/english_manipsPolys.rst index 49cab0e2..e98a742d 100644 --- a/doc/salome/tutorial/english/english_manipsPolys.rst +++ b/doc/salome/tutorial/english/english_manipsPolys.rst @@ -20,161 +20,161 @@ Polyline manipulation ######################################### -.. |deuxSections| image:: /../_static/deuxSections.png +.. |deuxSections| image:: ../_static/deuxSections.png :align: middle -.. |deuxExtremites| image:: /../_static/deuxExtremites.png +.. |deuxExtremites| image:: ../_static/deuxExtremites.png :align: middle -.. |bringTogether| image:: /../_static/bringTogether.png +.. |bringTogether| image:: ../_static/bringTogether.png :align: middle -.. |deuxPointsConfondus| image:: /../_static/deuxPointsConfondus.png +.. |deuxPointsConfondus| image:: ../_static/deuxPointsConfondus.png :align: middle -.. |contourFermeDeuxSections| image:: /../_static/contourFermeDeuxSections.png +.. |contourFermeDeuxSections| image:: ../_static/contourFermeDeuxSections.png :align: middle -.. |domaineMaritime| image:: /../_static/domaineMaritime.png +.. |domaineMaritime| image:: ../_static/domaineMaritime.png :align: middle -.. |zonePont| image:: /../_static/zonePont.png +.. |zonePont| image:: ../_static/zonePont.png :align: middle -.. |raffinement| image:: /../_static/raffinement.png +.. |raffinement| image:: ../_static/raffinement.png :align: middle -.. |completeSplitDialog| image:: /../_static/completeSplitDialog.png +.. |completeSplitDialog| image:: ../_static/completeSplitDialog.png :align: middle -.. |zonesSplitCreees| image:: /../_static/zonesSplitCreees.png +.. |zonesSplitCreees| image:: ../_static/zonesSplitCreees.png :align: middle -.. |zonePontSplit| image:: /../_static/zonePontSplit.png +.. |zonePontSplit| image:: ../_static/zonePontSplit.png :align: middle -.. |zoneAmontSplit| image:: /../_static/zoneAmontSplit.png +.. |zoneAmontSplit| image:: ../_static/zoneAmontSplit.png :align: middle -.. |zoneAvalSplit| image:: /../_static/zoneAvalSplit.png +.. |zoneAvalSplit| image:: ../_static/zoneAvalSplit.png :align: middle -.. |mergeZonesPont| image:: /../_static/mergeZonesPont.png +.. |mergeZonesPont| image:: ../_static/mergeZonesPont.png :align: middle -.. |pilesDePont| image:: /../_static/pilesDePont.png +.. |pilesDePont| image:: ../_static/pilesDePont.png :align: middle -.. |objetsPont| image:: /../_static/objetsPont.png +.. |objetsPont| image:: ../_static/objetsPont.png :align: middle -Only single section polylines have thus far been addressed. -The use of several sections in polylines enables, for example, the combination of splines -and broken lines in a single contour. -Polyline operations (merge, split, copy, paste) can be used, for instance, -to create contours that share an edge before the calculation case is created. +Only single section polylines have thus far been addressed. +The use of several sections in polylines enables, for example, the combination of splines +and broken lines in a single contour. +Polyline operations (merge, split, copy, paste) can be used, for instance, +to create contours that share an edge before the calculation case is created. Maritime domain boundaries ========================== -A maritime domain is often bounded by a coastline, described in detail, -and by the simplest possible broken line offshore. +A maritime domain is often bounded by a coastline, described in detail, +and by the simplest possible broken line offshore. -Details of the coastline are captured and entered in the form of an open polyline spline. +Details of the coastline are captured and entered in the form of an open polyline spline. -The sea boundary is captured in a second section of the same polyline. +The sea boundary is captured in a second section of the same polyline. -To create a second section, you need to edit the polyline that represents the coastline: -click on *insert new section* and choose a line of the open *polyline* type, +To create a second section, you need to edit the polyline that represents the coastline: +click on *insert new section* and choose a line of the open *polyline* type, then use the *Add* button to validate the section creation. - -As section 2 is already selected, use the *Addition mode* button to start adding points. -The aim when creating the broken line is to place the first and last points in the approximate + +As section 2 is already selected, use the *Addition mode* button to start adding points. +The aim when creating the broken line is to place the first and last points in the approximate vicinity of the coast line endpoints. |deuxSections| -The endpoints of the two sections must now be made to correspond exactly so as to obtain a closed contour. +The endpoints of the two sections must now be made to correspond exactly so as to obtain a closed contour. -To do so, select both sections simultaneously (shift key) -and switch to *modification mode* (modification mode button). +To do so, select both sections simultaneously (shift key) +and switch to *modification mode* (modification mode button). -Next, in the view window, select both of the first two endpoints to be brought together -by dragging a selection box around them with the mouse (after having zoomed in, if necessary). +Next, in the view window, select both of the first two endpoints to be brought together +by dragging a selection box around them with the mouse (after having zoomed in, if necessary). |deuxExtremites| -The coordinates of the two points are displayed, as well as the distance between the two points, -in the distance column. +The coordinates of the two points are displayed, as well as the distance between the two points, +in the distance column. Note that the right hand button has become active (two sections must be selected). |bringTogether| -When the button is clicked, the two points are superimposed, their coordinates are updated -and the displayed distance changes to zero. +When the button is clicked, the two points are superimposed, their coordinates are updated +and the displayed distance changes to zero. |deuxPointsConfondus| -The same procedure needs to be applied to the other two endpoints, then validate with *Apply and close*. +The same procedure needs to be applied to the other two endpoints, then validate with *Apply and close*. -The polyline now represents a closed contour consisting of 2 sections of different types. +The polyline now represents a closed contour consisting of 2 sections of different types. |contourFermeDeuxSections| * **Note**: When the points are superimposed, one moves to the coordinates of the other. Controlling which of the points remains fixed is not an easy task; therefore it is best to avoid having too much distance between them in order to prevent - any deformation of the coastline. + any deformation of the coastline. -The contour must then be converted into a natural object, providing the maritime domain. +The contour must then be converted into a natural object, providing the maritime domain. |domaineMaritime| Creating sections on a minor bed: dams, bridges =============================================== -A minor river bed can be divided into several sections to which specific treatment options can be applied. -For example: +A minor river bed can be divided into several sections to which specific treatment options can be applied. +For example: * The zone around a bridge, where explicit description of the bridge piers is likely to impose a specific mesh, - if the rest of the minor bed is meshed in stretched triangles in the direction of the flow path. + if the rest of the minor bed is meshed in stretched triangles in the direction of the flow path. * A dam for which one wants to write, for example, the boundary conditions describing its operation. - The dam will then be defined as a "non floodable" or "insubmersible" zone across the minor bed. + The dam will then be defined as a "non floodable" or "insubmersible" zone across the minor bed. * A zone for which the user wants to tailor the mesh. Creating a specific zone around a bridge over the minor bed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Taking the previous example on the Garonne, begin by drawing a rectangle across the *garonne* minor bed, -extending clearly beyond the riverbanks on both sides. Name the polyline rectangle *zonePont* (zoneBridge). +Taking the previous example on the Garonne, begin by drawing a rectangle across the *garonne* minor bed, +extending clearly beyond the riverbanks on both sides. Name the polyline rectangle *zonePont* (zoneBridge). |zonePont| **The polyline of the minor bed needs to be sufficiently refined for the cutting to be precise and to avoid problems when creating the calculation case afterwards.** -If necessary, the polyline of the minor bed should be edited to add points on both sides -of the cross-section lines. -**There must always be at least one point between two cut lines of a spline curve**. +If necessary, the polyline of the minor bed should be edited to add points on both sides +of the cross-section lines. +**There must always be at least one point between two cut lines of a spline curve**. |raffinement| -Use the *Split polylines* command from the *garonne* polyline context menu and open the *Complete split* tab. +Use the *Split polylines* command from the *garonne* polyline context menu and open the *Complete split* tab. Select the *zonePont* polyline then click on the *include* button to have both polylines in the dialog list view. |completeSplitDialog| -After validating with *Apply and close*, four new polylines are obtained to describe the minor bed +After validating with *Apply and close*, four new polylines are obtained to describe the minor bed and four to describe the bridge zone. |zonesSplitCreees| -The new zones will be reconstructed by joining the polylines together, set by set, -with the *Merge polylines* command. +The new zones will be reconstructed by joining the polylines together, set by set, +with the *Merge polylines* command. -The bridge zone is composed of the following four polylines: +The bridge zone is composed of the following four polylines: |zonePontSplit| @@ -186,16 +186,16 @@ The downstream minor bed zone is composed of two polylines: |zoneAvalSplit| -To join the polylines, select any one of them and click on the *Merge polylines* command in the context menu. -You now need to select the four polylines, click on the *include* button, assign a name to the new polyline, *litMineurPont* ("minorBedBridge") and confirm the command by clicking on *Apply and close*. +To join the polylines, select any one of them and click on the *Merge polylines* command in the context menu. +You now need to select the four polylines, click on the *include* button, assign a name to the new polyline, *litMineurPont* ("minorBedBridge") and confirm the command by clicking on *Apply and close*. |mergeZonesPont| -The *litMineurAmont* ("upstreamMinorBed") and *litMineurAval* ("downstreamMinorBed") polylines are created -in the same way. The three new polylines serve to define three immersible zones: *litMineur_aval*, -*litMineur_amont* and *litMineur_pont*. +The *litMineurAmont* ("upstreamMinorBed") and *litMineurAval* ("downstreamMinorBed") polylines are created +in the same way. The three new polylines serve to define three immersible zones: *litMineur_aval*, +*litMineur_amont* and *litMineur_pont*. -If one wants to have bridge piers modelled in the mesh, these need to be represented as polylines +If one wants to have bridge piers modelled in the mesh, these need to be represented as polylines and non-submersible zones defined. |pilesDePont| @@ -205,8 +205,8 @@ and non-submersible zones defined. Creating a specific zone around a dam on the minor bed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The principle is exactly the same as for the bridge, but without the piers. +The principle is exactly the same as for the bridge, but without the piers. .. only:: html - :ref:`ref_casParticuliers` + :ref:`ref_english_casParticuliers` diff --git a/doc/salome/tutorial/english/english_miseEnDonneesTelemac.rst b/doc/salome/tutorial/english/english_miseEnDonneesTelemac.rst index 0b457d53..a7687938 100644 --- a/doc/salome/tutorial/english/english_miseEnDonneesTelemac.rst +++ b/doc/salome/tutorial/english/english_miseEnDonneesTelemac.rst @@ -20,38 +20,38 @@ TELEMAC setup ######################################### -.. |HYDROSolver| image:: /../_static/HYDROSolver.png +.. |HYDROSolver| image:: ../_static/HYDROSolver.png :align: middle :width: 16pt :height: 16pt -.. |eficas_04| image:: /../_static/eficas_04.png +.. |eficas_04| image:: ../_static/eficas_04.png :align: middle :width: 16pt :height: 16pt -.. |genereCondlim| image:: /../_static/genereCondlim.png +.. |genereCondlim| image:: ../_static/genereCondlim.png :align: middle -.. |eficas_01| image:: /../_static/eficas_01.png +.. |eficas_01| image:: ../_static/eficas_01.png :align: middle -.. |eficas_02| image:: /../_static/eficas_02.png +.. |eficas_02| image:: ../_static/eficas_02.png :align: middle -.. |eficas_03| image:: /../_static/eficas_03.png +.. |eficas_03| image:: ../_static/eficas_03.png :align: middle -.. |eficas_20| image:: /../_static/eficas_20.png +.. |eficas_20| image:: ../_static/eficas_20.png :align: middle -.. |eficas_21| image:: /../_static/eficas_21.png +.. |eficas_21| image:: ../_static/eficas_21.png :align: middle -.. |eficas_22| image:: /../_static/eficas_22.png +.. |eficas_22| image:: ../_static/eficas_22.png :align: middle -.. |eficas_23| image:: /../_static/eficas_23.png +.. |eficas_23| image:: ../_static/eficas_23.png :align: middle Once the mesh is generated with the altimetry data, it remains to define the nature of the boundary condition regions, @@ -222,5 +222,5 @@ In the end, the user can choose from pre-filled "template case files". These inc * A thermal case model file. .. only:: html -  - :ref:`ref_exempleInondation` + + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_objetsArtificiels.rst b/doc/salome/tutorial/english/english_objetsArtificiels.rst index b087f2c5..9bbcd0bd 100644 --- a/doc/salome/tutorial/english/english_objetsArtificiels.rst +++ b/doc/salome/tutorial/english/english_objetsArtificiels.rst @@ -17,78 +17,78 @@ along with SALOME HYDRO module. If not, see . ######################################### -Artificial objects +Artificial objects ######################################### -.. |axeDigue| image:: /../_static/axeDigue.png +.. |axeDigue| image:: ../_static/axeDigue.png :align: middle -.. |creationDigue_1| image:: /../_static/creationDigue_1.png +.. |creationDigue_1| image:: ../_static/creationDigue_1.png :align: middle -.. |modifModeProfile| image:: /../_static/modifModeProfile.png +.. |modifModeProfile| image:: ../_static/modifModeProfile.png :align: middle -.. |creationDigue_2| image:: /../_static/creationDigue_2.png +.. |creationDigue_2| image:: ../_static/creationDigue_2.png :align: middle -.. |creationDigue_3| image:: /../_static/creationDigue_3.png +.. |creationDigue_3| image:: ../_static/creationDigue_3.png :align: middle -.. |altitudeDigue| image:: /../_static/altitudeDigue.png +.. |altitudeDigue| image:: ../_static/altitudeDigue.png :align: middle -.. |polyline3D| image:: /../_static/polyline3D.png +.. |polyline3D| image:: ../_static/polyline3D.png :align: middle -.. |artificialDigue| image:: /../_static/artificialDigue.png +.. |artificialDigue| image:: ../_static/artificialDigue.png :align: middle -.. |zoomDigue| image:: /../_static/zoomDigue.png +.. |zoomDigue| image:: ../_static/zoomDigue.png :align: middle -Artificial objects cover embankments and channels. Both object types are constructed on the same principle: +Artificial objects cover embankments and channels. Both object types are constructed on the same principle: - * A constant vertical section, + * A constant vertical section, - * A 3D axis, this being a 3D polyline from which the section will be extruded. + * A 3D axis, this being a 3D polyline from which the section will be extruded. The 3D axis is constructed from a horizontal polyline, to which will be associated a vertically-defined line of altitude, which gives the Z-value as a function of the curvilinear abscissa of the polyline’s horizontal path. The altitude line is either explicitly constructed or obtained by projecting the horizontal polyline -onto a bathymetry field. +onto a bathymetry field. When the node altitudes are computed (Z interpolation), a specific treatment is applied to the nodes on the -embankment: the altitude of the node is evaluated on the 3D geometric shape of the embankment, as defined above. +embankment: the altitude of the node is evaluated on the 3D geometric shape of the embankment, as defined above. Creating an embankment ====================== -To define the embankment's horizontal axis, an open, spline-type polyline is created with the polyline editor -(context menu of the *POLYLINES* folder in the SALOME study tree). +To define the embankment's horizontal axis, an open, spline-type polyline is created with the polyline editor +(context menu of the *POLYLINES* folder in the SALOME study tree). -Assign the name axeDigue (embankmentAxis) to this polyline. +Assign the name axeDigue (embankmentAxis) to this polyline. |axeDigue| -The embankment section is created using the *Create profile* context menu of the *PROFILES* folder -in the SALOME study tree. +The embankment section is created using the *Create profile* context menu of the *PROFILES* folder +in the SALOME study tree. -This section is named *sectionDigue* (embankmentSection). +This section is named *sectionDigue* (embankmentSection). -The approximate shape of the section has to be drawn freehand; +The approximate shape of the section has to be drawn freehand; it will later be edited to put in the exact elevation parameters. |creationDigue_1| -To correct the node coordinates, you need to switch to Modification mode: +To correct the node coordinates, you need to switch to Modification mode: |modifModeProfile| -The nodes can be block selected by grabbing them in a selection rectangle, in the graphic view. +The nodes can be block selected by grabbing them in a selection rectangle, in the graphic view. -They are displayed in a table above the graphic view. +They are displayed in a table above the graphic view. The nodes are reordered by clicking on the *Index* column title. @@ -96,76 +96,76 @@ The nodes are reordered by clicking on the *Index* column title. For the choice of Z-values, it is essential to know that the final altitude of a point on the embankment is obtained from the cross-section at this point, by adding the elevation of the point on the section to the elevation of the -section along the altitude profile. To be more specific, the calculation required is as follows: +section along the altitude profile. To be more specific, the calculation required is as follows: * Point **A** (x,y,0), whose altitude is required, is projected onto the *axeDigue* curve at a point **P** (x’,y’,0) such that the straight line *AP* is perpendicular to the tangent to the curve of the embankment axis at **P**. - The point **P** is at a horizontal distance *d* = distance(A,P) from the *axeDigue* curve. + The point **P** is at a horizontal distance *d* = distance(A,P) from the *axeDigue* curve. * From the curvilinear coordinate **P** on *axeDigue*, we get a value of Z0 value on the line of altitude. - This Z0 value corresponds to the zero-elevation level of the embankment section. + This Z0 value corresponds to the zero-elevation level of the embankment section. * To obtain the final altitude in **P**, the elevation Z1 on the section is calculated at the abscissa point *d*. - The final altitude is Z = Z0 +Z1. + The final altitude is Z = Z0 +Z1. - * **Note:** this calculation method assumes a symmetrical cross-section with respect to x=0. + * **Note:** this calculation method assumes a symmetrical cross-section with respect to x=0. -In this case, the line of altitude that will be defined corresponds to the vertex (i.e. top) of the cross-section. Hence, we create a symmetrical cross-section that is 20 metres wide, with fairly steep slopes. +In this case, the line of altitude that will be defined corresponds to the vertex (i.e. top) of the cross-section. Hence, we create a symmetrical cross-section that is 20 metres wide, with fairly steep slopes. |creationDigue_3| -The embankment line of altitude still has to be created. -It will be defined explicitly with the altitude of the two ends. +The embankment line of altitude still has to be created. +It will be defined explicitly with the altitude of the two ends. -If the elevation of the embankment is variable, an approximate idea of its length is needed -in order to construct an accurate altitude profile (a display function of the polyline lengths is missing). +If the elevation of the embankment is variable, an approximate idea of its length is needed +in order to construct an accurate altitude profile (a display function of the polyline lengths is missing). -If more than two points are defined, the altitude is linearly interpolated between two points and, -if the curve is longer than the altitude line, the Z values beyond the end point are taken +If more than two points are defined, the altitude is linearly interpolated between two points and, +if the curve is longer than the altitude line, the Z values beyond the end point are taken at the elevation of this last point. |altitudeDigue| -The 3D axis has to be created next using the *Create polyline 3D* context menu of the POLYLINES 3D folder. +The 3D axis has to be created next using the *Create polyline 3D* context menu of the POLYLINES 3D folder. |polyline3D| -The last step uses the *Create digue* context menu of the *ARTIFICIAL OBJECTS* folders. +The last step uses the *Create digue* context menu of the *ARTIFICIAL OBJECTS* folders. |artificialDigue| -The equidistance parameter serves to optimise the precision of the section extrusion along the axis. +The equidistance parameter serves to optimise the precision of the section extrusion along the axis. - * If the value is too high in relation to the radius of axis curvature, the cross-section - is offset from its centre line during extrusion. + * If the value is too high in relation to the radius of axis curvature, the cross-section + is offset from its centre line during extrusion. - * If the value is too low, the computational time becomes long. + * If the value is too low, the computational time becomes long. -Taking a value of about two or three times the width of the embankment is a reasonable first approximation. +Taking a value of about two or three times the width of the embankment is a reasonable first approximation. -The views of the embankment and its axis should then be overlaid to verify the result. +The views of the embankment and its axis should then be overlaid to verify the result. |zoomDigue| -When the calculation case with the embankment is set up, the latter should be isolated in a specific region -because it is preferable to mesh it in quadrangles using the *Quadrangle (Medial Axis projection)* algorithm. +When the calculation case with the embankment is set up, the latter should be isolated in a specific region +because it is preferable to mesh it in quadrangles using the *Quadrangle (Medial Axis projection)* algorithm. -As the embankment is overlaid on natural terrain, the *ZMAX* option is generally the most logical choice for the altitude calculation. +As the embankment is overlaid on natural terrain, the *ZMAX* option is generally the most logical choice for the altitude calculation. Creating a channel =================== -The canal channel is created in exactly same the same way as the embankment but using a specific menu, +The canal channel is created in exactly same the same way as the embankment but using a specific menu, *Create channel*, in the *ARTIFICIAL OBJECTS* folder. - -The section is bowl-shaped and the altitude is calculated using the same approach as for the embankment. -When the calculation case with the channel is being set up, the channel should be isolated in a specific region +The section is bowl-shaped and the altitude is calculated using the same approach as for the embankment. + +When the calculation case with the channel is being set up, the channel should be isolated in a specific region as it is preferable to mesh it in quadrangles using the Quadrangle (Medial Axis projection) algorithm. - -For the altitude calculation, with the channel being in natural terrain, + +For the altitude calculation, with the channel being in natural terrain, the *ZMIN* option is the most logical choice in most cases. .. only:: html -  - :ref:`ref_casParticuliers` + + :ref:`ref_english_casParticuliers` diff --git a/doc/salome/tutorial/english/english_objetsNaturels.rst b/doc/salome/tutorial/english/english_objetsNaturels.rst index 23e0dbf7..21aa8aa3 100644 --- a/doc/salome/tutorial/english/english_objetsNaturels.rst +++ b/doc/salome/tutorial/english/english_objetsNaturels.rst @@ -20,51 +20,51 @@ "Natural" objects – immersible zones ######################################### -.. |createImmersibleZone| image:: /../_static/createImmersibleZone.png +.. |createImmersibleZone| image:: ../_static/createImmersibleZone.png :align: middle -.. |selectColor| image:: /../_static/selectColor.png +.. |selectColor| image:: ../_static/selectColor.png :align: middle -.. |zonesImmersibles| image:: /../_static/zonesImmersibles.png +.. |zonesImmersibles| image:: ../_static/zonesImmersibles.png :align: middle -.. |changeLayerOrder| image:: /../_static/changeLayerOrder.png +.. |changeLayerOrder| image:: ../_static/changeLayerOrder.png :align: middle -.. |zoneSubmersible| image:: /../_static/zoneSubmersible.png +.. |zoneSubmersible| image:: ../_static/zoneSubmersible.png :align: middle -The contours created thus far are for "natural" objects, as against "artificial" objects. -The latter classification corresponds to the use of altitude mode for computing the Z-elevation -at all points on their surfaces. +The contours created thus far are for "natural" objects, as against "artificial" objects. +The latter classification corresponds to the use of altitude mode for computing the Z-elevation +at all points on their surfaces. Natural objects correspond to surfaces whose Z-dimension is determined by a bathymetry/altitude field. -Examples of artificial objects are embankments, canals or channels, which will be represented by a constant +Examples of artificial objects are embankments, canals or channels, which will be represented by a constant cross-section, extruded along a line whose altitude could potentially vary. - -There are two sub-categories of natural objects: "immersible" zones associated to a point cloud of the -bathymetry field /altitude type (.xyz or .asc) and "stream" zones which correspond to rivers described -by a series of cross profiles. These profiles constitute a bathymetry field on which a specific interpolation -method will be applied to calculate the Z-dimension. -In this exercise, three immersible zones will be created, defined by a contour and a bathymetry/altitude field: +There are two sub-categories of natural objects: "immersible" zones associated to a point cloud of the +bathymetry field /altitude type (.xyz or .asc) and "stream" zones which correspond to rivers described +by a series of cross profiles. These profiles constitute a bathymetry field on which a specific interpolation +method will be applied to calculate the Z-dimension. - * The minor bed, defined by the *garonne* contour and the bathymetry field *garonne_point_L93*, +In this exercise, three immersible zones will be created, defined by a contour and a bathymetry/altitude field: - * The major bed, defined by the contour of the *garonne_point_L93* field and the field itself, + * The minor bed, defined by the *garonne* contour and the bathymetry field *garonne_point_L93*, - * The study domain, defined by its contour, and the *cloud_02* field. + * The major bed, defined by the contour of the *garonne_point_L93* field and the field itself, -The context menu of the *NATURAL OBJECTS* folder is used to create an immersible zone. + * The study domain, defined by its contour, and the *cloud_02* field. + +The context menu of the *NATURAL OBJECTS* folder is used to create an immersible zone. |createImmersibleZone| -The dialog box proposes defining the zone name and selecting the contour and the bathymetry from the drop-down +The dialog box proposes defining the zone name and selecting the contour and the bathymetry from the drop-down lists of existing objects. The choices must be confirmed with *apply and close* to create the zone. - -Once created, the colour of the zone can changed using the context menu associated to the object name. + +Once created, the colour of the zone can changed using the context menu associated to the object name. |selectColor| @@ -72,17 +72,17 @@ Displaying all three zones should provide a view resembling the one below: |zonesImmersibles| -It may be necessary to re-order the display layers: the *Change Layer* Order option in the context menu +It may be necessary to re-order the display layers: the *Change Layer* Order option in the context menu of the graphic view permits to set the object order. This setting will be remembered when the study is saved: |changeLayerOrder| -The context menu associated with each immersible zone contains a *Submersible* parameter that is checked by default -(icon pushed in). If the user wants to create an island in the TELEMAC sense, i.e. a non-floodable zone, +The context menu associated with each immersible zone contains a *Submersible* parameter that is checked by default +(icon pushed in). If the user wants to create an island in the TELEMAC sense, i.e. a non-floodable zone, which will create a hole in the mesh, this parameter has to be unchecked. - + |zoneSubmersible| -  + .. only:: html - :ref:`ref_exempleInondation` + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_piegesAEviter.rst b/doc/salome/tutorial/english/english_piegesAEviter.rst index f2bc6647..f6c4bee0 100644 --- a/doc/salome/tutorial/english/english_piegesAEviter.rst +++ b/doc/salome/tutorial/english/english_piegesAEviter.rst @@ -70,4 +70,4 @@ This paragraph will be re-written according to the user feedback. .. only:: html - :ref:`ref_notionsPrealables` + :ref:`ref_english_notionsPrealables` diff --git a/doc/salome/tutorial/english/english_polylignes.rst b/doc/salome/tutorial/english/english_polylignes.rst index b081b03d..86264a18 100644 --- a/doc/salome/tutorial/english/english_polylignes.rst +++ b/doc/salome/tutorial/english/english_polylignes.rst @@ -20,52 +20,52 @@ Creation / modification of polylines ######################################### -.. |contour_garonne| image:: /../_static/contourGaronne.png +.. |contour_garonne| image:: ../_static/contourGaronne.png :align: middle -.. |contour_lit_majeur| image:: /../_static/contourLitMajeur.png +.. |contour_lit_majeur| image:: ../_static/contourLitMajeur.png :align: middle -.. |icone_polyligne_xy| image:: /../_static/icon_polyline_xy.png +.. |icone_polyligne_xy| image:: ../_static/icon_polyline_xy.png :align: middle -.. |createPolyligneDialogue1| image:: /../_static/createPolyligneDialogue1.png +.. |createPolyligneDialogue1| image:: ../_static/createPolyligneDialogue1.png :align: middle -.. |insertNewSection| image:: /../_static/insertNewSection.png +.. |insertNewSection| image:: ../_static/insertNewSection.png :align: middle -.. |createPolyligneDialogue2| image:: /../_static/createPolyligneDialogue2.png +.. |createPolyligneDialogue2| image:: ../_static/createPolyligneDialogue2.png :align: middle -.. |addition_mode| image:: /../_static/additionMode.png +.. |addition_mode| image:: ../_static/additionMode.png :align: middle -.. |ajoutPointsPolyligne| image:: /../_static/ajoutPointsPolyligne.png +.. |ajoutPointsPolyligne| image:: ../_static/ajoutPointsPolyligne.png :align: middle -.. |modification_mode| image:: /../_static/modificationMode.png +.. |modification_mode| image:: ../_static/modificationMode.png :align: middle -.. |undoPoly| image:: /../_static/undoPoly.png +.. |undoPoly| image:: ../_static/undoPoly.png :align: middle -.. |modificationPolyligne2| image:: /../_static/modificationPolyligne2.png +.. |modificationPolyligne2| image:: ../_static/modificationPolyligne2.png :align: middle We are going to create three lines by drawing on the maps and the bathymetry. - + * A closed contour representing a portion of the Garonne (extending beyond the study domain defined later) - represented by the dark blue surface in the following image: + represented by the dark blue surface in the following image: |contour_garonne| -* Another closed contour on a portion of the major bed of the river (still extending beyond the study domain - both upstream and downstream), corresponding to the bathymetry field garonne_point_L93. +* Another closed contour on a portion of the major bed of the river (still extending beyond the study domain + both upstream and downstream), corresponding to the bathymetry field garonne_point_L93. * A closed contour in broken lines that will delineate the boundaries of our study domain. -The contour of the major bed and the study domain: +The contour of the major bed and the study domain: |contour_lit_majeur| @@ -74,39 +74,39 @@ Drawing the river banks The context menu |icone_polyligne_xy| of the *POLYLINES* folder in the SALOME study tree is used to create a polyline. -The first section of the creation dialog box is used to name the polyline. -It is important to give the objects meaningful names as a large number of them may be need to be handled. +The first section of the creation dialog box is used to name the polyline. +It is important to give the objects meaningful names as a large number of them may be need to be handled. * **remark** : do not use accentuated characters in object names: this may induce problems, fr instance in dump Python scripts. - -They can always be renamed later: + +They can always be renamed later: |createPolyligneDialogue1| -The polylines may comprise several sections. We will only be using one, which has to be created: +The polylines may comprise several sections. We will only be using one, which has to be created: |insertNewSection| -In the dialog box related to the section, choose a spline-type, closed line and click on the add button. +In the dialog box related to the section, choose a spline-type, closed line and click on the add button. |createPolyligneDialogue2| - * **Note**: There are two types of polyline: + * **Note**: There are two types of polyline: * *spline*: a single continuous line, with derivative continuity passing through all the points. This type of line is privileged when creating curved lines; the control points will not be reused in the mesh, resulting in more flexibility control of the mesh refinement. - + * polyline: a single continuous line, composed of straight segments. This type of line must be used for artificial - objects comprising straight segments and whenever broken lines are needed. The points are kept in the mesh. + objects comprising straight segments and whenever broken lines are needed. The points are kept in the mesh. -Once the section has been created, points must be added by switching to the addition mode: +Once the section has been created, points must be added by switching to the addition mode: |addition_mode| -Now click on the map, starting at one end **(upstream or downstream of the domain)** and follow the contour of the river. +Now click on the map, starting at one end **(upstream or downstream of the domain)** and follow the contour of the river. Each click adds a point and the closed contour is progressively drawn. One or more of the last points can be deleted -with the undo / redo buttons: +with the undo / redo buttons: |undoPoly| @@ -115,7 +115,7 @@ with the undo / redo buttons: |ajoutPointsPolyligne| -Continue to add points as needed until you arrive back at the starting point, having represented the two banks. +Continue to add points as needed until you arrive back at the starting point, having represented the two banks. There is no need to add too many points, unless the riverbank is deeply incised and these details need to be captured. For example, about sixty points are required along the river portion of interest in this case. @@ -123,47 +123,47 @@ When the entry is finished, confirm the created section by clicking *apply and c Modifying and editing polylines ------------------------------- - + If the result is not satisfactory, the polyline can be modified through the associated context menu, by first selecting the section and afterwards clicking on modification mode: |modification_mode| -It is then possible to: +It is then possible to: - * Select a single point by clicking on it, + * Select a single point by clicking on it, - * Select several points by enclosing them in a selection box, + * Select several points by enclosing them in a selection box, - * Create an intermediate point by clicking on the line, between two points. + * Create an intermediate point by clicking on the line, between two points. The selected point(s) can be moved using drag-and-drop (left button click and hold down while moving). -They remain selected until another click or selection is made. +They remain selected until another click or selection is made. -The Undo button can be used, if needed, to cancel the latest changes. +The Undo button can be used, if needed, to cancel the latest changes. The coordinates of the selected points are displayed in the dialog box as editable text. |modificationPolyligne2| Two lines appear when editing: a precise, solid black line that is not recalculated each time an edit is made -and a red line that changes with each modification. The latter is less precise but is redrawn more quickly +and a red line that changes with each modification. The latter is less precise but is redrawn more quickly (This is an important factor when lines containing a "large" number of points need to be modified). The line can be recalculated from within the dialog box by clicking the *apply* button. -If you wish to continue the modifications, the section can then be reselected with a double click, -followed by *OK* or *Cancel*. +If you wish to continue the modifications, the section can then be reselected with a double click, +followed by *OK* or *Cancel*. * **Note**: In edition mode, double clicking on the section provides options to change the segment type, - from spline to polyline or vice versa, and the closure. + from spline to polyline or vice versa, and the closure. Drawing the contour of the major bed and the study domain ========================================================= Once the river has been drawn, the next step is to draw the contour of the major river bed bathymetry, *garonne_point_L93*, then define the outside contour of the computational domain, -which must cut the other two lines upstream and downstream. +which must cut the other two lines upstream and downstream. **It is preferable for the computational domain to cut the river perpendicular to its axis, in order to correctly define the upstream and downstream boundary conditions. @@ -172,5 +172,5 @@ of over-constrained triangles appearing when the mesh is created** (this problem that can be corrected by diagonal detection and inversion). .. only:: html -  - :ref:`ref_exempleInondation` + + :ref:`ref_english_exempleInondation` diff --git a/doc/salome/tutorial/english/english_preliminaires.rst b/doc/salome/tutorial/english/english_preliminaires.rst index 4a6c75f7..675fe850 100644 --- a/doc/salome/tutorial/english/english_preliminaires.rst +++ b/doc/salome/tutorial/english/english_preliminaires.rst @@ -64,7 +64,7 @@ Preliminary concepts Main steps in a study using SALOME-HYDRO ################################################ -.. |etapesEtude| image:: /../_static/etapesEtude.png +.. |etapesEtude| image:: ../_static/etapesEtude.png :align: middle SALOME contains all the modules needed to start a Telemac study. diff --git a/doc/salome/tutorial/english/english_sinusX_Format.rst b/doc/salome/tutorial/english/english_sinusX_Format.rst index 1ca3fd38..4a5bb489 100644 --- a/doc/salome/tutorial/english/english_sinusX_Format.rst +++ b/doc/salome/tutorial/english/english_sinusX_Format.rst @@ -86,7 +86,7 @@ Bloc Delimiter **type:** -* type = S: Scatter plot +* type = S: Scatter plot * type = C: XYZ curve * type = P: XYZ profile * type = N: isocontour @@ -110,7 +110,7 @@ Closed and spline parameters CP closed spline -Closed and spline are two booleans (0 or 1). +Closed and spline are two booleans (0 or 1). for instance, :: @@ -119,7 +119,7 @@ for instance, means a closed line of type spline. This parameter is significant only for curves, profiles and isocontour (types C, P, N) -and is present but not interpreted for Scatter plot. +and is present but not interpreted for Scatter plot. specific curve parameters, depending on curve type ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -214,7 +214,7 @@ example of scatter plot bloc *import from existing data file:* :: - C + C B S +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.000000E+00 +1.000000E+00 +1.000000E+00 1 CN semis_de_points CP 0 1 @@ -237,7 +237,7 @@ For each point, only the x y z value are used. *export:* :: - C + C B S CN semis_de_points CP 0 0 @@ -262,12 +262,12 @@ profile defined by two georeferenced extremities *import from existing data file:* :: - B P + B P CN profil_with_extremities CP 0 1 CP +2.759820E05 +1.284410E05 +2.760570E05 +1.284240E05 CP 2 - 1.120 0.000 -1.250 + 1.120 0.000 -1.250 x y z values lines with y=0.0 ... @@ -277,12 +277,12 @@ The two extremities are (+2.759820E05 +1.284410E05 0.0) and (+2.760570E05 +1.284 *export:* :: - B P + B P CN profil_with_extremities CP 0 1 - CP 275982.000 128441.000 276057.000 128424.000 + CP 275982.000 128441.000 276057.000 128424.000 CP 2 - 1.120 0.000 -1.250 + 1.120 0.000 -1.250 x y z values lines with y=0.0 ... @@ -292,7 +292,7 @@ profile not georeferenced *import from existing data file:* :: - B P + B P CN profil_not_georeferenced CP 0 0 CP 0.0 0.0 0.0 0.0 @@ -308,7 +308,7 @@ The 4 real parameters are null, meaning there are no georeferenced extremities. *export:* :: - B P + B P CN profil_not_georeferenced CP 0 0 CP 0.0 0.0 0.0 0.0 @@ -324,7 +324,7 @@ profile with fully georeferenced points *import from existing data file:* :: - B P + B P CN profil_fully_georeferenced CP 0 1 CP +1.00000E+02 +2.00000E+02 +1.00000E+01 +2.00000E+01 @@ -340,7 +340,7 @@ The 4 real parameters are not used. *export:* :: - B P + B P CN profil_fully_georeferenced CP 0 1 CP 0.0 0.0 0.0 0.0 @@ -357,10 +357,10 @@ example of XYZ curve B C -3.333330E+03 +4.875000E+04 +0.000000E+00 +3.333330E+02 +1.666670E+02 +1.000000E+00 0.658992 CN trait_cote_ile - CP 1 1 - CP +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 - CP 0 - C + CP 1 1 + CP +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 + CP 0 + C 211563.340 133489.165 8.750 A 211604.013 133517.519 9.000 A 211645.047 133544.734 9.100 A @@ -397,7 +397,7 @@ This 3D curve is converted in a polyline and a profile in HYDRO module: The u parameter of the vertical profile is the curvilign abcissa (in meters) along the isocontour. -*export* +*export* See isocontour and XYZ profile not georeferenced @@ -409,10 +409,10 @@ example of isocontour B N -3.333330E+03 +4.875000E+04 +0.000000E+00 +3.333330E+02 +1.666670E+02 +1.000000E+00 0.658992 CN trait_cote_ile - CP 1 1 - CP 9.0 - CP 0 - C + CP 1 1 + CP 9.0 + CP 0 + C 211563.340 133489.165 9.000 A 211604.013 133517.519 9.000 A 211645.047 133544.734 9.000 A @@ -455,7 +455,7 @@ The u parameter of the vertical profile is the curvilign abcissa (in meters) alo B N CN trait_cote_ile - CP 1 1 + CP 1 1 CP 0.0 CP 0 C @@ -512,5 +512,5 @@ When exporting SinusX files, all the polylines and profiles can be exported in a .. only:: html -  - :ref:`ref_formatsSpecs` + + :ref:`ref_english_formatsSpecs` diff --git a/doc/salome/tutorial/english/english_streams.rst b/doc/salome/tutorial/english/english_streams.rst index d6d18d5b..4590c769 100644 --- a/doc/salome/tutorial/english/english_streams.rst +++ b/doc/salome/tutorial/english/english_streams.rst @@ -20,28 +20,28 @@ Streams ######################################### -.. |exemple_profil| image:: /../_static/exemple_profil.png +.. |exemple_profil| image:: ../_static/exemple_profil.png :align: middle -.. |profilsEtLignedo| image:: /../_static/profilsEtLignedo.png +.. |profilsEtLignedo| image:: ../_static/profilsEtLignedo.png :align: middle -.. |iconeImportSinusX| image:: /../_static/iconeImportSinusX.png +.. |iconeImportSinusX| image:: ../_static/iconeImportSinusX.png :align: middle -.. |menuImportSinusX| image:: /../_static/menuImportSinusX.png +.. |menuImportSinusX| image:: ../_static/menuImportSinusX.png :align: middle -.. |georeferencementProfiles| image:: /../_static/georeferencementProfiles.png +.. |georeferencementProfiles| image:: ../_static/georeferencementProfiles.png :align: middle -.. |profilsIgnores| image:: /../_static/profilsIgnores.png +.. |profilsIgnores| image:: ../_static/profilsIgnores.png :align: middle -.. |createStream| image:: /../_static/createStream.png +.. |createStream| image:: ../_static/createStream.png :align: middle -.. |objetStream| image:: /../_static/objetStream.png +.. |objetStream| image:: ../_static/objetStream.png :align: middle Stream object allow to define a river with a list of profiles (cross sections). @@ -99,6 +99,6 @@ under the name previouly given, *garonne_stream*. The corresponding point cloud appears in *BATHYMETRIES* folder under the name *garonne_stream_Altitude_1*. .. only:: html -  - :ref:`ref_casParticuliers` + + :ref:`ref_english_casParticuliers` diff --git a/doc/salome/tutorial/english/index.rst b/doc/salome/tutorial/english/index.rst index a88b3399..f33648fc 100644 --- a/doc/salome/tutorial/english/index.rst +++ b/doc/salome/tutorial/english/index.rst @@ -21,12 +21,12 @@ SALOME HYDRO Tutorial %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -.. |Hydro_module_button| image:: /../_static/HYDRO.png +.. |Hydro_module_button| image:: ../_static/HYDRO.png :align: middle :width: 16pt :height: 16pt -.. |hydrosolver_module_button| image:: /../_static/HYDROSolver.png +.. |hydrosolver_module_button| image:: ../_static/HYDROSolver.png :align: middle :width: 16pt :height: 16pt @@ -45,21 +45,21 @@ to which two specific task modules have been added: The tutorial provides a step-by-step guide to a carrying out a case study on river flood inundation. The practical exercise is drawn from a real example for which plenty of data is available. -.. _ref_installationLancementSalome: +.. _ref_english_installationLancementSalome: ################################### Introduction to SALOME ################################### This section briefly recalls the procedure for installing and running SALOME. - + .. toctree:: :numbered: :maxdepth: 3 english_installationLancementSalome.rst -.. _ref_notionsPrealables: +.. _ref_english_notionsPrealables: ################################### A few preliminary concepts @@ -78,10 +78,10 @@ This is followed by a simple exercise enabling to discover these concepts throug english_piegesAEviter.rst english_donneesPrealables.rst -.. _ref_outilsComplementaires: +.. _ref_english_outilsComplementaires: ################################### -SALOME Complementary tools +SALOME Complementary tools ################################### qgis et CloudCompare are provided with SALOME-HYDRO. @@ -90,11 +90,11 @@ qgis et CloudCompare are provided with SALOME-HYDRO. :numbered: :maxdepth: 3 - english_introQgis.rst - english_introCloudCompare.rst + english_introQgis.rst + english_introCloudCompare.rst -.. _ref_exempleInondation: +.. _ref_english_exempleInondation: ################################### A simple example of flooding @@ -118,7 +118,7 @@ This exercise covers the full procedure for conducting a flood study on a simple english_lancementCalcul.rst english_depouillementCalcul.rst -.. _ref_casParticuliers: +.. _ref_english_casParticuliers: ################################### Some specific cases @@ -135,7 +135,7 @@ This chapter introduces a few concepts that were not addressed in the previous s english_manipsPolys.rst english_landCoverMap.rst -.. _ref_formatsSpecs: +.. _ref_english_formatsSpecs: ################################### Formats and specifications @@ -143,7 +143,7 @@ Formats and specifications A few import-export formats are introduced herein. The first SinusX format documentation corresponds to the original use of the format and gives a transposition for SALOME use. -**The second SinusX format documentation provides the precise specification for the SinusX format in SALOME HYDRO. The latter documentation constitutes the reference for SALOME HYDRO.** +**The second SinusX format documentation provides the precise specification for the SinusX format in SALOME HYDRO. The latter documentation constitutes the reference for SALOME HYDRO.** .. toctree:: diff --git a/doc/salome/tutorial/index.rst b/doc/salome/tutorial/index.rst index e6fc66c8..01d2ed98 100644 --- a/doc/salome/tutorial/index.rst +++ b/doc/salome/tutorial/index.rst @@ -34,16 +34,16 @@ Tutoriel SALOME HYDRO SALOME-HYDRO est une plateforme métier dédiée aux études d'hydraulique à surface libre, avec les codes TELEMAC et MASCARET. La plateforme s'appuie sur les modules génériques de SALOME (géométrie, maillage, supervision de calculs, post traitement...) -auxquels ont été ajoutés deux modules spécifiques du métier : +auxquels ont été ajoutés deux modules spécifiques du métier : * HYDRO |Hydro_module_button| : acquisition des données de terrain (contours, bathymétrie...), - construction de la géométrie du cas de calcul, identification des zones de + construction de la géométrie du cas de calcul, identification des zones de condition limite... * HYDROSolver |hydrosolver_module_button| : définition des paramètres physiques et numériques du cas de calcul, pilotage du calcul. -Le tutoriel traite l'ensemble des étapes d'une étude d'inondation liée à une crue +Le tutoriel traite l'ensemble des étapes d'une étude d'inondation liée à une crue de fleuve. L'exemple est tiré d'un cas réel pour lequel beaucoup de données sont disponibles. .. _ref_installationLancementSalome: @@ -52,8 +52,8 @@ de fleuve. L'exemple est tiré d'un cas réel pour lequel beaucoup de données s Introduction à SALOME ################################### -Dans cette partie, on rappelle comment installer et exécuter SALOME. - +Dans cette partie, on rappelle comment installer et exécuter SALOME. + .. toctree:: :numbered: :maxdepth: 3 @@ -69,7 +69,7 @@ Quelques notions préalables On décrit ici les différentes étapes d'une étude SALOME-HYDRO, en introduisant les concepts nécessaires. Cette partie contient également une série de recommandations et de pièges à éviter. -L'exercice décrit plus bas permet de découvrir ces concepts par la manipulation. +L'exercice décrit plus bas permet de découvrir ces concepts par la manipulation. .. toctree:: :numbered: @@ -92,8 +92,8 @@ Les outils qgis et CloudCompare sont fournis à coté de SALOME-HYDRO. :numbered: :maxdepth: 3 - introQgis.rst - introCloudCompare.rst + introQgis.rst + introCloudCompare.rst .. _ref_exempleInondation: @@ -143,7 +143,7 @@ Formats et specifications ################################### On introduit ici quelques formats d'import-export. -La documentation du format SinusX en français correspond à l'usage d'origine du format et donne une transposition pour l'usage SALOME, +La documentation du format SinusX en français correspond à l'usage d'origine du format et donne une transposition pour l'usage SALOME, **La documentation du format SinusX en anglais donne la spécification précise du format SinusX dans SALOME HYDRO. C'est cette dernière documentation qui constitue la référence pour SALOME HYDRO.**