From: vsr Date: Fri, 19 Nov 2010 07:46:36 +0000 (+0000) Subject: 0020946: EDF 1466 SMESH: Add a new control criteria: Max element length X-Git-Tag: tag_Before_ViscLayers_PrototypeVersion~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5a2320fab7cadcc358fc188004f208055703c53d;p=modules%2Fsmesh.git 0020946: EDF 1466 SMESH: Add a new control criteria: Max element length Rename "Max Element LEngth 2D/3D" control to "Element Diameter 2D/3D" --- diff --git a/doc/salome/gui/SMESH/images/max_element_length_2d.png b/doc/salome/gui/SMESH/images/max_element_length_2d.png index d19c80e7f..012d552f5 100755 Binary files a/doc/salome/gui/SMESH/images/max_element_length_2d.png and b/doc/salome/gui/SMESH/images/max_element_length_2d.png differ diff --git a/doc/salome/gui/SMESH/images/max_element_length_3d.png b/doc/salome/gui/SMESH/images/max_element_length_3d.png index 356e5e25d..fdf1b7688 100755 Binary files a/doc/salome/gui/SMESH/images/max_element_length_3d.png and b/doc/salome/gui/SMESH/images/max_element_length_3d.png differ diff --git a/doc/salome/gui/SMESH/input/max_element_length_2d.doc b/doc/salome/gui/SMESH/input/max_element_length_2d.doc index 0c062f872..933ac55ee 100644 --- a/doc/salome/gui/SMESH/input/max_element_length_2d.doc +++ b/doc/salome/gui/SMESH/input/max_element_length_2d.doc @@ -1,20 +1,20 @@ /*! -\page max_element_length_2d_page Max Element Length 2D +\page max_element_length_2d_page Element Diameter 2D \n This quality control criterion consists of calculation of length of the edges and diagonals combining the meshing elements (triangles and quadrangles) of your mesh. -To apply the Max Element Length 2D quality criterion to your mesh: +To apply the Element Diameter 2D quality criterion to your mesh:
  1. Display your mesh in the viewer.
    2. -
  2. Choose Controls > Face Controls > Max Element Length 2D or click -"Max Element Length 2D" button in the toolbar. +
  3. Choose Controls > Face Controls > Element Diameter 2D or click +"Element Diameter 2D" button in the toolbar. \image html image42.png -
    "Max Element Length 2D" button
    +
    "Element Diameter 2D" button
    Your mesh will be displayed in the viewer with its elements colored according to the applied mesh quality control criterion: @@ -24,6 +24,6 @@ applied mesh quality control criterion:

See Also a sample TUI Script of a -\ref tui_max_element_length_2d "Max Element Length 2D quality control" operation. +\ref tui_max_element_length_2d "Element Diameter 2D quality control" operation. */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/max_element_length_3d.doc b/doc/salome/gui/SMESH/input/max_element_length_3d.doc index 287c3f24c..9326ad837 100644 --- a/doc/salome/gui/SMESH/input/max_element_length_3d.doc +++ b/doc/salome/gui/SMESH/input/max_element_length_3d.doc @@ -1,21 +1,21 @@ /*! -\page max_element_length_3d_page Max Element Length 3D +\page max_element_length_3d_page Element Diameter 3D \n This quality control criterion consists of calculation of length of the edges and diagonals combining the 3D meshing elements (tetrahedrons, pyramids, pentahendrons, hexahedrons and polyhedrons) of your mesh. -To apply the Max Element Length 3D quality criterion to your mesh: +To apply the Element Diameter 3D quality criterion to your mesh:
  1. Display your mesh in the viewer.
    2. -
  2. Choose Controls > Volume Controls > Max Element Length 3D or click -"Max Element Length 3D" button in the toolbar. +
  3. Choose Controls > Volume Controls > Element Diameter 3D or click +"Element Diameter 3D" button in the toolbar. \image html image43.png -
    "Max Element Length 3D" button
    +
    "Element Diameter 3D" button
    Your mesh will be displayed in the viewer with its elements colored according to the applied mesh quality control criterion: @@ -25,6 +25,6 @@ applied mesh quality control criterion:

See Also a sample TUI Script of a -\ref tui_max_element_length_3d "Max Element Length 3D quality control" operation. +\ref tui_max_element_length_3d "Element Diameter 3D quality control" operation. */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.doc b/doc/salome/gui/SMESH/input/selection_filter_library.doc index 00af8c7eb..1f612994f 100644 --- a/doc/salome/gui/SMESH/input/selection_filter_library.doc +++ b/doc/salome/gui/SMESH/input/selection_filter_library.doc @@ -163,10 +163,10 @@ normal to the neighboring face and the normal to the selected face is less then angular tolerance (defined in degrees). Selection continues among all neighbor faces of already selected ones.
  • -Max Element Length 2D selects triangles and quadrangles combining of the edges and +Element Diameter 2D selects triangles and quadrangles combining of the edges and diagonals with a value of length, which is more, less or equal (within a given Tolerance) to the predefined Threshold Value. See also a -\ref max_element_length_2d_page "Max Element Length 2D quality control". +\ref max_element_length_2d_page "Element Diameter 2D quality control".
    • @@ -180,10 +180,10 @@ Additional criteria to select mesh Volumes are the following: \ref volume_page "Volume quality control"), which is more, less or equal (within a given Tolerance) to the predefined Threshold Value.
  • -Max Element Length 3D selects 3D mesh elements combining of the edges and +Element Diameter 3D selects 3D mesh elements combining of the edges and diagonals with a value of length, which is more, less or equal (within a given Tolerance) to the predefined Threshold Value. See also a -\ref max_element_length_3d_page "Max Element Length 3D quality control". +\ref max_element_length_3d_page "Element Diameter 3D quality control".
  • Bad oriented volume selects mesh volumes, which are incorrectly oriented from the point of view of MED convention. diff --git a/doc/salome/gui/SMESH/input/tui_filters.doc b/doc/salome/gui/SMESH/input/tui_filters.doc index a73615808..6677b2ab5 100755 --- a/doc/salome/gui/SMESH/input/tui_filters.doc +++ b/doc/salome/gui/SMESH/input/tui_filters.doc @@ -337,7 +337,7 @@ print "Number of faces with maximum edge length > 14:", len(ids) \sa \ref tui_length_2d -\section filter_max_element_length_2d Max Element Length 2D +\section filter_max_element_length_2d Element Diameter 2D Filter 2D mesh elements (faces) corresponding to the maximum length value of its edges and diagonals: @@ -356,7 +356,7 @@ print "Number of faces with maximum element length > 10:", len(ids) \sa \ref tui_max_element_length_2d -\section filter_max_element_length_3d Max Element Length 3D +\section filter_max_element_length_3d Element Diameter 3D Filter 3D mesh elements (volumes) corresponding to the maximum length value of its edges and diagonals: diff --git a/doc/salome/gui/SMESH/input/tui_quality_controls.doc b/doc/salome/gui/SMESH/input/tui_quality_controls.doc index acbf89198..fc496dcde 100644 --- a/doc/salome/gui/SMESH/input/tui_quality_controls.doc +++ b/doc/salome/gui/SMESH/input/tui_quality_controls.doc @@ -603,7 +603,7 @@ aGroup.Add(anIds) salome.sg.updateObjBrowser(1) \endcode -\section tui_max_element_length_2d Max Element Length 2D +\section tui_max_element_length_2d Element Diameter 2D \code import SMESH_mechanic @@ -612,7 +612,7 @@ smesh = SMESH_mechanic.smesh mesh = SMESH_mechanic.mesh salome = SMESH_mechanic.salome -# Criterion : MAX ELEMENT LENGTH 2D > 10 +# Criterion : ELEMENT DIAMETER 2D > 10 mel_2d_margin = 10 aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_MoreThan, mel_2d_margin) @@ -620,7 +620,7 @@ aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_More anIds = mesh.GetIdsFromFilter(aFilter) # print the result -print "Criterion: Max Element Length 2D Ratio > ", mel_2d_margin, " Nb = ", len(anIds) +print "Criterion: Element Diameter 2D Ratio > ", mel_2d_margin, " Nb = ", len(anIds) j = 1 for i in range(len(anIds)): if j > 20: j = 1; print "" @@ -630,7 +630,7 @@ for i in range(len(anIds)): print "" # create a group -aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Max Element Length 2D > " + `mel_2d_margin`) +aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Element Diameter 2D > " + `mel_2d_margin`) aGroup.Add(anIds) salome.sg.updateObjBrowser(1) @@ -705,7 +705,7 @@ aGroup.Add(anIds) salome.sg.updateObjBrowser(1) \endcode -\section tui_max_element_length_3d Max Element Length 3D +\section tui_max_element_length_3d Element Diameter 3D \code import SMESH_mechanic_tetra @@ -714,7 +714,7 @@ smesh = SMESH_mechanic_tetra.smesh mesh = SMESH_mechanic_tetra.mesh salome = SMESH_mechanic_tetra.salome -# Criterion : MAX ELEMENT LENGTH 3D > 10 +# Criterion : ELEMENT DIAMETER 3D > 10 mel_3d_margin = 10 aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength3D, smesh.FT_MoreThan, mel_3d_margin) @@ -722,7 +722,7 @@ aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength3D, smesh.FT_More anIds = mesh.GetIdsFromFilter(aFilter) # print the result -print "Criterion: Max Element Length 3D Ratio > ", mel_3d_margin, " Nb = ", len(anIds) +print "Criterion: Element Diameter 3D Ratio > ", mel_3d_margin, " Nb = ", len(anIds) j = 1 for i in range(len(anIds)): if j > 20: j = 1; print "" @@ -732,7 +732,7 @@ for i in range(len(anIds)): print "" # create a group -aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Max Element Length 3D > " + `mel_3d_margin`) +aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Element Diameter 3D > " + `mel_3d_margin`) aGroup.Add(anIds) salome.sg.updateObjBrowser(1) diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 8ea5465e1..d907649f3 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -145,11 +145,11 @@ MAX_ELEMENT_LENGTH_2D - Max Element Length 2D + Element Diameter 2D MAX_ELEMENT_LENGTH_3D - Max Element Length 3D + Element Diameter 3D MEN_ADD @@ -449,11 +449,11 @@ MEN_MAX_ELEMENT_LENGTH_2D - Max Element Length 2D + Element Diameter 2D MEN_MAX_ELEMENT_LENGTH_3D - Max Element Length 3D + Element Diameter 3D MEN_MED @@ -2480,11 +2480,11 @@ Please check preferences of Mesh module. STB_MAX_ELEMENT_LENGTH_2D - Max Element Length 2D + Element Diameter 2D STB_MAX_ELEMENT_LENGTH_3D - Max Element Length 3D + Element Diameter 3D STB_MED @@ -3016,11 +3016,11 @@ Please check preferences of Mesh module. TOP_MAX_ELEMENT_LENGTH_2D - Max Element Length 2D + Element Diameter 2D TOP_MAX_ELEMENT_LENGTH_3D - Max Element Length 3D + Element Diameter 3D TOP_MED @@ -4419,11 +4419,11 @@ Please enter correct value and try again MAX_ELEMENT_LENGTH_2D - Max Element Length 2D + Element Diameter 2D MAX_ELEMENT_LENGTH_3D - Max Element Length 3D + Element Diameter 3D MINIMUM_ANGLE diff --git a/src/SMESH_SWIG/SMESH_controls.py b/src/SMESH_SWIG/SMESH_controls.py index 8cde5ac61..a322e42c5 100644 --- a/src/SMESH_SWIG/SMESH_controls.py +++ b/src/SMESH_SWIG/SMESH_controls.py @@ -128,14 +128,14 @@ print "Criterion: Borders at multi-connections = 2 Nb = ", len( anIds ) #print anIds[ i ] -# Criterion : Max Element Length 2D > 10 +# Criterion : Element Diameter 2D > 10 # create group -aGroup = mesh.MakeGroup("Max Element Length 2D > 10", smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_MoreThan, 10 ) +aGroup = mesh.MakeGroup("Element Diameter 2D > 10", smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_MoreThan, 10 ) # print result anIds = aGroup.GetIDs() -print "Criterion: Max Element Length 2D > 10 Nb = ", len( anIds ) +print "Criterion: Element Diameter 2D > 10 Nb = ", len( anIds ) #for i in range( len( anIds ) ): #print anIds[ i ]