From: eap Date: Thu, 11 Sep 2014 15:05:58 +0000 (+0400) Subject: COTECH: Update names of DISTENE products X-Git-Tag: V7_5_0a1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=918eb82c152b6b09bf6f7045e8f8a0047e2f3a44;p=plugins%2Fghs3dplugin.git COTECH: Update names of DISTENE products Almost full replacement of old names --- diff --git a/doc/salome/examples/ghs3d_enfmesh.py b/doc/salome/examples/ghs3d_enfmesh.py index 4099a5f..773e52a 100644 --- a/doc/salome/examples/ghs3d_enfmesh.py +++ b/doc/salome/examples/ghs3d_enfmesh.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# It is possible to constrain GHS3D with another mesh or group. +# It is possible to constrain MG-Tetra with another mesh or group. # The constraint can refer to the nodes, edges or faces. # This feature is available only on 2D meshes without geometry. # The constraining elements are called enforced elements for the mesh. @@ -52,31 +52,31 @@ geompy.addToStudy( p2, "p2" ) geompy.addToStudy( c, "c" ) # Create the 2D algorithm and hypothesis -BLSURF = smesh.CreateHypothesis('BLSURF', 'BLSURFEngine') +MG_CADSurf = smesh.CreateHypothesis('MG-CADSurf', 'BLSURFEngine') # For the box -BLSURF_Parameters = smesh.CreateHypothesis('BLSURF_Parameters', 'BLSURFEngine') -BLSURF_Parameters.SetPhysicalMesh( 1 ) -BLSURF_Parameters.SetPhySize( 200 ) +MG_CADSurf_Parameters = smesh.CreateHypothesis('MG-CADSurf Parameters', 'BLSURFEngine') +MG_CADSurf_Parameters.SetPhysicalMesh( 1 ) +MG_CADSurf_Parameters.SetPhySize( 200 ) # For the cylinder -BLSURF_Parameters2 = smesh.CreateHypothesis('BLSURF_Parameters', 'BLSURFEngine') -BLSURF_Parameters2.SetGeometricMesh( 1 ) +MG_CADSurf_Parameters2 = smesh.CreateHypothesis('MG-CADSurf Parameters', 'BLSURFEngine') +MG_CADSurf_Parameters2.SetGeometricMesh( 1 ) # Create the 3D algorithm and hypothesis -GHS3D = smesh.CreateHypothesis('GHS3D_3D', 'GHS3DEngine') -GHS3D_Parameters_node = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -#GHS3D_Parameters_node.SetToMeshHoles( 1 ) -GHS3D_Parameters_edge = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -#GHS3D_Parameters_edge.SetToMeshHoles( 1 ) -GHS3D_Parameters_face = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -GHS3D_Parameters_face.SetToMeshHoles( 1 ) # to mesh inside the cylinder -GHS3D_Parameters_mesh = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -GHS3D_Parameters_mesh.SetToMeshHoles( 1 ) # to mesh inside the cylinder +MG_Tetra = smesh.CreateHypothesis('MG-Tetra', 'GHS3DEngine') +MG_Tetra_Parameters_node = smesh.CreateHypothesis('MG-Tetra Parameters', 'GHS3DEngine') +#MG_Tetra_Parameters_node.SetToMeshHoles( 1 ) +MG_Tetra_Parameters_edge = smesh.CreateHypothesis('MG-Tetra Parameters', 'GHS3DEngine') +#MG_Tetra_Parameters_edge.SetToMeshHoles( 1 ) +MG_Tetra_Parameters_face = smesh.CreateHypothesis('MG-Tetra Parameters', 'GHS3DEngine') +MG_Tetra_Parameters_face.SetToMeshHoles( 1 ) # to mesh inside the cylinder +MG_Tetra_Parameters_mesh = smesh.CreateHypothesis('MG-Tetra Parameters', 'GHS3DEngine') +MG_Tetra_Parameters_mesh.SetToMeshHoles( 1 ) # to mesh inside the cylinder # Create the mesh on the cylinder Mesh_cylindre = smesh.Mesh(cylindre) smesh.SetName(Mesh_cylindre,"Mesh_cylindre") -Mesh_cylindre.AddHypothesis( BLSURF ) -Mesh_cylindre.AddHypothesis( BLSURF_Parameters2 ) +Mesh_cylindre.AddHypothesis( MG_CADSurf ) +Mesh_cylindre.AddHypothesis( MG_CADSurf_Parameters2 ) # Create some groups face_cyl_faces = Mesh_cylindre.GroupOnGeom(face_cyl,'group_face_cyl', SMESH.FACE) face_cyl_edges = Mesh_cylindre.GroupOnGeom(face_cyl,'group_edge_cyl', SMESH.EDGE) @@ -84,10 +84,9 @@ face_cyl_nodes = Mesh_cylindre.GroupOnGeom(face_cyl,'group_node_cyl', SMESH.NODE Mesh_cylindre.Compute() # Create the mesh on the cylinder -Mesh_box_tri = smesh.Mesh(box) -smesh.SetName(Mesh_box_tri,"Mesh_box_tri") -Mesh_box_tri.AddHypothesis( BLSURF ) -Mesh_box_tri.AddHypothesis( BLSURF_Parameters ) +Mesh_box_tri = smesh.Mesh(box,"Mesh_box_tri") +Mesh_box_tri.AddHypothesis( MG_CADSurf ) +Mesh_box_tri.AddHypothesis( MG_CADSurf_Parameters ) Mesh_box_tri.Compute() # Create 4 copies of the 2D mesh to test the 3 types of contraints (NODE, EDGE, FACE) @@ -95,26 +94,26 @@ Mesh_box_tri.Compute() # Then the 3D algo and hypothesis are assigned to them. mesh_mesh = smesh.CopyMesh( Mesh_box_tri, 'Enforced by faces of mesh', 0, 0) -mesh_mesh.AddHypothesis( GHS3D ) -mesh_mesh.AddHypothesis( GHS3D_Parameters_mesh) +mesh_mesh.AddHypothesis( MG_Tetra ) +mesh_mesh.AddHypothesis( MG_Tetra_Parameters_mesh) mesh_node = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of nodes', 0, 0) -mesh_node.AddHypothesis( GHS3D ) -mesh_node.AddHypothesis( GHS3D_Parameters_node) +mesh_node.AddHypothesis( MG_Tetra ) +mesh_node.AddHypothesis( MG_Tetra_Parameters_node) mesh_edge = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of edges', 0, 0) -mesh_edge.AddHypothesis( GHS3D ) -mesh_edge.AddHypothesis( GHS3D_Parameters_edge) +mesh_edge.AddHypothesis( MG_Tetra ) +mesh_edge.AddHypothesis( MG_Tetra_Parameters_edge) mesh_face = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of faces', 0, 0) -mesh_face.AddHypothesis( GHS3D ) -mesh_face.AddHypothesis( GHS3D_Parameters_face) +mesh_face.AddHypothesis( MG_Tetra ) +mesh_face.AddHypothesis( MG_Tetra_Parameters_face) # Add the enforced elements -GHS3D_Parameters_mesh.SetEnforcedMeshWithGroup(Mesh_cylindre.GetMesh(),SMESH.FACE,"faces from cylinder") -GHS3D_Parameters_node.SetEnforcedMeshWithGroup(face_cyl_nodes,SMESH.NODE,"nodes from face_cyl_nodes") -GHS3D_Parameters_edge.SetEnforcedMeshWithGroup(face_cyl_edges,SMESH.EDGE,"edges from face_cyl_edges") -GHS3D_Parameters_face.SetEnforcedMeshWithGroup(face_cyl_faces,SMESH.FACE,"faces from face_cyl_faces") +MG_Tetra_Parameters_mesh.SetEnforcedMeshWithGroup(Mesh_cylindre.GetMesh(),SMESH.FACE,"faces from cylinder") +MG_Tetra_Parameters_node.SetEnforcedMeshWithGroup(face_cyl_nodes,SMESH.NODE,"nodes from face_cyl_nodes") +MG_Tetra_Parameters_edge.SetEnforcedMeshWithGroup(face_cyl_edges,SMESH.EDGE,"edges from face_cyl_edges") +MG_Tetra_Parameters_face.SetEnforcedMeshWithGroup(face_cyl_faces,SMESH.FACE,"faces from face_cyl_faces") #Compute the meshes mesh_node.Compute() diff --git a/doc/salome/examples/ghs3d_enfvert.py b/doc/salome/examples/ghs3d_enfvert.py index c9a2494..a9bccbb 100644 --- a/doc/salome/examples/ghs3d_enfvert.py +++ b/doc/salome/examples/ghs3d_enfvert.py @@ -31,11 +31,11 @@ import salome salome.salome_init() -import GEOM + from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) -import SMESH, SALOMEDS +import SMESH from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) @@ -43,44 +43,42 @@ smesh = smeshBuilder.New(salome.myStudy) box = geompy.MakeBoxDXDYDZ(200., 200., 200.) geompy.addToStudy(box, "box") # create a mesh on the box -ghs3dMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") -# create a BLSurf algorithm for faces -ghs3dMesh.Triangle(algo=smeshBuilder.BLSURF) +mgtetraMesh = smesh.Mesh(box,"box: MG-Tetra and MG-CADSurf mesh") +# create a MG-CADSurf algorithm for faces +mgtetraMesh.Triangle(algo=smeshBuilder.MG_CADSurf) # compute the mesh -ghs3dMesh.Compute() +mgtetraMesh.Compute() # Make a copy of the 2D mesh -ghs3dMesh_wo_geometry = smesh.CopyMesh( ghs3dMesh, 'Ghs3D wo geometry', 0, 0) +mgtetraMesh_wo_geometry = smesh.CopyMesh( mgtetraMesh, 'MG-Tetra w/o geometry', 0, 0) -# create a Ghs3D algorithm and hypothesis and assign them to the mesh -GHS3D = smesh.CreateHypothesis('GHS3D_3D', 'GHS3DEngine') -GHS3D_Parameters = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -ghs3dMesh.AddHypothesis( GHS3D ) -ghs3dMesh.AddHypothesis( GHS3D_Parameters ) +# create a MG_Tetra algorithm and hypothesis and assign them to the mesh +MG_Tetra = mgtetraMesh.Tetrahedron( smeshBuilder.MG_Tetra ) +MG_Tetra_Parameters = MG_Tetra.Parameters() # Create the enforced vertex -GHS3D_Parameters.SetEnforcedVertex( 50, 50, 100, 2) # no group +MG_Tetra_Parameters.SetEnforcedVertex( 50, 50, 100, 2) # no group # Compute the mesh -ghs3dMesh.Compute() +mgtetraMesh.Compute() # Ex2: Add one vertex enforced by a GEOM vertex at (50,50,100) # with physical size 5 and add it to a group called "My special nodes" -# Create another GHS3D hypothesis and assign it to the mesh without geometry -GHS3D_Parameters_wo_geometry = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -ghs3dMesh_wo_geometry.AddHypothesis( GHS3D ) -ghs3dMesh_wo_geometry.AddHypothesis( GHS3D_Parameters_wo_geometry ) +# Create another MG_Tetra hypothesis and assign it to the mesh without geometry +MG_Tetra_Parameters_wo_geometry = smesh.CreateHypothesis('MG-Tetra Parameters', 'GHS3DEngine') +mgtetraMesh_wo_geometry.AddHypothesis( MG_Tetra ) +mgtetraMesh_wo_geometry.AddHypothesis( MG_Tetra_Parameters_wo_geometry ) # Create the enforced vertex p1 = geompy.MakeVertex(150, 150, 100) geompy.addToStudy(p1, "p1") -GHS3D_Parameters_wo_geometry.SetEnforcedVertexGeomWithGroup( p1, 5 , "My special nodes") -#GHS3D_Parameters.SetEnforcedVertexGeom( p1, 5 ) # no group +MG_Tetra_Parameters_wo_geometry.SetEnforcedVertexGeomWithGroup( p1, 5 , "My special nodes") +#MG_Tetra_Parameters.SetEnforcedVertexGeom( p1, 5 ) # no group # compute the mesh -ghs3dMesh_wo_geometry.Compute() +mgtetraMesh_wo_geometry.Compute() # Erase all enforced vertices -GHS3D_Parameters.ClearEnforcedVertices() +MG_Tetra_Parameters.ClearEnforcedVertices() # End of script diff --git a/doc/salome/examples/ghs3ddemo.py b/doc/salome/examples/ghs3ddemo.py index 890324e..9d6ad5a 100644 --- a/doc/salome/examples/ghs3ddemo.py +++ b/doc/salome/examples/ghs3ddemo.py @@ -19,11 +19,10 @@ import salome salome.salome_init() -import GEOM + from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) -import SMESH, SALOMEDS from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) @@ -32,14 +31,14 @@ box = geompy.MakeBoxDXDYDZ(200., 200., 200.) geompy.addToStudy(box, "box") # create a mesh on the box -ghs3dMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") +mgtetraMesh = smesh.Mesh(box,"box: MG-Tetra and MG-CADSurf mesh") -# create a BLSurf algorithm for faces -BLSURF = ghs3dMesh.Triangle(algo=smeshBuilder.BLSURF) -GHS3D = ghs3dMesh.Tetrahedron(algo=smeshBuilder.GHS3D) +# create a MG_CADSurf algorithm for faces +MG_CADSurf = mgtetraMesh.Triangle(algo=smeshBuilder.MG_CADSurf) +MG_Tetra = mgtetraMesh.Tetrahedron(algo=smeshBuilder.MG_Tetra) # compute the mesh -ghs3dMesh.Compute() +mgtetraMesh.Compute() # End of script diff --git a/doc/salome/gui/GHS3DPLUGIN/doxyfile.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile.in index eb89c04..9400ef8 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile.in +++ b/doc/salome/gui/GHS3DPLUGIN/doxyfile.in @@ -20,7 +20,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME GHS3DPLUGIN User's Guide" +PROJECT_NAME = "SALOME MG-Tetra plug-in User's Guide" OUTPUT_DIRECTORY = GHS3DPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in index a63bed0..71515b7 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in @@ -20,7 +20,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME GHS3DPLUGIN User's Guide" +PROJECT_NAME = "SALOME MG_Tetra plug-in User's Guide" OUTPUT_DIRECTORY = GHS3DPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_meshes.png b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_meshes.png index 050152e..b612ced 100644 Binary files a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_meshes.png and b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_meshes.png differ diff --git a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_vertices.png b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_vertices.png index 3632608..2b85f9f 100644 Binary files a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_vertices.png and b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_vertices.png differ diff --git a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_advanced.png b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_advanced.png index 6ad5f89..81439d7 100644 Binary files a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_advanced.png and b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_advanced.png differ diff --git a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_basic.png b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_basic.png index 450a4a1..08feab4 100644 Binary files a/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_basic.png and b/doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_basic.png differ diff --git a/doc/salome/gui/GHS3DPLUGIN/images/image2.gif b/doc/salome/gui/GHS3DPLUGIN/images/image2.gif old mode 100755 new mode 100644 index 1983513..4e5690d Binary files a/doc/salome/gui/GHS3DPLUGIN/images/image2.gif and b/doc/salome/gui/GHS3DPLUGIN/images/image2.gif differ diff --git a/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc index c800d80..28ed05a 100644 --- a/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc +++ b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc @@ -6,7 +6,7 @@ MG-Tetra Parameters hypothesis works only with MG-Tetra algorithm. This algorithm is a commercial software. -To get a license, visit http://www.distene.com/en/corp/eval-distene.html +To get a license, visit http://www.meshgems.com/meshgems-products.html \tableofcontents diff --git a/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc b/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc index 7825164..ad46d52 100644 --- a/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc +++ b/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc @@ -2,11 +2,22 @@ \page ghs3dplugin_python_interface_page Python Interface -Python package GHS3DPluginBuilder defines several classes, destined for creation of the 3D meshes. +\note The former name of MG-Tetra mesher is \a GHS3D and names +of the corresponding classes and modules still include \a "GHS3D". -GHS3D meshing plugin dynamically adds several methods to the smeshBuilder.Mesh class to create meshing algorithms. +Python package GHS3DPluginBuilder defines +GHS3DPluginBuilder.GHS3D_Algorithm class providing access +to the MG-Tetra meshing algorithm and its parameters. -Below you can see an example of usage of the GHS3DPluginBuilder Python API for mesh generation: +You can get an instance of this class by calling +smeshBuilder.Mesh.Tetrahedron(algo=smeshBuilder.MG_Tetra) or +smeshBuilder.Mesh.Tetrahedron(algo=smeshBuilder.GHS3D). This call +creates an algorithm (if not yet exist), assigns it to the mesh and +returns an instance of GHS3DPluginBuilder.GHS3D_Algorithm to the caller. + +The class of algorithm has methods to set up meshing parameters. + +Below you can see examples of usage of this class for tetrahedral mesh generation. \anchor tui_ghs3d @@ -16,7 +27,7 @@ Below you can see an example of usage of the GHS3DPluginBuilder Python API for m \section tui_ghs3d_basic Construction of Mesh using MG-Tetra algorithm -\anchor example_BLSURFPlugin +\anchor example_GHS3DPlugin

