Removing last traces of mefisto

This commit is contained in:
Yoann Audouin 2022-04-06 15:03:17 +02:00
parent 8628ca77d6
commit 83a5e55ace
32 changed files with 122 additions and 122 deletions

View File

@ -97,18 +97,18 @@ class TestMesh(unittest.TestCase):
self.assertEqual(regular.GetName(), 'Regular_1D')
self.processGuiEvents()
# **** create mefisto 2d
print('...... Mefisto 2D')
mefisto = smesh.CreateHypothesis( 'MEFISTO_2D', lib )
listHyp = mefisto.GetCompatibleHypothesis()
self.assertEqual(mefisto.GetName(), 'MEFISTO_2D')
# **** create NETGEN 2d
print('...... NETGEN 2D')
netgen = smesh.CreateHypothesis( 'NETGEN_2D', lib )
listHyp = netgen.GetCompatibleHypothesis()
self.assertEqual(netgen.GetName(), 'NETGEN_2D')
self.processGuiEvents()
# ---- create mesh on box
print('... Create mesh on box')
mesh = smesh.CreateMesh(box)
self.assertEqual(mesh.AddHypothesis(box, regular)[0], SMESH.HYP_OK)
self.assertEqual(mesh.AddHypothesis(box, mefisto)[0], SMESH.HYP_OK)
self.assertEqual(mesh.AddHypothesis(box, netgen)[0], SMESH.HYP_OK)
self.assertEqual(mesh.AddHypothesis(box, nb_segments)[0], SMESH.HYP_OK)
self.assertEqual(mesh.AddHypothesis(box, max_area)[0], SMESH.HYP_OK)
self.processGuiEvents()

View File

@ -19,28 +19,28 @@ Mesh_1 = smesh.Mesh(Box_1)
# assign mesh algorithms and hypotheses
Regular_1D = Mesh_1.Segment()
Nb_Segments_1 = Regular_1D.NumberOfSegments(20)
MEFISTO_2D = Mesh_1.Triangle()
Max_Element_Area_1 = MEFISTO_2D.MaxElementArea(1200)
NETGEN_2D = Mesh_1.Triangle()
Max_Element_Area_1 = NETGEN_2D.MaxElementArea(1200)
Tetrahedron = Mesh_1.Tetrahedron()
Max_Element_Volume_1 = Tetrahedron.MaxElementVolume(40000)
# create sub-mesh and assign algorithms on Face_1
Regular_1D_1 = Mesh_1.Segment(geom=Face_1)
Nb_Segments_2 = Regular_1D_1.NumberOfSegments(4)
MEFISTO_2D_1 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_1)
SubMesh_1 = MEFISTO_2D_1.GetSubMesh()
NETGEN_2D_1 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_1)
SubMesh_1 = NETGEN_2D_1.GetSubMesh()
# create sub-mesh and assign algorithms on Face_2
Regular_1D_2 = Mesh_1.Segment(geom=Face_2)
Nb_Segments_3 = Regular_1D_2.NumberOfSegments(8)
MEFISTO_2D_2 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_2)
SubMesh_2 = MEFISTO_2D_2.GetSubMesh()
NETGEN_2D_2 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_2)
SubMesh_2 = NETGEN_2D_2.GetSubMesh()
# create sub-mesh and assign algorithms on Face_3
Regular_1D_3 = Mesh_1.Segment(geom=Face_3)
Nb_Segments_4 = Regular_1D_3.NumberOfSegments(12)
MEFISTO_2D_3 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_3)
SubMesh_3 = MEFISTO_2D_3.GetSubMesh()
NETGEN_2D_3 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_3)
SubMesh_3 = NETGEN_2D_3.GetSubMesh()
# check existing sub-mesh priority order
[ [ SubMesh_1, SubMesh_3, SubMesh_2 ] ] = Mesh_1.GetMeshOrder()

View File

