Merge remote branch 'origin/bsr/medmpi'

[modules/smesh.git] / doc / salome / gui / SMESH / input / about_hypo.doc

diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc
index e4bf36ca0945293fa2f49ca48b957e79c4618a66..65d5c7ad0b24550bdb198ab9d10499364296cd4f 100644 (file)
--- a/doc/salome/gui/SMESH/input/about_hypo.doc
+++ b/doc/salome/gui/SMESH/input/about_hypo.doc
@@ -3,8 +3,8 @@
 \page about_hypo_page About Hypotheses
 
 \b Hypotheses represent boundary conditions which will be taken into
 \page about_hypo_page About Hypotheses
 
 \b Hypotheses represent boundary conditions which will be taken into

-account at calculations of meshes or sub-meshes basing on geometrical
-objects. These hypotheses allow you to manage the level of detail of
+account at calculations of meshes or sub-meshes. 
+These hypotheses allow you to manage the level of detail of

 the resulting meshes or sub-meshes: when applying different hypotheses
 with different parameters you can preset the quantity or size of
 elements which will compose your mesh. So, it will be possible to
 the resulting meshes or sub-meshes: when applying different hypotheses
 with different parameters you can preset the quantity or size of
 elements which will compose your mesh. So, it will be possible to


@@ -15,12 +15,14 @@ In \b MESH there are the following Basic Hypotheses:
 <li>\subpage a1d_meshing_hypo_page "1D Hypotheses" (for meshing of 
 <b>edges</b>):</li>
 <ul>
 <li>\subpage a1d_meshing_hypo_page "1D Hypotheses" (for meshing of 
 <b>edges</b>):</li>
 <ul>

-<li>\ref arithmetic_1d_anchor "Arithmetic 1D"</li>
+<li>\ref number_of_segments_anchor "Number of segments"</li>

 <li>\ref average_length_anchor "Local Length"</li>
 <li>\ref max_length_anchor "Max Size"</li>
 <li>\ref average_length_anchor "Local Length"</li>
 <li>\ref max_length_anchor "Max Size"</li>

-<li>\ref deflection_1d_anchor "Deflection 1D"</li>
-<li>\ref number_of_segments_anchor "Number of segments"</li>
+<li>\ref adaptive_1d_anchor "Adaptive"</li>
+<li>\ref arithmetic_1d_anchor "Arithmetic 1D"</li>
+<li>\ref geometric_1d_anchor "Geometric 1D"</li>

 <li>\ref start_and_end_length_anchor "Start and end length"</li>
 <li>\ref start_and_end_length_anchor "Start and end length"</li>

+<li>\ref deflection_1d_anchor "Deflection 1D"</li>

 <li>\ref automatic_length_anchor "Automatic Length"</li>
 </ul>
 <li>\subpage a2d_meshing_hypo_page "2D Hypotheses" (for meshing of <b>faces</b>):</li>
 <li>\ref automatic_length_anchor "Automatic Length"</li>
 </ul>
 <li>\subpage a2d_meshing_hypo_page "2D Hypotheses" (for meshing of <b>faces</b>):</li>


@@ -40,6 +42,7 @@ There also exist
 with other hypotheses:
 <ul>
 <li>\ref propagation_anchor "Propagation of 1D Hypothesis on opposite edges"</li>
 with other hypotheses:
 <ul>
 <li>\ref propagation_anchor "Propagation of 1D Hypothesis on opposite edges"</li>

+<li>\ref propagofdistribution_anchor "Propagation of Node Distribution on Opposite Edges"</li>

 <li>\ref viscous_layers_anchor "Viscous layers"</li>
 <li>\ref quadratic_mesh_anchor "Quadratic mesh"</li>
 <li>\ref non_conform_allowed_anchor "Non conform mesh allowed"</li>
 <li>\ref viscous_layers_anchor "Viscous layers"</li>
 <li>\ref quadratic_mesh_anchor "Quadratic mesh"</li>
 <li>\ref non_conform_allowed_anchor "Non conform mesh allowed"</li>