Merge remote-tracking branch 'origin/master' into V9_dev

[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 5690ff36c3c88a5473aff669c4d9941a9294b9e5..f40555940cd608a8df01d2968856877fd8c8fc66 100644 (file)
--- a/doc/salome/gui/SMESH/input/about_hypo.doc
+++ b/doc/salome/gui/SMESH/input/about_hypo.doc
@@ -2,27 +2,44 @@
 
 \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
-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
+\b Hypotheses represent boundary conditions which will be taken into
+account by meshing algorithms.
+The hypotheses allow you to manage the level of detail of
+the resulting mesh: 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
 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.

 
 

-In \b MESH there are the following Basic Hypotheses (to introduce
-them, you operate numerical values):
+The choice of a hypothesis depends on the selected algorithm.
+
+Hypotheses are created during creation and edition of 
+\ref constructing_meshes_page "meshes" and
+\ref constructing_submeshes_page "sub-meshes". 
+Once created a hypotheses can be reused during creation and edition of
+other meshes and sub-meshes. All created hypotheses and algorithms are
+present in the Object Browser in \a Hypotheses and \a Algorithms
+folders correspondingly. It is possible to open a dialog to modify the
+parameters of a hypothesis from its context menu. This menu also
+provides \b Unassign command that will unassign the hypothesis from
+all meshes and sub-meshes using it. Modification of any parameter of a
+hypothesis and its unassignment leads to automatic removal of elements
+generated using it.
+
+In \b MESH there are the following Basic Hypotheses:

 <ul>
 <li>\subpage a1d_meshing_hypo_page "1D Hypotheses" (for meshing of 
 <b>edges</b>):</li>
 <ul>
 <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 Progression"</li>
+<li>\ref geometric_1d_anchor "Geometric Progression"</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"</li>

 <li>\ref automatic_length_anchor "Automatic Length"</li>
 <li>\ref automatic_length_anchor "Automatic Length"</li>

+<li>\ref fixed_points_1d_anchor "Fixed points"</li>

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


@@ -36,22 +53,14 @@ them, you operate numerical values):
 </ul>
 </ul>
 
 </ul>
 </ul>
 

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

 <ul>
 <li>\ref propagation_anchor "Propagation of 1D Hypothesis on opposite edges"</li>
 <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 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>
 
 <li>\ref quadrangle_preference_anchor "Quadrangle preference"</li>
 </ul>
 

-The choice of a hypothesis depends on:
-<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>
-
- 

 */
 */