@ -38,7 +38,7 @@ tetra = smesh.Mesh(box, "Box : tetrahedrical mesh")
# create a Regular 1D algorithm for edges
algo1D = tetra.Segment()
# create a Mefisto 2D algorithm for faces
# create a NETGEN 2D algorithm for faces
algo2D = tetra.Triangle()
# create a 3D algorithm for solids

View File

@ -28,7 +28,7 @@ geompy.addToStudyInFather( box, Face_1, 'Face_1' )
geompy.addToStudyInFather( box, Face_2, 'Face_2' )
# Make the source mesh triangulated by MEFISTO
# Make the source mesh triangulated by NETGEN
src_mesh = smesh.Mesh(Face_1, "Source mesh")
src_mesh.Segment().NumberOfSegments(15)
src_mesh.Triangle()

View File

@ -21,7 +21,7 @@ geompy.addToStudy( Sphere, "Sphere" )
Mesh = smesh.Mesh(Sphere)
Regular_1D = Mesh.Segment()
Nb_Segments = Regular_1D.NumberOfSegments(5)
MEFISTO_2D = Mesh.Triangle()
NETGEN_2D = Mesh.Triangle()
Tetrahedron = Mesh.Tetrahedron()
# compute mesh

View File

@ -42,7 +42,7 @@ geompy.addToStudy( Plane_2, "Plane_2" )
Mesh_1 = smesh.Mesh(Partition_1)
Regular_1D = Mesh_1.Segment()
Max_Size_1 = Regular_1D.MaxSize(34.641)
MEFISTO_2D = Mesh_1.Triangle()
NETGEN_2D = Mesh_1.Triangle()
Tetrahedronn = Mesh_1.Tetrahedron()
isDone = Mesh_1.Compute()

View File

@ -19,7 +19,7 @@ An algorithm represents either an implementation of a certain meshing technique
* For meshing of 2D entities (**faces**):
* **Triangle: Mefisto** meshing algorithm - splits faces into triangular elements.
* **Triangle: NETGEN_2D** meshing algorithm - splits faces into triangular elements.
* :ref:`Quadrangle: Mapping <quad_ijk_algo_page>` meshing algorithm - splits faces into quadrangular elements.
.. image:: ../images/image123.gif

View File

@ -229,24 +229,24 @@ Choose **Change sub-mesh priority** from the **Mesh** menu or a pop-up menu. The
There is an example of sub-mesh order modifications taking a Mesh created on a Box shape. The main Mesh object:
* *1D* **Wire discretisation** with **Number of Segments** = 20
* *2D* **Triangle: Mefisto** with Hypothesis **Max Element Area**
* *2D* **Triangle: NETGEN_2D** with Hypothesis **Max Element Area**
The first sub-mesh **Submesh_1** created on **Face_1** is:
* *1D* **Wire discretisation** with **Number of Segments** = 4
* *2D* **Triangle: Mefisto** with Hypothesis **MaxElementArea** = 1200
* *2D* **Triangle: NETGEN_2D** with Hypothesis **MaxElementArea** = 1200
The second sub-mesh **Submesh_2** created on **Face_2** is:
* *1D* **Wire discretisation** with **Number of Segments** = 8
* *2D* **Triangle: Mefisto** with Hypothesis **MaxElementArea** = 1200
* *2D* **Triangle: NETGEN_2D** with Hypothesis **MaxElementArea** = 1200
And the last sub-mesh **Submesh_3** created on **Face_3** is:
* *1D* **Wire discretisation** with **Number of Segments** = 12
* *2D* **Triangle: Mefisto** with Hypothesis **MaxElementArea** = 1200
* *2D* **Triangle: NETGEN_2D** with Hypothesis **MaxElementArea** = 1200
The sub-meshes become concurrent if they share sub-shapes that can be meshed with different algorithms (or different hypotheses). In the example, we have three sub-meshes with concurrent algorithms, because they have different hypotheses.

View File