Example of mesh generation with MG-Tetra algorithm:

\tui_script{ghs3ddemo.py} diff --git a/doc/salome/gui/GHS3DPLUGIN/input/index.doc b/doc/salome/gui/GHS3DPLUGIN/input/index.doc index 354df11..bcc3e4a 100644 --- a/doc/salome/gui/GHS3DPLUGIN/input/index.doc +++ b/doc/salome/gui/GHS3DPLUGIN/input/index.doc @@ -1,18 +1,22 @@ /*! -\mainpage Introduction to GHS3DPLUGIN +\mainpage Introduction to MG-Tetra plug-in -\b GHS3DPLUGIN plugin is destined for: -- Meshing 3D geometric entities: volumes are split into tetrahedral (pyramidal) elements. +\b MG-Tetra plug-in adds MG-Tetra (former GHS3D) meshing +algorithm to the SALOME Mesh module. + +\b MG-Tetra meshing algorithm is destined for: +- Meshing 3D geometric entities: solids are split into tetrahedral (pyramidal) elements. - Generating 3D meshes from 2D meshes (triangles and quadrangles), working without geometrical objects. -\note GHS3DPLUGIN plugin used GHS3D commercial mesher and require a +\note MG-Tetra plug-in uses MG-Tetra commercial mesher and requires a license to be used within the Mesh module. +To obtain a license, visit http://www.meshgems.com/meshgems-products.html -To manage parameters of the GHS3DPLUGIN use \subpage ghs3d_hypo_page and \subpage additional_hypo_page +To manage parameters of the MG-Tetra mesher use \subpage ghs3d_hypo_page and \subpage additional_hypo_page -Also all GHS3DPLUGIN functionalities are accessible via -\subpage ghs3dplugin_python_interface_page "GHS3DPLUGIN Python interface". +Also all MG-Tetra functionalities are accessible via +\subpage ghs3dplugin_python_interface_page "MG-Tetra Python interface". \image html image2.gif "Example of a tetrahedral 3D mesh" diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index a55685c..f32d61f 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -27,6 +27,6 @@
- +
diff --git a/src/GHS3DPlugin/GHS3DPluginBuilder.py b/src/GHS3DPlugin/GHS3DPluginBuilder.py index e0b5ca1..178896f 100644 --- a/src/GHS3DPlugin/GHS3DPluginBuilder.py +++ b/src/GHS3DPlugin/GHS3DPluginBuilder.py @@ -19,7 +19,7 @@ ## # @package GHS3DPluginBuilder -# Python API for the GHS3D meshing plug-in module. +# Python API for the MG-Tetra meshing plug-in module. from salome.smesh.smesh_algorithm import Mesh_Algorithm from salome.smesh.smeshBuilder import AssureGeomPublished @@ -32,7 +32,7 @@ except ImportError: noGHS3DPlugin = 1 pass -# Optimization level of GHS3D +# Optimization level of MG-Tetra # V3.1 None_Optimization, Light_Optimization, Medium_Optimization, Strong_Optimization = 0,1,2,3 # V4.1 (partialy redefines V3.1). Issue 0020574 @@ -42,13 +42,13 @@ None_Optimization, Light_Optimization, Standard_Optimization, StandardPlus_Optim # Mesh algo type identifiers #---------------------------- -## Algorithm type: GHS3D tetrahedron 3D algorithm, see GHS3D_Algorithm -GHS3D = "MG-Tetra" +## Algorithm type: MG-Tetra tetrahedron 3D algorithm, see GHS3D_Algorithm MG_Tetra = "MG-Tetra" +GHS3D = MG_Tetra -## Tetrahedron GHS3D 3D algorithm +## Tetrahedron MG-Tetra 3D algorithm # -# It can be created by calling smeshBuilder.Mesh.Tetrahedron( smeshBuilder.GHS3D, geom=0 ) +# It can be created by calling smeshBuilder.Mesh.Tetrahedron( smeshBuilder.MG_Tetra, geom=0 ) class GHS3D_Algorithm(Mesh_Algorithm): ## name of the dynamic method in smeshBuilder.Mesh class @@ -56,7 +56,7 @@ class GHS3D_Algorithm(Mesh_Algorithm): meshMethod = "Tetrahedron" ## type of algorithm used with helper function in smeshBuilder.Mesh class # @internal - algoType = GHS3D + algoType = MG_Tetra ## doc string of the method in smeshBuilder.Mesh class # @internal docHelper = "Creates tetrahedron 3D algorithm for volumes" @@ -90,7 +90,7 @@ class GHS3D_Algorithm(Mesh_Algorithm): ## To make groups of volumes of different domains when mesh is generated from skin. # Default is to make groups. # This option works only (1) for the mesh w/o shape and (2) if GetToMeshHoles() == true - # @param toMesh "mesh holes" flag value + # @param toMakeGroups "Make groups of domains" flag value def SetToMakeGroupsOfDomains(self, toMakeGroups): self.Parameters().SetToMakeGroupsOfDomains(toMakeGroups) pass diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx index 16aa61b..86d9fcd 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx @@ -316,9 +316,9 @@ static bool isTmpFace(const SMDS_MeshNode* node1, //======================================================================= //function : findShapeID -//purpose : find the solid corresponding to GHS3D sub-domain following -// the technique proposed in GHS3D manual (available within -// ghs3d installation) in chapter "B.4 Subdomain (sub-region) assignment". +//purpose : find the solid corresponding to MG-Tetra sub-domain following +// the technique proposed in MG-Tetra manual (available within +// MG-Tetra installation) in chapter "B.4 Subdomain (sub-region) assignment". // In brief: normal of the triangle defined by the given nodes // points out of the domain it is associated to //======================================================================= @@ -639,8 +639,8 @@ static int findShapeID(SMESH_Mesh& mesh, // for (int i=0; i < nbTriangle; i++) { // tabID[i] = 0; // int nodeId1, nodeId2, nodeId3; -// // find the solid corresponding to GHS3D sub-domain following -// // the technique proposed in GHS3D manual in chapter +// // find the solid corresponding to MG-Tetra sub-domain following +// // the technique proposed in MG-Tetra manual in chapter // // "B.4 Subdomain (sub-region) assignment" // // nodeId1 = strtol(ptr, &ptr, 10); @@ -661,7 +661,7 @@ static int findShapeID(SMESH_Mesh& mesh, // try { // OCC_CATCH_SIGNALS; // tabID[i] = findShapeID( theMesh, n1, n2, n3, toMeshHoles ); -// // -- 0020330: Pb with ghs3d as a submesh +// // -- 0020330: Pb with MG-Tetra as a submesh // // check that found shape is to be meshed // if ( tabID[i] > 0 ) { // const TopoDS_Shape& foundShape = theMeshDS->IndexToShape( tabID[i] ); @@ -671,7 +671,7 @@ static int findShapeID(SMESH_Mesh& mesh, // if ( !isToBeMeshed ) // tabID[i] = HOLE_ID; // } -// // END -- 0020330: Pb with ghs3d as a submesh +// // END -- 0020330: Pb with MG-Tetra as a submesh // #ifdef _DEBUG_ // std::cout << i+1 << " subdomain: findShapeID() returns " << tabID[i] << std::endl; // #endif @@ -871,7 +871,7 @@ static int findShapeID(SMESH_Mesh& mesh, // // // IN WORK // TopoDS_Shape aSolid; -// // We always run GHS3D with "to mesh holes"==TRUE but we must not create +// // We always run MG-Tetra with "to mesh holes"==TRUE but we must not create // // tetras within holes depending on hypo option, // // so we first check if aTet is inside a hole and then create it // if ( nbTriangle > 1 ) { @@ -1630,9 +1630,9 @@ static bool writeGMFFile(const char* theMesh nbNodes = elem->NbCornerNodes(); while ( nodeIt->more() && nbNodes--) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); - int newId = aNodeToGhs3dIdMap.size() + 1; // ghs3d ids count from 1 + int newId = aNodeToGhs3dIdMap.size() + 1; // MG-Tetra ids count from 1 aNodeToGhs3dIdMap.insert( make_pair( node, newId )); } } @@ -1646,7 +1646,7 @@ static bool writeGMFFile(const char* theMesh nodeIt = elem->nodesIterator(); nbNodes = 2; while ( nodeIt->more() && nbNodes-- ) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); // Test if point is inside shape to mesh gp_Pnt myPoint(node->X(),node->Y(),node->Z()); @@ -1662,7 +1662,7 @@ static bool writeGMFFile(const char* theMesh nbNodes = 2; int newId = -1; while ( nodeIt->more() && nbNodes-- ) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); gp_Pnt myPoint(node->X(),node->Y(),node->Z()); nbFoundElems = pntCls->FindElementsByPoint(myPoint, SMDSAbs_Node, foundElems); @@ -1672,7 +1672,7 @@ static bool writeGMFFile(const char* theMesh #endif if (nbFoundElems ==0) { if ((*aNodeToTopAbs_StateMap.find(node)).second == TopAbs_IN) { - newId = aNodeToGhs3dIdMap.size() + anEnforcedNodeToGhs3dIdMap.size() + 1; // ghs3d ids count from 1 + newId = aNodeToGhs3dIdMap.size() + anEnforcedNodeToGhs3dIdMap.size() + 1; // MG-Tetra ids count from 1 anEnforcedNodeToGhs3dIdMap.insert( make_pair( node, newId )); } } @@ -1684,7 +1684,7 @@ static bool writeGMFFile(const char* theMesh else isOK = false; #ifdef _DEBUG_ - std::cout << "GHS3D node ID: "<nodesIterator(); nbNodes = 3; while ( nodeIt->more() && nbNodes--) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); // Test if point is inside shape to mesh gp_Pnt myPoint(node->X(),node->Y(),node->Z()); @@ -1717,7 +1717,7 @@ static bool writeGMFFile(const char* theMesh nbNodes = 3; int newId = -1; while ( nodeIt->more() && nbNodes--) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); gp_Pnt myPoint(node->X(),node->Y(),node->Z()); nbFoundElems = pntCls->FindElementsByPoint(myPoint, SMDSAbs_Node, foundElems); @@ -1726,7 +1726,7 @@ static bool writeGMFFile(const char* theMesh #endif if (nbFoundElems ==0) { if ((*aNodeToTopAbs_StateMap.find(node)).second == TopAbs_IN) { - newId = aNodeToGhs3dIdMap.size() + anEnforcedNodeToGhs3dIdMap.size() + 1; // ghs3d ids count from 1 + newId = aNodeToGhs3dIdMap.size() + anEnforcedNodeToGhs3dIdMap.size() + 1; // MG-Tetra ids count from 1 anEnforcedNodeToGhs3dIdMap.insert( make_pair( node, newId )); } } @@ -1738,7 +1738,7 @@ static bool writeGMFFile(const char* theMesh else isOK = false; #ifdef _DEBUG_ - std::cout << "GHS3D node ID: "<first: "<first<second - 1 ] = n2id->first; // ghs3d ids count from 1 + theNodeByGhs3dId[ n2id->second - 1 ] = n2id->first; // MG-Tetra ids count from 1 } // put nodes to anEnforcedNodeToGhs3dIdMap vector @@ -1767,7 +1767,7 @@ static bool writeGMFFile(const char* theMesh for ( ; n2id != anEnforcedNodeToGhs3dIdMap.end(); ++ n2id) { if (n2id->second > aNodeToGhs3dIdMap.size()) { - theEnforcedNodeByGhs3dId[ n2id->second - aNodeToGhs3dIdMap.size() - 1 ] = n2id->first; // ghs3d ids count from 1 + theEnforcedNodeByGhs3dId[ n2id->second - aNodeToGhs3dIdMap.size() - 1 ] = n2id->first; // MG-Tetra ids count from 1 } } @@ -2026,7 +2026,7 @@ static bool writeGMFFile(const char* theMesh nodeIt = elem->nodesIterator(); int index=0; while ( nodeIt->more() ) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); map< const SMDS_MeshNode*,int >::iterator it = anEnforcedNodeToGhs3dIdMap.find(node); if (it == anEnforcedNodeToGhs3dIdMap.end()) { @@ -2065,7 +2065,7 @@ static bool writeGMFFile(const char* theMesh nodeIt = elem->nodesIterator(); int index=0; for ( int j = 0; j < 3; ++j ) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); map< const SMDS_MeshNode*,int >::iterator it = aNodeToGhs3dIdMap.find(node); if (it == aNodeToGhs3dIdMap.end()) @@ -2084,7 +2084,7 @@ static bool writeGMFFile(const char* theMesh nodeIt = elem->nodesIterator(); int index=0; for ( int j = 0; j < 3; ++j ) { - // find GHS3D ID + // find MG-Tetra ID const SMDS_MeshNode* node = castToNode( nodeIt->next() ); map< const SMDS_MeshNode*,int >::iterator it = anEnforcedNodeToGhs3dIdMap.find(node); if (it == anEnforcedNodeToGhs3dIdMap.end()) { @@ -2157,7 +2157,7 @@ static bool writeGMFFile(const char* theMesh // nbev = theEnforcedVertices.size(); // nben = theEnforcedNodes.size(); // -// // Issue 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by GHS3D +// // Issue 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by MG-Tetra // // The problem is in nodes on degenerated edges, we need to skip nodes which are free // // and replace not-free nodes on edges by the node on vertex // TNodeNodeMap n2nDegen; // map a node on degenerated edge to a node on vertex @@ -2336,7 +2336,7 @@ static bool writeGMFFile(const char* theMesh // itOnSubFace = aFace->nodesIterator(); // att.clear(); // for ( int j = 0; j < 3; ++j ) { -// // find GHS3D ID +// // find MG-Tetra ID // node = castToNode( itOnSubFace->next() ); // if (( n2nDegenIt = n2nDegen.find( node )) != n2nDegen.end() ) // node = n2nDegenIt->second; @@ -2512,7 +2512,7 @@ static bool writeGMFFile(const char* theMesh // // itOnSubFace = aFace->nodesIterator(); // // aqt.clear(); // // while ( itOnSubFace->more() ) { -// // // find GHS3D ID +// // // find MG-Tetra ID // // aSmdsID = itOnSubFace->next()->GetID(); // // itOnMap = theSmdsToGhs3dIdMap.find( aSmdsID ); // // ASSERT( itOnMap != theSmdsToGhs3dIdMap.end() ); @@ -2642,7 +2642,7 @@ static bool writeFaces (ofstream & theFile, itOnSubFace = aFace->nodesIterator(); for ( int j = 0; j < 3; ++j ) { - // find GHS3D ID + // find MG-Tetra ID aSmdsID = itOnSubFace->next()->GetID(); itOnMap = theSmdsToGhs3dIdMap.find( aSmdsID ); // if ( itOnMap == theSmdsToGhs3dIdMap.end() ) { @@ -2794,7 +2794,7 @@ static bool writePoints (ofstream & theFile, SMDS_NodeIteratorPtr nodeIt = theMeshDS->nodesIterator(); const SMDS_MeshNode* node; - // Issue 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by GHS3D + // Issue 020674: EDF 870 SMESH: Mesh generated by Netgen not usable by MG-Tetra // The problem is in nodes on degenerated edges, we need to skip nodes which are free // and replace not-free nodes on degenerated edges by the node on vertex TNodeNodeMap n2nDegen; // map a node on degenerated edge to a node on vertex @@ -3067,7 +3067,7 @@ static bool readResultFile(const int fileOpen, // Creating SMESH nodes // - for enforced vertices // - for vertices of forced edges - // - for ghs3d nodes + // - for MG-Tetra nodes nodeAssigne[ iNode ] = 0; aNewNode = theMeshDS->AddNode( coord[0],coord[1],coord[2] ); theGhs3dIdToNodeMap.insert(theGhs3dIdToNodeMap.end(), make_pair( iNode, aNewNode )); @@ -3082,8 +3082,8 @@ static bool readResultFile(const int fileOpen, if(theAlgo->computeCanceled()) return false; tabID[i] = 0; - // find the solid corresponding to GHS3D sub-domain following - // the technique proposed in GHS3D manual in chapter + // find the solid corresponding to MG-Tetra sub-domain following + // the technique proposed in MG-Tetra manual in chapter // "B.4 Subdomain (sub-region) assignment" int nodeId1 = strtol(ptr, &ptr, 10); int nodeId2 = strtol(ptr, &ptr, 10); @@ -3100,7 +3100,7 @@ static bool readResultFile(const int fileOpen, OCC_CATCH_SIGNALS; // tabID[i] = findShapeID( theHelper, n1, n2, n3, toMeshHoles ); tabID[i] = findShapeID( *theHelper.GetMesh(), n1, n2, n3, toMeshHoles ); - // -- 0020330: Pb with ghs3d as a submesh + // -- 0020330: Pb with MG-Tetra as a submesh // check that found shape is to be meshed if ( tabID[i] > 0 ) { const TopoDS_Shape& foundShape = theMeshDS->IndexToShape( tabID[i] ); @@ -3110,7 +3110,7 @@ static bool readResultFile(const int fileOpen, if ( !isToBeMeshed ) tabID[i] = HOLE_ID; } - // END -- 0020330: Pb with ghs3d as a submesh + // END -- 0020330: Pb with MG-Tetra as a submesh #ifdef _DEBUG_ std::cout << i+1 << " subdomain: findShapeID() returns " << tabID[i] << std::endl; #endif @@ -3148,7 +3148,7 @@ static bool readResultFile(const int fileOpen, node[ iNode ] = itOnNode->second; nodeID[ iNode ] = ID; } - // We always run GHS3D with "to mesh holes"==TRUE but we must not create + // We always run MG-Tetra with "to mesh holes"==TRUE but we must not create // tetras within holes depending on hypo option, // so we first check if aTet is inside a hole and then create it //aTet = theMeshDS->AddVolume( node[1], node[0], node[2], node[3] ); @@ -3332,7 +3332,7 @@ static bool readResultFile(const int fileOpen, //============================================================================= /*! - *Here we are going to use the GHS3D mesher with geometry + *Here we are going to use the MG-Tetra mesher with geometry */ //============================================================================= @@ -3343,7 +3343,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, //SMESHDS_Mesh* meshDS = theMesh.GetMeshDS(); // we count the number of shapes - // _nbShape = countShape( meshDS, TopAbs_SOLID ); -- 0020330: Pb with ghs3d as a submesh + // _nbShape = countShape( meshDS, TopAbs_SOLID ); -- 0020330: Pb with MG-Tetra as a submesh // _nbShape = 0; TopExp_Explorer expBox ( theShape, TopAbs_SOLID ); // for ( ; expBox.More(); expBox.Next() ) @@ -3474,7 +3474,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, std::vector aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId; // proxyMesh must live till readGMFFile() as a proxy face can be used by - // ghs3d for domain indication + // MG-Tetra for domain indication //{ SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); @@ -3530,7 +3530,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, return error(SMESH_Comment("Can't write into ") << aSmdsToGhs3dIdMapFileName); } INFOS( "Writing ids relation into " << aSmdsToGhs3dIdMapFileName); - aIdsFile << "Smds Ghs3d" << std::endl; + aIdsFile << "Smds MG-Tetra" << std::endl; map ::const_iterator myit; for (myit=aSmdsToGhs3dIdMap.begin() ; myit != aSmdsToGhs3dIdMap.end() ; ++myit) { aIdsFile << myit->first << " " << myit->second << std::endl; @@ -3550,7 +3550,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, removeFile( aResultFileName ); // needed for boundary recovery module usage // ----------------- - // run ghs3d mesher + // run MG-Tetra mesher // ----------------- TCollection_AsciiString cmd( (char*)GHS3DPlugin_Hypothesis::CommandToRun( _hyp ).c_str() ); @@ -3563,7 +3563,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file std::cout << std::endl; - std::cout << "Ghs3d execution..." << std::endl; + std::cout << "MG-Tetra execution..." << std::endl; std::cout << cmd << std::endl; _compute_canceled = false; @@ -3571,7 +3571,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, system( cmd.ToCString() ); // run std::cout << std::endl; - std::cout << "End of Ghs3d execution !" << std::endl; + std::cout << "End of MG-Tetra execution !" << std::endl; // -------------- // read a result @@ -3583,7 +3583,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, // fileOpen = open( aResultFileName.ToCString(), O_RDONLY); // if ( fileOpen < 0 ) { // std::cout << std::endl; - // std::cout << "Can't open the " << aResultFileName.ToCString() << " GHS3D output file" << std::endl; + // std::cout << "Can't open the " << aResultFileName.ToCString() << " MG-Tetra output file" << std::endl; // std::cout << "Log: " << aLogFileName << std::endl; // Ok = false; // } @@ -3642,8 +3642,8 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, { // the log file is empty removeFile( aLogFileName ); - INFOS( "GHS3D Error, command '" << cmd.ToCString() << "' failed" ); - error(COMPERR_ALGO_FAILED, "ghs3d: command not found" ); + INFOS( "MG-Tetra Error, command '" << cmd.ToCString() << "' failed" ); + error(COMPERR_ALGO_FAILED, "mg-tetra.exe: command not found" ); } if ( !_keepFiles ) { @@ -3656,7 +3656,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, removeFile( aResultFileName ); removeFile( aSmdsToGhs3dIdMapFileName ); } - std::cout << "<" << aResultFileName.ToCString() << "> GHS3D output file "; + std::cout << "<" << aResultFileName.ToCString() << "> MG-Tetra output file "; if ( !Ok ) std::cout << "not "; std::cout << "treated !" << std::endl; @@ -3671,7 +3671,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, //============================================================================= /*! - *Here we are going to use the GHS3D mesher w/o geometry + *Here we are going to use the MG-Tetra mesher w/o geometry */ //============================================================================= bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, @@ -3800,7 +3800,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, std::vector aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId; // proxyMesh must live till readGMFFile() as a proxy face can be used by - // ghs3d for domain indication + // MG-Tetra for domain indication //{ SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); if ( theMesh.NbQuadrangles() > 0 ) @@ -3819,7 +3819,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, //} // ----------------- - // run ghs3d mesher + // run MG-Tetra mesher // ----------------- TCollection_AsciiString cmd = TCollection_AsciiString((char*)GHS3DPlugin_Hypothesis::CommandToRun( _hyp, false ).c_str()); @@ -3832,7 +3832,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file std::cout << std::endl; - std::cout << "Ghs3d execution..." << std::endl; + std::cout << "MG-Tetra execution..." << std::endl; std::cout << cmd << std::endl; _compute_canceled = false; @@ -3840,7 +3840,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, system( cmd.ToCString() ); // run std::cout << std::endl; - std::cout << "End of Ghs3d execution !" << std::endl; + std::cout << "End of MG-Tetra execution !" << std::endl; // -------------- // read a result @@ -3883,8 +3883,8 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, else { // the log file is empty removeFile( aLogFileName ); - INFOS( "GHS3D Error, command '" << cmd.ToCString() << "' failed" ); - error(COMPERR_ALGO_FAILED, "ghs3d: command not found" ); + INFOS( "MG-Tetra Error, command '" << cmd.ToCString() << "' failed" ); + error(COMPERR_ALGO_FAILED, "mg-tetra.exe: command not found" ); } if ( !_keepFiles ) @@ -3914,7 +3914,7 @@ void GHS3DPlugin_GHS3D::CancelCompute() //================================================================================ /*! - * \brief Provide human readable text by error code reported by ghs3d + * \brief Provide human readable text by error code reported by MG-Tetra */ //================================================================================ @@ -4492,7 +4492,7 @@ bool GHS3DPlugin_GHS3D::storeErrorDescription(const TCollection_AsciiString& log { char msg2[] = "SEGMENTATION FAULT"; if ( search( &buf[0], bufEnd, msg2, msg2 + strlen(msg2)) != bufEnd ) - errDescription << "ghs3d: SEGMENTATION FAULT. "; + errDescription << "MG-Tetra: SEGMENTATION FAULT. "; } } @@ -4530,7 +4530,7 @@ _Ghs2smdsConvertor::_Ghs2smdsConvertor( const vector & n //================================================================================ /*! - * \brief Return SMDS element by ids of GHS3D nodes + * \brief Return SMDS element by ids of MG-Tetra nodes */ //================================================================================ diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx index 519b2b4..27796de 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx @@ -105,7 +105,7 @@ private: }; /*! - * \brief Convertor of GHS3D elements to SMDS ones + * \brief Convertor of MG-Tetra elements to SMDS ones */ class _Ghs2smdsConvertor { diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx index 3a211c9..b615ebd 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx @@ -33,7 +33,7 @@ #include "GHS3DPlugin_GHS3D.hxx" // ====================================================== -// GHS3D 3d algorithm +// MG-Tetra 3d algorithm // ====================================================== class GHS3DPlugin_GHS3D_i: public virtual POA_GHS3DPlugin::GHS3DPlugin_GHS3D, diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx index f9f4e4d..1107c3b 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx @@ -1451,7 +1451,7 @@ bool GHS3DPlugin_Hypothesis::SetParametersByDefaults(const TDefaults& dflts, //================================================================================ /*! - * \brief Return command to run ghs3d mesher excluding file prefix (-f) + * \brief Return command to run MG-Tetra mesher excluding file prefix (-f) */ //================================================================================ @@ -1476,8 +1476,8 @@ std::string GHS3DPlugin_Hypothesis::CommandToRun(const GHS3DPlugin_Hypothesis* h if ( !useBndRecovery && hyp ) useBndRecovery = hyp->myToUseBoundaryRecoveryVersion; - // ghs3d needs to know amount of memory it may use (MB). - // Default memory is defined at ghs3d installation but it may be not enough, + // MG-Tetra needs to know amount of memory it may use (MB). + // Default memory is defined at MG-Tetra installation but it may be not enough, // so allow to use about all available memory if ( m ) { double aMaximumMemory = hyp ? hyp->myMaximumMemory : -1; @@ -1499,7 +1499,7 @@ std::string GHS3DPlugin_Hypothesis::CommandToRun(const GHS3DPlugin_Hypothesis* h // 0 , all components to be meshed // 1 , only the main ( outermost ) component to be meshed if ( c && !useBndRecovery ) { - // We always run GHS3D with "to mesh holes'==TRUE (see PAL19680) + // We always run MG-Tetra with "to mesh holes'==TRUE (see PAL19680) if ( hasShapeToMesh ) cmd += " -c 0"; else { diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx index c3a7e1c..d045708 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx @@ -225,7 +225,7 @@ public: /*! - * \brief Return command to run ghs3d mesher excluding file prefix (-f) + * \brief Return command to run MG-Tetra mesher excluding file prefix (-f) */ static std::string CommandToRun(const GHS3DPlugin_Hypothesis* hyp, const bool hasShapeToMesh=true); diff --git a/src/GHS3DPlugin/__init__.py b/src/GHS3DPlugin/__init__.py index e6e69b4..817e26f 100644 --- a/src/GHS3DPlugin/__init__.py +++ b/src/GHS3DPlugin/__init__.py @@ -19,5 +19,5 @@ ## # @package GHS3DPluginBuilder -# Python API for the GHS3D meshing plug-in module. +# Python API for the MG-Tetra meshing plug-in module. diff --git a/src/GUI/GHS3DPlugin_msg_fr.ts b/src/GUI/GHS3DPlugin_msg_fr.ts index 94a04c5..1d3226a 100755 --- a/src/GUI/GHS3DPlugin_msg_fr.ts +++ b/src/GUI/GHS3DPlugin_msg_fr.ts @@ -13,7 +13,7 @@ GHS3D_HYPOTHESIS - GHS3D + MG-Tetra GHS3D_OPTIMIZATIOL_LEVEL diff --git a/src/GUI/GHS3DPlugin_msg_ja.ts b/src/GUI/GHS3DPlugin_msg_ja.ts index 2d3149e..20a88f0 100644 --- a/src/GUI/GHS3DPlugin_msg_ja.ts +++ b/src/GUI/GHS3DPlugin_msg_ja.ts @@ -9,7 +9,7 @@ GHS3D_HYPOTHESIS - GHS3D + MG-Tetra GHS3D_OPTIMIZATIOL_LEVEL