Merge from V6_main 01/04/2013

[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 40b8ff590b95b8ccfe3bf084f9238154c1659802..4453a7b8dcf8b29c5c054280ce75b9415606d340 100644 (file)
--- a/doc/salome/gui/SMESH/input/about_hypo.doc
+++ b/doc/salome/gui/SMESH/input/about_hypo.doc
@@ -2,45 +2,49 @@
 
 \page about_hypo_page About Hypotheses
 
 
 \page about_hypo_page About Hypotheses
 

-\n \b Hypotheses represent boundary conditions which will be taken into
-account at calculations of meshes or submeshes basing on geometrical
+\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
 the resulting meshes or submeshes: when applying different hypotheses
 with different parameters you can preset the quantity of meshing
 elements which will compose your mesh. So, it will be possible to
 objects. These hypotheses allow you to manage the level of detail of
 the resulting meshes or submeshes: when applying different hypotheses
 with different parameters you can preset the quantity of meshing
 elements which will compose your mesh. So, it will be possible to

-generate a rough or a more refined mesh or submesh.
+generate a coarse or a more refined mesh or sub-mesh.

 
 In \b MESH there are the following Basic Hypotheses (to introduce
 them, you operate numerical values):
 <ul>
 
 In \b MESH there are the following Basic Hypotheses (to introduce
 them, you operate numerical values):
 <ul>

-<li>\ref a1d_meshing_hypo_page "1D Hypotheses" (for meshing of 
+<li>\subpage a1d_meshing_hypo_page "1D Hypotheses" (for meshing of 

 <b>edges</b>):</li>
 <ul>
 <li>\ref arithmetic_1d_anchor "Arithmetic 1D"</li>
 <b>edges</b>):</li>
 <ul>
 <li>\ref arithmetic_1d_anchor "Arithmetic 1D"</li>

-<li>\ref average_length_anchor "Average Length"</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 start_and_end_length_anchor "Start and end length"</li>
 <li>\ref automatic_length_anchor "Automatic Length"</li>
 </ul>
 <li>\ref deflection_1d_anchor "Deflection 1D"</li>
 <li>\ref number_of_segments_anchor "Number of segments"</li>
 <li>\ref start_and_end_length_anchor "Start and end length"</li>
 <li>\ref automatic_length_anchor "Automatic Length"</li>
 </ul>

-<li>\ref a2d_meshing_hypo_page "2D Hypotheses" (for meshing of <b>faces</b>):</li>
+<li>\subpage a2d_meshing_hypo_page "2D Hypotheses" (for meshing of <b>faces</b>):</li>

 <ul>
 <li>\ref max_element_area_anchor "Max Element Area"</li>
 <li>\ref length_from_edges_anchor "Length from Edges"</li>
 <ul>
 <li>\ref max_element_area_anchor "Max Element Area"</li>
 <li>\ref length_from_edges_anchor "Length from Edges"</li>

-<li>\ref quadrangle_preference_anchor "Quadrangle Preference"</li>
+<li>\ref hypo_quad_params_anchor "Quadrangle Parameters"</li>

 </ul>
 <li>3D Hypothesis (for meshing of <b>volumes</b>):</li>
 <ul>
 </ul>
 <li>3D Hypothesis (for meshing of <b>volumes</b>):</li>
 <ul>

-<li>\ref max_element_volume_hypo_page "Max Element Volume"</li>
+<li>\subpage max_element_volume_hypo_page "Max Element Volume"</li>

 </ul>
 </ul>
 
 </ul>
 </ul>
 

-There also exist some 
-\ref additional_hypo_page "Additional Hypotheses":
+There also exist  
+\subpage additional_hypo_page "Additional Hypotheses" used together
+with other hypotheses:

 <ul>
 <ul>

-<li>Propagation of 1D Hypothesis on opposite edges</li>
-<li>Non conform mesh allowed</li>
-<li>Quadratic mesh</li>
+<li>\ref propagation_anchor "Propagation of 1D Hypothesis 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 quadrangle_preference_anchor "Quadrangle preference"</li>

 </ul>
 
 The choice of a hypothesis depends on:
 </ul>
 
 The choice of a hypothesis depends on:


@@ -48,5 +52,6 @@ The choice of a hypothesis depends on:
 <li>the geometrical object (shape) which will be meshed</li>
 <li>the algorithm, which will be selected for meshing of this geometrical object (shape)</li>
 </ul>
 <li>the geometrical object (shape) which will be meshed</li>
 <li>the algorithm, which will be selected for meshing of this geometrical object (shape)</li>
 </ul>

+

  
  

-*/
\ No newline at end of file
+*/