From 34ae8dae50b971322e67712741936970a0733d78 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 3 Oct 2016 17:55:59 +0300 Subject: [PATCH] 23352: [CEA] Order and naming of meshing algorithms --- doc/salome/examples/netgendemo.py | 4 +- .../NETGENPLUGIN/input/additional_hypo.doc | 4 +- .../NETGENPLUGIN/input/netgen_2d_3d_hypo.doc | 18 +-- resources/NETGENPlugin.xml | 109 ++++++++++-------- src/GUI/NETGENPlugin_msg_en.ts | 8 +- src/GUI/NETGENPlugin_msg_fr.ts | 8 +- src/GUI/NETGENPlugin_msg_ja.ts | 8 +- 7 files changed, 84 insertions(+), 75 deletions(-) diff --git a/doc/salome/examples/netgendemo.py b/doc/salome/examples/netgendemo.py index 8ef585b..2cc73a0 100644 --- a/doc/salome/examples/netgendemo.py +++ b/doc/salome/examples/netgendemo.py @@ -18,7 +18,7 @@ geompy.addToStudy(box, "Box") # 1. Create a triangular 2D mesh on the box with NETGEN_1D2D algorithm triaN = smesh.Mesh(box, "Box : triangular mesh by NETGEN_1D2D") -# create a Netgen_1D2D algorithm for solids +# create a NETGEN_1D2D algorithm for solids algo2D = triaN.Triangle(smeshBuilder.NETGEN_1D2D) # define hypotheses @@ -33,7 +33,7 @@ n12_params.SetMaxSize(300) # 2. Create a tetrahedral mesh on the box with NETGEN_1D2D3D algorithm (full netgen) tetraN = smesh.Mesh(box, "Box : tetrahedrical mesh by NETGEN_1D2D3D") -# create a Netgen_1D2D3D algorithm for solids +# create a NETGEN_1D2D3D algorithm for solids algo3D = tetraN.Tetrahedron(smeshBuilder.FULL_NETGEN) # define hypotheses diff --git a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc index 0463e30..7e4523c 100644 --- a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc +++ b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc @@ -15,8 +15,8 @@ computations. The prisms constructed on the quadrangular mesh faces are actually the hexahedrons.
  • Quadrangle Preference - This additional hypothesis can be - used together with Netgen 2D algorithm. -It allows Netgen 2D to build quad-dominant meshes.
    • + used together with NETGEN 2D algorithm. +It allows NETGEN 2D to build quad-dominant meshes.
    diff --git a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc index 30ea993..ff7555a 100644 --- a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc +++ b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc @@ -1,24 +1,24 @@ /*! -\page netgen_2d_3d_hypo_page Netgen 2D and 3D hypotheses +\page netgen_2d_3d_hypo_page NETGEN 2D and 3D hypotheses -Netgen 2D Parameters and Netgen 3D Parameters hypotheses work only with -Netgen 1D-2D, Netgen 2D, Netgen 1D-2D-3D and -Netgen 3D algorithms. Netgen 1D-2D and Netgen +NETGEN 2D Parameters and NETGEN 3D Parameters hypotheses work only with +NETGEN 1D-2D, NETGEN 2D, NETGEN 1D-2D-3D and +NETGEN 3D algorithms. NETGEN 1D-2D and NETGEN 1D-2D-3D algorithms do not require definition of lower-level hypotheses and algorithms (2D and 1D for meshing 3D objects and 1D for meshing 2D objects). \image html netgen2d3d.png -
    Hypothesis dialog boxes of Netgen 1D-2D and Netgen +
    Hypothesis dialog boxes of NETGEN 1D-2D and NETGEN 1D-2D-3D algorithms are same

    \image html netgen2d3d_only.png -
    Dialog boxes of Netgen 2D and Netgen 3D +
    Dialog boxes of NETGEN 2D and NETGEN 3D algorithms
    -- Name - allows to define the name for the algorithm (Netgen +- Name - allows to define the name for the algorithm (NETGEN 2D (or 3D) Parameters by default). - Max Size - maximum linear dimensions for mesh cells. - Min Size - minimum linear dimensions for mesh cells. It is @@ -70,7 +70,7 @@ can be changed. \image html netgen2d3d_simple.png -Netgen 2D simple parameters and Netgen 3D simple +NETGEN 2D simple parameters and NETGEN 3D simple parameters allow defining the size of elements for each dimension. @@ -94,7 +94,7 @@ volumic elements will be equal to an average area of 2D elements, else - Max. Element Volume specifies expected maximum element volume of 3d elements. -\note Netgen algorithm does not strictly follow the input +\note NETGEN algorithm does not strictly follow the input parameters. The actual mesh can be more or less dense than required. There are several factors in it: - NETGEN does not actually use Number of Segments parameter for diff --git a/resources/NETGENPlugin.xml b/resources/NETGENPlugin.xml index 135bc92..9e0c77e 100644 --- a/resources/NETGENPlugin.xml +++ b/resources/NETGENPlugin.xml @@ -28,16 +28,16 @@ - + gui-lib ="NETGENPluginGUI"> - + icon-id ="mesh_hypo_netgen.png" + dim ="3"> SetLocalSizeOnShape, @@ -45,10 +45,10 @@ - + icon-id ="mesh_hypo_netgen_2d.png" + dim ="2"> SetLocalSizeOnShape, @@ -56,10 +56,10 @@ - + icon-id ="mesh_hypo_netgen.png" + dim ="3"> SetLocalSizeOnShape, @@ -67,10 +67,10 @@ - + icon-id ="mesh_hypo_netgen_2d.png" + dim ="2"> SetLocalSizeOnShape, @@ -78,25 +78,28 @@ - - + + icon-id ="mesh_hypo_netgen.png" + dim ="3"/> + - + input ="TRIA,QUAD" + output ="TETRA,PYRAMID" + dim ="3"> NETGEN_3D=Tetrahedron() MaxElementVolume=MaxElementVolume(SetMaxElementVolume()) @@ -105,14 +108,16 @@ - + input ="EDGE" + output ="TRIA,QUAD" + dim ="2"> NETGEN_2D_ONLY=Triangle(algo=smeshBuilder.NETGEN_2D) LengthFromEdges=LengthFromEdges() @@ -123,13 +128,15 @@ - NETGEN_2D=Triangle(algo=smeshBuilder.NETGEN_1D2D) @@ -139,12 +146,14 @@ - NETGEN_2D3D=Tetrahedron(algo=smeshBuilder.NETGEN_1D2D3D) @@ -158,11 +167,11 @@ - - diff --git a/src/GUI/NETGENPlugin_msg_en.ts b/src/GUI/NETGENPlugin_msg_en.ts index d7263d5..c90b504 100644 --- a/src/GUI/NETGENPlugin_msg_en.ts +++ b/src/GUI/NETGENPlugin_msg_en.ts @@ -5,7 +5,7 @@ @default NETGEN_2D_HYPOTHESIS - Netgen 2D + NETGEN 2D NETGEN_2D_TITLE @@ -13,7 +13,7 @@ NETGEN_3D_HYPOTHESIS - Netgen 3D + NETGEN 3D NETGEN_3D_TITLE @@ -21,7 +21,7 @@ NETGEN_SimpleParameters_3D_HYPOTHESIS - Netgen 3D simple parameters + NETGEN 3D simple parameters NETGEN_SimpleParameters_3D_TITLE @@ -29,7 +29,7 @@ NETGEN_SimpleParameters_2D_HYPOTHESIS - Netgen 2D simple parameters + NETGEN 2D simple parameters NETGEN_SimpleParameters_2D_TITLE diff --git a/src/GUI/NETGENPlugin_msg_fr.ts b/src/GUI/NETGENPlugin_msg_fr.ts index 45a940a..64005ea 100755 --- a/src/GUI/NETGENPlugin_msg_fr.ts +++ b/src/GUI/NETGENPlugin_msg_fr.ts @@ -5,7 +5,7 @@ @default NETGEN_2D_HYPOTHESIS - Netgen 2D + NETGEN 2D NETGEN_2D_TITLE @@ -13,7 +13,7 @@ NETGEN_3D_HYPOTHESIS - Netgen 3D + NETGEN 3D NETGEN_3D_TITLE @@ -21,7 +21,7 @@ NETGEN_SimpleParameters_3D_HYPOTHESIS - Netgen 3D paramètres simplifiés + NETGEN 3D paramètres simplifiés NETGEN_SimpleParameters_3D_TITLE @@ -29,7 +29,7 @@ NETGEN_SimpleParameters_2D_HYPOTHESIS - Netgen 2D paramètres simplifiés + NETGEN 2D paramètres simplifiés NETGEN_SimpleParameters_2D_TITLE diff --git a/src/GUI/NETGENPlugin_msg_ja.ts b/src/GUI/NETGENPlugin_msg_ja.ts index 76a3253..73b3c29 100644 --- a/src/GUI/NETGENPlugin_msg_ja.ts +++ b/src/GUI/NETGENPlugin_msg_ja.ts @@ -5,7 +5,7 @@ @default NETGEN_2D_HYPOTHESIS - Netgen 2D + NETGEN 2D NETGEN_2D_TITLE @@ -13,7 +13,7 @@ NETGEN_3D_HYPOTHESIS - Netgen 3D + NETGEN 3D NETGEN_3D_TITLE @@ -21,7 +21,7 @@ NETGEN_SimpleParameters_3D_HYPOTHESIS - Netgen 3D 簡易パラメーター + NETGEN 3D 簡易パラメーター NETGEN_SimpleParameters_3D_TITLE @@ -29,7 +29,7 @@ NETGEN_SimpleParameters_2D_HYPOTHESIS - Netgen 2D 簡易パラメーター + NETGEN 2D 簡易パラメーター NETGEN_SimpleParameters_2D_TITLE -- 2.39.2