@ -102,8 +102,8 @@ Defining hypotheses
.. autosummary::
StdMeshersBuilder_Triangle_MEFISTO.MaxElementArea
StdMeshersBuilder_Triangle_MEFISTO.LengthFromEdges
StdMeshersBuilder_Triangle_NETGEN_2D.MaxElementArea
StdMeshersBuilder_Triangle_NETGEN_2D.LengthFromEdges
StdMeshersBuilder_Quadrangle.QuadrangleParameters
StdMeshersBuilder_Quadrangle.QuadranglePreference
StdMeshersBuilder_Quadrangle.TrianglePreference

View File

@ -48,7 +48,7 @@ User Guide.
NETGEN_2D_1 = Mesh_1.Triangle(algo=smeshBuilder.NETGEN_2D,geom=Face_1)
StdMeshers algorithms concerned are *REGULAR, PYTHON, COMPOSITE, MEFISTO, Hexa, QUADRANGLE, RADIAL_QUAD*.
StdMeshers algorithms concerned are *REGULAR, PYTHON, COMPOSITE, Hexa, QUADRANGLE, RADIAL_QUAD*.
SMESH Plugins provide such algorithms as: *NETGEN, NETGEN_FULL, FULL_NETGEN, NETGEN_1D2D3D, NETGEN_1D2D, NETGEN_2D, NETGEN_3D*.

View File

@ -43,7 +43,7 @@ A usual workflow to generate a mesh on geometry is following:
.. code-block:: python
regular1D = mesh.Segment()
mefisto = mesh.Triangle( smeshBuilder.MEFISTO )
netgen = mesh.Triangle( smeshBuilder.NETGEN_2D )
# use other triangle algorithm on a face -- a sub-mesh appears in the mesh
netgen = mesh.Triangle( smeshBuilder.NETGEN_1D2D, face )
@ -51,7 +51,7 @@ A usual workflow to generate a mesh on geometry is following:
.. code-block:: python
segLen10 = regular1D.LocalLength( 10. )
maxArea = mefisto.LocalLength( 100. )
maxArea = netgen.LocalLength( 100. )
netgen.SetMaxSize( 20. )
netgen.SetFineness( smeshBuilder.VeryCoarse )

View File

@ -19,7 +19,7 @@ and hypotheses.
* :ref:`Fixed Points 1D <tui_fixed_points>` hypothesis
* Triangle: Mefisto 2D algorithm
* Triangle: netgen 2D algorithm
* :ref:`tui_max_element_area` hypothesis
* :ref:`tui_length_from_edges` hypothesis

View File

@ -134,7 +134,7 @@ msgstr ""
msgid ""
"**Viscous Layers** and **Viscous Layers 2D** additional hypotheses can be"
" used by several 3D algorithms, for example Hexahedron(i,j,k), or 2D "
"algorithms, for example Triangle (MEFISTO), correspondingly. These "
"algorithms, for example Triangle (NETGEN_2D), correspondingly. These "
"hypotheses allow creation of layers of highly stretched elements, prisms "
"in 3D and quadrilaterals in 2D, near mesh boundary, which is beneficial "
"for high quality viscous computations."

View File

@ -71,7 +71,7 @@ msgstr ""
# 96ff3177522e4abbac57c5166724c7db
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/basic_meshing_algos.rst:22
msgid ""
"**Triangle: Mefisto** meshing algorithm - splits faces into triangular "
"**Triangle: NETGEN_2D** meshing algorithm - splits faces into triangular "
"elements."
msgstr ""

View File

@ -559,7 +559,7 @@ msgstr ""
# 223a2036b61245b9a74d39e766c41171
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/constructing_meshes.rst:242
msgid "*2D* **Triangle: Mefisto** with Hypothesis **Max Element Area**"
msgid "*2D* **Triangle: NETGEN_2D** with Hypothesis **Max Element Area**"
msgstr ""
# af68c57a6c6541e4a5ee565e61ce82a8
@ -578,7 +578,7 @@ msgstr ""
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/constructing_meshes.rst:248
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/constructing_meshes.rst:253
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/constructing_meshes.rst:259
msgid "*2D* **Triangle: Mefisto** with Hypothesis **MaxElementArea** =1200"
msgid "*2D* **Triangle: NETGEN_2D** with Hypothesis **MaxElementArea** =1200"
msgstr ""
# dae60f1eb8924fd19c98131c2b68967a

