From 60ec03750c5b23d03a8bf9a7a3348e36744c519c Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Mon, 3 Oct 2016 17:58:38 +0300
Subject: [PATCH] 23352: [CEA] Order and naming of meshing algorithms

---
 doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in     |  2 +-
 doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in  |  2 +-
 .../GHS3DPRLPLUGIN/input/ghs3dprl_hypo.doc    | 14 ++++----
 .../input/ghs3dprlplugin_python_interface.doc |  6 ++--
 doc/salome/gui/GHS3DPRLPLUGIN/input/index.doc | 14 ++++----
 resources/GHS3DPRLPlugin.xml                  | 32 ++++++++++---------
 src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py   | 17 +++++-----
 src/gui/GHS3DPRLPlugin_msg_en.ts              |  2 +-
 src/gui/GHS3DPRLPlugin_msg_ja.ts              |  2 +-
 9 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in
index b8ddc59..862a6ec 100755
--- a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in
@@ -20,7 +20,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME      = "SALOME MG-Tetra Parallel plug-in User's Guide"
+PROJECT_NAME      = "SALOME MG-Tetra_HPC plug-in User's Guide"
 OUTPUT_DIRECTORY  = GHS3DPRLPLUGIN
 CREATE_SUBDIRS	  = NO
 OUTPUT_LANGUAGE   = English
diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in
index ac43dfa..8a263bf 100755
--- a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in
@@ -20,7 +20,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME MG_Tetra Parallel Plug-in User's Guide"
+PROJECT_NAME           = "SALOME MG-Tetra_HPC Plug-in User's Guide"
 OUTPUT_DIRECTORY       = GHS3DPRLPLUGIN
 CREATE_SUBDIRS	       = NO
 OUTPUT_LANGUAGE        = English
diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprl_hypo.doc b/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprl_hypo.doc
index fa0a8c1..90c9215 100644
--- a/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprl_hypo.doc
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprl_hypo.doc
@@ -1,9 +1,9 @@
 /*!
 
-\page ghs3dprl_hypo_page MG-Tetra Parallel Parameters hypothesis
+\page ghs3dprl_hypo_page MG-Tetra_HPC Parameters hypothesis
 
 \n MG-Tetra Parameters hypothesis works only with <b>MG-Tetra</b>
-meshing algorithm which uses <b>MG-Tetra-hpc</b> code (formerly tepal)
+meshing algorithm which uses <b>MG-Tetra_HPC</b> code (formerly tepal)
 which is the parallel implementation of MG-Tetra (formerly TetMesh-GHS3D) algorithm. 
 This algorithm is a DISTENE commercial software, its use requires a license.
 \n
@@ -24,7 +24,7 @@ file with 5 million tetrahedrons.
 
 <ul>
 <li>
-<b>Name</b> - allows to define the name of the hypothesis (MG-Tetra Parallel Parameters by default).
+<b>Name</b> - allows to define the name of the hypothesis (MG-Tetra_HPC Parameters by default).
 </li>
 <li>
 <b>MED Name</b> - allows to define the path and the prefix of the 
@@ -80,7 +80,7 @@ In \b Advanced tab page you can specify not exposed options of MG_Tetra-hpc.
 A check box in the first column activates/deactivates the option of the current row. A deactivated option will be erased upon pressing \a Ok.
 
 <h1>Modifying MG-Tetra-hpc Advanced Parameters</h1><br>
-MG-Tetra Parallel plug-in launches a standalone binary
+MG-Tetra_HPC plug-in launches a standalone binary
 executable <b>tetrahpc2med</b>.<br>
 tetrahpc2med launches MG_Tetra-hpc, waits for the end of computation, and
 converts the resulting output files into MED files.<br>
@@ -200,8 +200,8 @@ Options:
 \n
 </li>
 
-<h1>Saving user's preferred MG-Tetra Parallel Advanced Parameters</h1><br>
-MG-Tetra Parallel plug-in launches standalone binary executable tetrahpc2med.<br>
+<h1>Saving user's preferred MG-Tetra_HPC Advanced Parameters</h1><br>
+MG-Tetra_HPC plug-in launches standalone binary executable tetrahpc2med.<br>
 You may rename file tetrahpc2med as tetrahpc2med.exe for example, and replace
 tetrahpc2med by a shell script at your convenience to overriding parameters.
 <br>... or else $PATH modification... .<br>
@@ -367,7 +367,7 @@ algo2d.SetGeometricMesh(0)
 # 3D mesh with tetra-hpc (formerly tepal v3 (2014))
 # ----------------------------------------------------
 
-algo3d = m.Tetrahedron(smeshBuilder.MG_Tetra_Parallel)
+algo3d = m.Tetrahedron(smeshBuilder.MG_Tetra_HPC)
 
 algo3d.SetMEDName(results)
 algo3d.SetNbPart(4)
diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprlplugin_python_interface.doc b/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprlplugin_python_interface.doc
index eb50bc1..0549f57 100644
--- a/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprlplugin_python_interface.doc
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/input/ghs3dprlplugin_python_interface.doc
@@ -2,15 +2,15 @@
 
 \page ghs3dprlplugin_python_interface_page Python Interface
 
-\note The former name of MG-Tetra Parallel meshing algorithm is \a GHS3DPRL and names
+\note The former name of MG-Tetra_HPC meshing algorithm is \a GHS3DPRL and names
 of the corresponding classes and modules still include \a "GHS3DPRL".
 
 Python package GHS3DPRLPluginBuilder defines
 GHS3DPRLPluginBuilder.GHS3DPRL_Algorithm class providing access
-to the MG-Tetra Parallel meshing algorithm and its parameters.
+to the MG-Tetra_HPC meshing algorithm and its parameters.
 
 You can get an instance of this class by calling
-smeshBuilder.Mesh.Tetrahedron(algo=smeshBuilder.MG_Tetra_Parallel) or 
+smeshBuilder.Mesh.Tetrahedron(algo=smeshBuilder.MG_Tetra_HPC) or 
 smeshBuilder.Mesh.Tetrahedron(algo=smeshBuilder.GHS3DPRL). This call
 creates an algorithm (if not yet exist), assigns it to the mesh and
 returns an instance of GHS3DPRLPluginBuilder.GHS3DPRL_Algorithm to the caller.
diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/input/index.doc b/doc/salome/gui/GHS3DPRLPLUGIN/input/index.doc
index e887994..6a37439 100644
--- a/doc/salome/gui/GHS3DPRLPLUGIN/input/index.doc
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/input/index.doc
@@ -1,21 +1,21 @@
 /*!
 
-\mainpage Introduction to MG-Tetra Parallel plug-in
+\mainpage Introduction to MG-Tetra_HPC plug-in
 
-\b MG-Tetra Parallel plug-in adds MG-Tetra Parallel (former GHS3DPRL) meshing
+\b MG-Tetra_HPC plug-in adds MG-Tetra_HPC (former GHS3DPRL) meshing
 algorithm to the SALOME Mesh module.
 
-\b MG-Tetra Parallel plug-in is destined for:
+\b MG-Tetra_HPC plug-in is destined for:
 - Meshing 3D geometric entities: volumes are split into tetrahedral (pyramidal) elements.
 - Generating 3D meshes from 2D meshes, working without geometrical objects.
 
-\note MG-Tetra Parallel plug-in uses MG-Tetra-hpc (formerly Tepal) commercial mesher and require a
+\note MG-Tetra_HPC plug-in uses MG-Tetra-hpc (formerly Tepal) commercial mesher and require a
 license to be used within the Mesh module.
 
-To manage parameters of the MG-Tetra Parallel mesher use \subpage ghs3dprl_hypo_page.
+To manage parameters of the MG-Tetra_HPC mesher use \subpage ghs3dprl_hypo_page.
 
-Also all MG-Tetra Parallel functionalities are accessible via
-\subpage ghs3dprlplugin_python_interface_page "MG-Tetra Parallel Python interface".
+Also all MG-Tetra_HPC functionalities are accessible via
+\subpage ghs3dprlplugin_python_interface_page "MG-Tetra_HPC Python interface".
 
 
 \image html image2.gif "Example of a tetrahedral 3D mesh"
diff --git a/resources/GHS3DPRLPlugin.xml b/resources/GHS3DPRLPlugin.xml
index e45e20a..9017cef 100755
--- a/resources/GHS3DPRLPlugin.xml
+++ b/resources/GHS3DPRLPlugin.xml
@@ -25,26 +25,28 @@
 
 <meshers>
 
-<meshers-group name="GHS3DPRL"
-               resources="GHS3DPRLPlugin"
+<meshers-group name      ="GHS3DPRL"
+               resources ="GHS3DPRLPlugin"
                idl-module="GHS3DPRLPlugin"
                server-lib="GHS3DPRLEngine"
-               gui-lib="GHS3DPRLPluginGUI">
+               gui-lib   ="GHS3DPRLPluginGUI">
   <hypotheses>
-    <hypothesis type="MG-Tetra Parallel Parameters"
-		label-id="MG-Tetra Parallel Parameters"
-		icon-id="mesh_hypo_GHS3DPRL.png"
-		dim="3"/>
+    <hypothesis type    ="MG-Tetra Parallel Parameters"
+		label-id="MG-Tetra_HPC Parameters"
+		icon-id ="mesh_hypo_GHS3DPRL.png"
+		dim     ="3"/>
   </hypotheses>
   <algorithms>
-    <algorithm type="MG-Tetra Parallel"
-               label-id="MG-Tetra Parallel"
-               icon-id="mesh_algo_GHS3DPRL.png"
-               hypos="MG-Tetra Parallel Parameters"
-               input="TRIA"
-               output="TETRA"
-               need-hyp="true"
-               dim="3">
+    <algorithm type     ="MG-Tetra Parallel"
+               label-id ="MG-Tetra_HPC"
+               icon-id  ="mesh_algo_GHS3DPRL.png"
+               group-id ="1"
+               priority ="40"
+               hypos    ="MG-Tetra Parallel Parameters"
+               input    ="TRIA"
+               output   ="TETRA"
+               need-hyp ="true"
+               dim      ="3">
       <python-wrap>
         <algo>MG-Tetra Parallel=Tetrahedron(algo=smeshBuilder.MG_Tetra_Parallel)</algo>
         <hypo>MG-Tetra Parallel Parameters=Parameters()</hypo>
diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py b/src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py
index 195d31d..c1f83c1 100644
--- a/src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py
@@ -19,7 +19,7 @@
 
 ##
 # @package GHS3DPRLPluginBuilder
-# Python API for the MG-Tetra Parallel meshing plug-in module.
+# Python API for the MG-Tetra_HPC meshing plug-in module.
 
 from salome.smesh.smesh_algorithm import Mesh_Algorithm
 from salome.smesh.smeshBuilder import AssureGeomPublished
@@ -32,7 +32,7 @@ except ImportError:
     noGHS3DPRLPlugin = 1
     pass
 
-# Optimization level of MG-Tetra Parallel
+# Optimization level of MG-Tetra_HPC
 # V3.1
 None_Optimization, Light_Optimization, Medium_Optimization, Strong_Optimization = 0,1,2,3
 # V4.1 (partialy redefines V3.1). Issue 0020574
@@ -42,17 +42,18 @@ None_Optimization, Light_Optimization, Standard_Optimization, StandardPlus_Optim
 # Mesh algo type identifiers
 #----------------------------
 
-## Algorithm type: MG-Tetra Parallel tetrahedron 3D algorithm, see GHS3DPRL_Algorithm
-MG_Tetra_Parallel = "MG-Tetra Parallel"
-GHS3DPRL = MG_Tetra_Parallel
+## Algorithm type: MG-Tetra_HPC tetrahedron 3D algorithm, see GHS3DPRL_Algorithm
+MG_Tetra_HPC = "MG-Tetra Parallel"
+MG_Tetra_Parallel = MG_Tetra_HPC
+GHS3DPRL          = MG_Tetra_HPC
 
 #----------------------------
 # Algorithms
 #----------------------------
 
-## Tetrahedron MG-Tetra Parallel 3D algorithm
+## Tetrahedron MG-Tetra_HPC 3D algorithm
 #
-#  It can be created by calling smeshBuilder.Mesh.Tetrahedron( smeshBuilder.MG_Tetra_Parallel )
+#  It can be created by calling smeshBuilder.Mesh.Tetrahedron( smeshBuilder.MG_Tetra_HPC )
 class GHS3DPRL_Algorithm(Mesh_Algorithm):
 
     ## name of the dynamic method in smeshBuilder.Mesh class
@@ -60,7 +61,7 @@ class GHS3DPRL_Algorithm(Mesh_Algorithm):
     meshMethod = "Tetrahedron"
     ## type of algorithm used with helper function in smeshBuilder.Mesh class
     #  @internal
-    algoType   = MG_Tetra_Parallel
+    algoType   = MG_Tetra_HPC
     ## doc string of the method in smeshBuilder.Mesh class
     #  @internal
     docHelper  = "Creates tetrahedron 3D algorithm for volumes"
diff --git a/src/gui/GHS3DPRLPlugin_msg_en.ts b/src/gui/GHS3DPRLPlugin_msg_en.ts
index 2671b82..3422f13 100644
--- a/src/gui/GHS3DPRLPlugin_msg_en.ts
+++ b/src/gui/GHS3DPRLPlugin_msg_en.ts
@@ -5,7 +5,7 @@
     <name>@default</name>
     <message>
         <source>GHS3DPRL_3D_HYPOTHESIS</source>
-        <translation>MG-Tetra Parallel Parameters</translation>
+        <translation>MG-Tetra_HPC Parameters</translation>
     </message>
     <message>
         <source>GHS3DPRL_3D_TITLE</source>
diff --git a/src/gui/GHS3DPRLPlugin_msg_ja.ts b/src/gui/GHS3DPRLPlugin_msg_ja.ts
index bd0803f..2a6502b 100644
--- a/src/gui/GHS3DPRLPlugin_msg_ja.ts
+++ b/src/gui/GHS3DPRLPlugin_msg_ja.ts
@@ -5,7 +5,7 @@
     <name>@default</name>
     <message>
       <source>GHS3DPRL_3D_HYPOTHESIS</source>
-      <translation>MG-Tetra Parallel Parameters</translation>
+      <translation>MG-Tetra_HPC Parameters</translation>
     </message>
     <message>
       <source>GHS3DPRL_3D_TITLE</source>
-- 
2.39.2