Merge multi-study removal branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fe89055200e35b38f4bc4d1549e866a7103bbdc..3acbb51c244214aed81a04f6634129fb38451548 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html b/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html
index de6db6a6c6d55ea90befc28cce87b52271f01395..b52879b324cd1a20463b652cf748696954337439 100755 (executable)
--- a/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2016  CEA/DEN, EDF R&amp;D<br>
+      Copyright &copy; 2007-2017  CEA/DEN, EDF R&amp;D<br>
     </li>
   </ul>
 </div>

diff --git a/resources/GHS3DPRLPlugin.xml b/resources/GHS3DPRLPlugin.xml
index 9017cef1d6e6957f7ef1a1ea8fe56cb55f973681..292694cde193fd0b93bd961adbcd4bfd08bde2a6 100755 (executable)
--- a/resources/GHS3DPRLPlugin.xml
+++ b/resources/GHS3DPRLPlugin.xml
@@ -46,6 +46,7 @@
                input    ="TRIA"
                output   ="TETRA"
                need-hyp ="true"
+              need-geom="false"
                dim      ="3">
       <python-wrap>
         <algo>MG-Tetra Parallel=Tetrahedron(algo=smeshBuilder.MG_Tetra_Parallel)</algo>

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
index 946cb7e23cb96f746df431edbba7009e500ab5db..271c52c47b4a172974bc0fa5f18bd27612684fa4 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx
@@ -30,6 +30,7 @@
 #include <SMESH_Gen.hxx>
 #include <SMESH_TypeDefs.hxx>
 #include <SMESH_subMesh.hxx>
+#include <SMESH_MesherHelper.hxx>
 
 #include "utilities.h"
 
@@ -72,6 +73,7 @@ GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL(int hypId, SMESH_Gen* gen)
   _countSubMesh=0;
   _nodeRefNumber=0;
   _compatibleHypothesis.push_back(GHS3DPRLPlugin_Hypothesis::GetHypType());
+  _requireShape=false;
 }
 
 //=============================================================================
@@ -206,10 +208,22 @@ static void exportGMF(MG_TetraHPC_API*    theTetraInput,
 // Here we are going to use the GHS3DPRL mesher for tetra-hpc (formerly tepal in v3 (2014))
 bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh&         theMesh,
                                       const TopoDS_Shape& theShape)
+{
+  SMESH_MesherHelper helper( theMesh );
+  bool ok = Compute( theMesh, &helper );
+  return ok;
+}
+
+//=============================================================================
+// Here we are going to use the GHS3DPRL mesher for tetra-hpc (formerly tepal in v3 (2014))
+bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh&         theMesh,
+                                      SMESH_MesherHelper* theHelper)
 {
   bool Ok=false;
   TCollection_AsciiString pluginerror("ghs3dprl: ");
   SMESHDS_Mesh* meshDS = theMesh.GetMeshDS();
+  if ( theMesh.NbTriangles() == 0 )
+    return error( COMPERR_BAD_INPUT_MESH, "No triangles in the mesh" );
 
   if (_hypothesis==NULL){
     pluginerror += "No existing parameters/hypothesis for GHS3DPRL";

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
index bbef999038754e6490e7b70acfac4ec39e0b9d99..8077e5e0fea8bf983339dff7b7a6c43b03b70817 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.hxx
@@ -49,6 +49,8 @@ public:
   virtual bool Compute(SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape);
 
+  virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper);
+
   virtual bool Evaluate(SMESH_Mesh&         aMesh,
                         const TopoDS_Shape& aShape,
                         MapShapeNbElems&    aResMap);

diff --git a/src/gui/GHS3DPRLPlugin_msg_ja.ts b/src/gui/GHS3DPRLPlugin_msg_ja.ts
index 2a6502bcc6d809bd928c7c74515ce58ad356ada0..bd0803fe5a4b7b1306fdf6f0bb9340f9db5ccd83 100644 (file)
--- 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_HPC Parameters</translation>
+      <translation>MG-Tetra Parallel Parameters</translation>
     </message>
     <message>
       <source>GHS3DPRL_3D_TITLE</source>