View File

@ -126,7 +126,7 @@ msgstr ""
# 5d5613278457472fbf4dd155ba325791
#: StdMeshersBuilder.MEFISTO:1
msgid ""
"*Algorithm type* -- Triangle MEFISTO 2D algorithm, see "
"*Algorithm type* -- Triangle NETGEN_2D algorithm, see "
":class:`~StdMeshersBuilder.StdMeshersBuilder_Triangle_MEFISTO`"
msgstr ""

View File

@ -109,7 +109,7 @@ msgstr ""
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/smesh_migration.rst:55
msgid ""
"StdMeshers algorithms concerned are **REGULAR, PYTHON, COMPOSITE, "
"MEFISTO, Hexa, QUADRANGLE, RADIAL_QUAD**."
"Hexa, QUADRANGLE, RADIAL_QUAD**."
msgstr ""
# ca97ecd8ffc74d798b1c512b44fb6b95

View File

@ -71,7 +71,7 @@ msgstr ""
# 65a07e23b54b4b28a44b18cee2f6eb18
#: ../../../../../../../SRC/SMESH_SRC/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst:21
msgid "Triangle: Mefisto 2D algorithm"
msgid "Triangle: NETGEN 2D algorithm"
msgstr ""
# 88b6fff7e253450eb7ea36fb2fe5445d

View File

@ -37,7 +37,7 @@ SET(SMESH_RESOURCES_FILES
mesh_add.png
mesh_add_sub.png
mesh_algo_hexa.png
mesh_algo_mefisto.png
mesh_algo_tri.png
mesh_algo_quad.png
mesh_algo_regular.png
mesh_algo_tetra.png
@ -187,7 +187,7 @@ SET(SMESH_RESOURCES_FILES
mesh_tree_algo_0D.png
mesh_tree_algo_existing_2D.png
mesh_tree_algo_hexa.png
mesh_tree_algo_mefisto.png
mesh_tree_algo_tri.png
mesh_tree_algo_polygon.png
mesh_tree_algo_prism.png
mesh_tree_algo_projection_2d.png

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 450 B

View File

@ -413,7 +413,7 @@
</message>
<message>
<source>ICON_PATTERN_2d</source>
<translation>mesh_algo_mefisto.png</translation>
<translation>mesh_algo_tri.png</translation>
</message>
<message>
<source>ICON_PATTERN_3d</source>

View File

@ -90,7 +90,7 @@ maxElementArea = 200
algoMef = mesh.Triangle()
listHyp = algoMef.GetCompatibleHypothesis()
print(algoMef.GetName())
algoMef.SetName("Triangle (Mefisto)")
algoMef.SetName("Triangle (netgen)")
hypArea200 = algoMef.MaxElementArea(maxElementArea)
print(hypArea200.GetName())

View File

@ -70,7 +70,7 @@ smesh.SetName(hypNbSeg1, "NumberOfSegments_" + str(numberOfSegments1))
maxElementArea = 30
algoMef = mesh1.Triangle()
algoMef.SetName("MEFISTO_2D")
algoMef.SetName("NETGEN_2D")
hypArea = algoMef.MaxElementArea(maxElementArea)
smesh.SetName(hypArea, "MaxElementArea_" + str(maxElementArea))

View File

@ -149,8 +149,8 @@ print("-------------------------- MaxElementArea")
maxElementArea = 0.1
mefisto2D = mesh.Triangle()
hypArea = mefisto2D.MaxElementArea(maxElementArea)
netgen2D = mesh.Triangle()
hypArea = netgen2D.MaxElementArea(maxElementArea)
print(hypArea.GetName())
print(hypArea.GetId())
print(hypArea.GetMaxElementArea())

View File

@ -103,8 +103,8 @@ print("-------------------------- MaxElementArea")
maxElementArea = 500
mefisto2D = mesh.Triangle()
hypArea = mefisto2D.MaxElementArea(maxElementArea)
netgen2D = mesh.Triangle()
hypArea = netgen2D.MaxElementArea(maxElementArea)
print(hypArea.GetName())
print(hypArea.GetId())
print(hypArea.GetMaxElementArea())

View File

@ -113,8 +113,8 @@ print("-------------------------- MaxElementArea")
maxElementArea = 500
mefisto2D = mesh.Triangle()
hypArea = mefisto2D.MaxElementArea(maxElementArea)
netgen2D = mesh.Triangle()
hypArea = netgen2D.MaxElementArea(maxElementArea)
print(hypArea.GetName())
print(hypArea.GetId())
print(hypArea.GetMaxElementArea())

View File

@ -72,8 +72,8 @@ print("-------------------------- MaxElementArea")
maxElementArea = 500
mefisto2D = mesh.Triangle()
hypArea = mefisto2D.MaxElementArea(maxElementArea)
netgen2D = mesh.Triangle()
hypArea = netgen2D.MaxElementArea(maxElementArea)
print(hypArea.GetName())
print(hypArea.GetId())
print(hypArea.GetMaxElementArea())

View File

@ -75,9 +75,9 @@ smesh.SetName(hypNbSeg, "NumberOfSegments_" + str(numberOfSegments))
## maxElementArea = 80
## mefisto2D = mesh.Triangle()
## mefisto2D.SetName("MEFISTO_2D")
## hypArea = mefisto2D.MaxElementArea(maxElementArea)
## netgen2D = mesh.Triangle()
## netgen2D.SetName("NETGEN_2D")
## hypArea = netgen2D.MaxElementArea(maxElementArea)
## print hypArea.GetName()
## print hypArea.GetId()
## print hypArea.GetMaxElementArea()
@ -85,9 +85,9 @@ smesh.SetName(hypNbSeg, "NumberOfSegments_" + str(numberOfSegments))
print("-------------------------- LengthFromEdges")
mefisto2D = mesh.Triangle()
mefisto2D.SetName("MEFISTO_2D")
hypLengthFromEdges = mefisto2D.LengthFromEdges()
netgen2D = mesh.Triangle()
netgen2D.SetName("NETGEN_2D")
hypLengthFromEdges = netgen2D.LengthFromEdges()
print(hypLengthFromEdges.GetName())
print(hypLengthFromEdges.GetId())
smesh.SetName(hypLengthFromEdges, "LengthFromEdges")

View File

@ -85,8 +85,8 @@ smesh.SetName(hypLength, "LocalLength_" + str(lengthOfSegments))
print("-------------------------- LengthFromEdges")
mefisto2D = mesh.Triangle()
hypLengthFromEdge = mefisto2D.LengthFromEdges()
netgen2D = mesh.Triangle()
hypLengthFromEdge = netgen2D.LengthFromEdges()
print(hypLengthFromEdge.GetName())
print(hypLengthFromEdge.GetId())
smesh.SetName(hypLengthFromEdge,"LengthFromEdge")

View File

@ -124,8 +124,8 @@
<translation>mesh_tree_algo_hexa.png</translation>
</message>
<message>
<source>ICON_SMESH_TREE_ALGO_MEFISTO_2D</source>
<translation>mesh_tree_algo_mefisto.png</translation>
<source>ICON_SMESH_TREE_ALGO_TRI_2D</source>
<translation>mesh_tree_algo_tri.png</translation>
</message>
<message>
<source>ICON_SMESH_TREE_ALGO_PolygonPerFace_2D</source>
@ -289,7 +289,7 @@
</message>
<message>
<source>ICON_SMESH_TREE_HYPO_TrianglePreference</source>
<translation>mesh_tree_algo_mefisto.png</translation>
<translation>mesh_tree_algo_tri.png</translation>
</message>
<message>
<source>ICON_SMESH_TREE_HYPO_QuadraticMesh</source>