Salome HOME
23261: [CEA 1695] Patch for updating GHS3DPRLPLUGIN
[plugins/ghs3dprlplugin.git] / src / GHS3DPRLPlugin / GHS3DPRLPlugin_GHS3DPRL.cxx
index cb93731912bed4d270d9656eeb64d97f15efede5..d08bc1fdc191c5cef9878dc35321de6fd1585755 100755 (executable)
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,8 +25,9 @@
 #include "GHS3DPRLPlugin_GHS3DPRL.hxx"
 #include "GHS3DPRLPlugin_Hypothesis.hxx"
 
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
+#include <SMDS_MeshElement.hxx>
+#include <SMDS_MeshNode.hxx>
+#include <SMESH_subMesh.hxx>
 
 #include <TopExp_Explorer.hxx>
 #include <OSD_File.hxx>
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 
+using namespace std;
+
 /* 
-extern "C" {
 #include <med.h>
 //#include <med_config.h>
 #include <med_utils.h>
 //#include <med_misc.h>
 #include <stdlib.h>
-}
 using namespace med_2_2;*/
 
 static void removeFile( const TCollection_AsciiString& fileName )
@@ -81,11 +82,11 @@ GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL(int hypId, int studyId, SMESH_G
   : SMESH_3D_Algo(hypId, studyId, gen)
 {
   MESSAGE("GHS3DPRLPlugin_GHS3DPRL::GHS3DPRLPlugin_GHS3DPRL");
-  _name = "GHS3DPRL_3D";
+  _name = "MG-Tetra Parallel";
   _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type
   _countSubMesh=0;
   _nodeRefNumber=0;
-  _compatibleHypothesis.push_back("GHS3DPRL_Parameters");
+  _compatibleHypothesis.push_back(GHS3DPRLPlugin_Hypothesis::GetHypType());
 }
 
 //=============================================================================
@@ -118,7 +119,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::CheckHypothesis
   theHyp = (*itl); // use only the first hypothesis
 
   string hypName = theHyp->GetName();
-  if (hypName == "GHS3DPRL_Parameters")
+  if (hypName == GHS3DPRLPlugin_Hypothesis::GetHypType())
   {
     _hypothesis = static_cast<const GHS3DPRLPlugin_Hypothesis*> (theHyp);
     ASSERT(_hypothesis);
@@ -159,7 +160,7 @@ static bool writeGHS3DPRLFiles (const TCollection_AsciiString &  GHS3DPRL_In,
    int nbVertices=theMesh->NbNodes();
    int nbFaces=theMesh->NbFaces();        //triangles or quadrangles
    const char* space="  ";
-   const int dummyint=1;                  //nrs,nsd,refnum=1 (for wrap)
+   //const int dummyint=1;                  //nrs,nsd,refnum=1 (for wrap)
 
    // Writing SMESH points into GHS3DPRL File.points
    theFile<<nbVertices<<endl;
@@ -241,32 +242,32 @@ static bool writeGHS3DPRLFiles (const TCollection_AsciiString &  GHS3DPRL_In,
 }
 
 //=======================================================================
-static bool getInt( int & theValue, char * & theLine )
-{
-  char *ptr;
-  theValue = strtol( theLine, &ptr, 10 );
-  if ( ptr == theLine ||
-      // there must not be neither '.' nor ',' nor 'E' ...
-      (*ptr != ' ' && *ptr != '\n' && *ptr != '\0'))
-    return false;
-
-  DUMP( "  " << theValue );
-  theLine = ptr;
-  return true;
-}
+// static bool getInt( int & theValue, char * & theLine )
+// {
+//   char *ptr;
+//   theValue = strtol( theLine, &ptr, 10 );
+//   if ( ptr == theLine ||
+//       // there must not be neither '.' nor ',' nor 'E' ...
+//       (*ptr != ' ' && *ptr != '\n' && *ptr != '\0'))
+//     return false;
+
+//   DUMP( "  " << theValue );
+//   theLine = ptr;
+//   return true;
+// }
 
 //=======================================================================
-static bool getDouble( double & theValue, char * & theLine )
-{
-  char *ptr;
-  theValue = strtod( theLine, &ptr );
-  if ( ptr == theLine )
-    return false;
-
-  DUMP( "   " << theValue );
-  theLine = ptr;
-  return true;
-}
+// static bool getDouble( double & theValue, char * & theLine )
+// {
+//   char *ptr;
+//   theValue = strtod( theLine, &ptr );
+//   if ( ptr == theLine )
+//     return false;
+
+//   DUMP( "   " << theValue );
+//   theLine = ptr;
+//   return true;
+// }
 
 //=======================================================================
 
@@ -275,126 +276,126 @@ static bool getDouble( double & theValue, char * & theLine )
 {  aPtr = fgets( aBuf, GHS3DPRLPlugin_BUFLENGTH - 2, aFile ); aLineNb++; DUMP(endl); }
 
 //=======================================================================
-static bool readResult(FILE *                           theFile,
-                       SMESHDS_Mesh *                   theMesh,
-                       const TopoDS_Shape &             theShape,
-                       map <int,const SMDS_MeshNode*> & theGHS3DPRLIdToNodeMap,
-                       const TCollection_AsciiString &  GHS3DPRL_Out,
-                       int &                            nodeRefNumber)
-{
-  // ---------------------------------
-  // Read generated elements and nodes
-  // ---------------------------------
-
-  cout << "Reading GHS3DPRL output file : " << GHS3DPRL_Out << endl;
-  cout << endl;
-
-  char aBuffer[ GHS3DPRLPlugin_BUFLENGTH ];
-  char * aPtr;
-  int aLineNb = 0;
-  int shapeID = theMesh->ShapeToIndex( theShape );
-
-  int line = 1, EndOfFile = 0, nbElem = 0, nField = 10, nbRef = 0, aGHS3DPRLNodeID = 0;
-  const char * theField;
-
-  vector<const char*> tabField = vector<const char*>(nField);
-  vector<int> tabRef = vector<int>(nField);
-
-  tabField[0] = "MeshVersionFormatted";    tabRef[0] = 0;
-  tabField[1] = "Dimension";               tabRef[1] = 0;
-  tabField[2] = "Vertices";                tabRef[2] = 3;
-  tabField[3] = "Edges";                   tabRef[3] = 2;
-  tabField[4] = "Triangles";               tabRef[4] = 3;
-  tabField[5] = "Quadrilaterals";          tabRef[5] = 4;
-  tabField[6] = "Hexahedra";               tabRef[6] = 8;
-  tabField[7] = "Corners";                 tabRef[7] = 1;
-  tabField[8] = "Ridges";                  tabRef[0] = 1;
-  tabField[9] = "End";                     tabRef[0] = 0;
-
-  nodeRefNumber += theMesh->NbNodes();
-
-  SMDS_NodeIteratorPtr itOnGHS3DPRLInputNode = theMesh->nodesIterator();
-  while ( itOnGHS3DPRLInputNode->more() )
-      theMesh->RemoveNode( itOnGHS3DPRLInputNode->next() );
-
-  while ( EndOfFile == 0  ) {
-      GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );
-      for ( int iField = 0; iField < nField; iField++ ) {
-          stringstream theMessage;
-          theField = tabField[iField];
-          if ( strncmp(aPtr, theField, strlen(theField)) == 0 ) {
-              if ( strcmp(theField, "End") == 0 ) {
-                  EndOfFile = 1;
-                  theMessage << "End of GHS3DPRL output file has been reached";
-              }
-              else {
-                  GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );
-                  line++;
-                  getInt( nbElem, aPtr );
-
-                  if ( strcmp(theField, "MeshVersionFormatted") == 0 )
-                      theMessage << "GHS3DPRL mesh descriptor : " << theField << " " << nbElem;
-                  else if ( strcmp(theField, "Dimension") == 0 )
-                      theMessage << "GHS3DPRL mesh of " << nbElem << "D dimension";
-                  else if ( strcmp(theField, "Vertices")       == 0 ||
-                            strcmp(theField, "Edges")          == 0 ||
-                            strcmp(theField, "Quadrilaterals") == 0 ||
-                            strcmp(theField, "Hexahedra")      == 0 ) {
-                      nbRef = tabRef[iField];
-                      GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );           // read blank line
-
-                      if ( strcmp(theField, "Vertices") == 0 ) {
-                          int aGHS3DPRLID;
-                          vector<double> coord = vector<double>(nbRef);
-                          SMDS_MeshNode * aGHS3DPRLNode;
-
-                          for ( int iElem = 0; iElem < nbElem; iElem++ ) {
-                              aGHS3DPRLID = iElem + 1 + nodeRefNumber;
-                              GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );   // read file lines
-                              for ( int iCoord = 0; iCoord < 3; iCoord++ )
-                                  getDouble ( coord[ iCoord ], aPtr );
-                              aGHS3DPRLNode = theMesh->AddNode(coord[0], coord[1], coord[2]);
-                              theMesh->SetNodeInVolume( aGHS3DPRLNode, shapeID );
-                              theGHS3DPRLIdToNodeMap[ aGHS3DPRLID ] = aGHS3DPRLNode;
-                          }
-                      }
-                      else {
-                          vector<const SMDS_MeshNode*> node = vector<const SMDS_MeshNode*>(nbRef);
-                          SMDS_MeshElement* aGHS3DPRLElement;
-                          map <int,const SMDS_MeshNode*>::iterator itOnGHS3DPRLNode;
-
-                          for ( int iElem = 0; iElem < nbElem; iElem++ ) {
-                              GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );   // read file lines
-                              for ( int iRef = 0; iRef < nbRef; iRef++ ) {
-                                  getInt ( aGHS3DPRLNodeID, aPtr );                         // read nbRef aGHS3DPRLNodeID
-                                  aGHS3DPRLNodeID += nodeRefNumber;
-                                  itOnGHS3DPRLNode = theGHS3DPRLIdToNodeMap.find( aGHS3DPRLNodeID );
-                                  node[ iRef ] = itOnGHS3DPRLNode->second;
-                              }
-
-                              if ( strcmp(theField, "Edges") == 0 )                        // create an element
-                                  aGHS3DPRLElement = theMesh->AddEdge( node[0], node[1] );
-                              else if ( strcmp(theField, "Quadrilaterals") == 0 )
-                                  aGHS3DPRLElement = theMesh->AddFace( node[0], node[1], node[2], node[3] );
-                              else if ( strcmp(theField, "Hexahedra") == 0 )
-                                  aGHS3DPRLElement = theMesh->AddVolume( node[0], node[1], node[2], node[3], node[4], node[5], node[6], node[7] );
-
-                              theMesh->SetMeshElementOnShape( aGHS3DPRLElement, shapeID );
-                          }
-                      }
-                      theMessage << nbElem << " " << theField << " created";
-                  }
-              }
-              if ( theMessage.str().size() != 0 ) {
-                  cout << theMessage.str() << endl;
-                  break;
-              }
-          }
-      }
-  }
-  cout << endl;
-  return true;
-}
+// static bool readResult(FILE *                           theFile,
+//                        SMESHDS_Mesh *                   theMesh,
+//                        const TopoDS_Shape &             theShape,
+//                        map <int,const SMDS_MeshNode*> & theGHS3DPRLIdToNodeMap,
+//                        const TCollection_AsciiString &  GHS3DPRL_Out,
+//                        int &                            nodeRefNumber)
+// {
+//   // ---------------------------------
+//   // Read generated elements and nodes
+//   // ---------------------------------
+
+//   cout << "Reading GHS3DPRL output file : " << GHS3DPRL_Out << endl;
+//   cout << endl;
+
+//   char aBuffer[ GHS3DPRLPlugin_BUFLENGTH ];
+//   char * aPtr;
+//   int aLineNb = 0;
+//   int shapeID = theMesh->ShapeToIndex( theShape );
+
+//   int line = 1, EndOfFile = 0, nbElem = 0, nField = 10, nbRef = 0, aGHS3DPRLNodeID = 0;
+//   const char * theField;
+
+//   vector<const char*> tabField = vector<const char*>(nField);
+//   vector<int> tabRef = vector<int>(nField);
+
+//   tabField[0] = "MeshVersionFormatted";    tabRef[0] = 0;
+//   tabField[1] = "Dimension";               tabRef[1] = 0;
+//   tabField[2] = "Vertices";                tabRef[2] = 3;
+//   tabField[3] = "Edges";                   tabRef[3] = 2;
+//   tabField[4] = "Triangles";               tabRef[4] = 3;
+//   tabField[5] = "Quadrilaterals";          tabRef[5] = 4;
+//   tabField[6] = "Hexahedra";               tabRef[6] = 8;
+//   tabField[7] = "Corners";                 tabRef[7] = 1;
+//   tabField[8] = "Ridges";                  tabRef[0] = 1;
+//   tabField[9] = "End";                     tabRef[0] = 0;
+
+//   nodeRefNumber += theMesh->NbNodes();
+
+//   SMDS_NodeIteratorPtr itOnGHS3DPRLInputNode = theMesh->nodesIterator();
+//   while ( itOnGHS3DPRLInputNode->more() )
+//       theMesh->RemoveNode( itOnGHS3DPRLInputNode->next() );
+
+//   while ( EndOfFile == 0  ) {
+//       GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );
+//       for ( int iField = 0; iField < nField; iField++ ) {
+//           stringstream theMessage;
+//           theField = tabField[iField];
+//           if ( strncmp(aPtr, theField, strlen(theField)) == 0 ) {
+//               if ( strcmp(theField, "End") == 0 ) {
+//                   EndOfFile = 1;
+//                   theMessage << "End of GHS3DPRL output file has been reached";
+//               }
+//               else {
+//                   GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );
+//                   line++;
+//                   getInt( nbElem, aPtr );
+
+//                   if ( strcmp(theField, "MeshVersionFormatted") == 0 )
+//                       theMessage << "GHS3DPRL mesh descriptor : " << theField << " " << nbElem;
+//                   else if ( strcmp(theField, "Dimension") == 0 )
+//                       theMessage << "GHS3DPRL mesh of " << nbElem << "D dimension";
+//                   else if ( strcmp(theField, "Vertices")       == 0 ||
+//                             strcmp(theField, "Edges")          == 0 ||
+//                             strcmp(theField, "Quadrilaterals") == 0 ||
+//                             strcmp(theField, "Hexahedra")      == 0 ) {
+//                       nbRef = tabRef[iField];
+//                       GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );           // read blank line
+
+//                       if ( strcmp(theField, "Vertices") == 0 ) {
+//                           int aGHS3DPRLID;
+//                           vector<double> coord = vector<double>(nbRef);
+//                           SMDS_MeshNode * aGHS3DPRLNode;
+
+//                           for ( int iElem = 0; iElem < nbElem; iElem++ ) {
+//                               aGHS3DPRLID = iElem + 1 + nodeRefNumber;
+//                               GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );   // read file lines
+//                               for ( int iCoord = 0; iCoord < 3; iCoord++ )
+//                                   getDouble ( coord[ iCoord ], aPtr );
+//                               aGHS3DPRLNode = theMesh->AddNode(coord[0], coord[1], coord[2]);
+//                               theMesh->SetNodeInVolume( aGHS3DPRLNode, shapeID );
+//                               theGHS3DPRLIdToNodeMap[ aGHS3DPRLID ] = aGHS3DPRLNode;
+//                           }
+//                       }
+//                       else {
+//                           vector<const SMDS_MeshNode*> node = vector<const SMDS_MeshNode*>(nbRef);
+//                           SMDS_MeshElement* aGHS3DPRLElement;
+//                           map <int,const SMDS_MeshNode*>::iterator itOnGHS3DPRLNode;
+
+//                           for ( int iElem = 0; iElem < nbElem; iElem++ ) {
+//                               GHS3DPRLPlugin_ReadLine( aPtr, aBuffer, theFile, aLineNb );   // read file lines
+//                               for ( int iRef = 0; iRef < nbRef; iRef++ ) {
+//                                   getInt ( aGHS3DPRLNodeID, aPtr );                         // read nbRef aGHS3DPRLNodeID
+//                                   aGHS3DPRLNodeID += nodeRefNumber;
+//                                   itOnGHS3DPRLNode = theGHS3DPRLIdToNodeMap.find( aGHS3DPRLNodeID );
+//                                   node[ iRef ] = itOnGHS3DPRLNode->second;
+//                               }
+
+//                               if ( strcmp(theField, "Edges") == 0 )                        // create an element
+//                                   aGHS3DPRLElement = theMesh->AddEdge( node[0], node[1] );
+//                               else if ( strcmp(theField, "Quadrilaterals") == 0 )
+//                                   aGHS3DPRLElement = theMesh->AddFace( node[0], node[1], node[2], node[3] );
+//                               else if ( strcmp(theField, "Hexahedra") == 0 )
+//                                   aGHS3DPRLElement = theMesh->AddVolume( node[0], node[1], node[2], node[3], node[4], node[5], node[6], node[7] );
+
+//                               theMesh->SetMeshElementOnShape( aGHS3DPRLElement, shapeID );
+//                           }
+//                       }
+//                       theMessage << nbElem << " " << theField << " created";
+//                   }
+//               }
+//               if ( theMessage.str().size() != 0 ) {
+//                   cout << theMessage.str() << endl;
+//                   break;
+//               }
+//           }
+//       }
+//   }
+//   cout << endl;
+//   return true;
+// }
 
 //=============================================================================
 // Pass parameters to GHS3DPRL
@@ -406,7 +407,10 @@ void GHS3DPRLPlugin_GHS3DPRL::SetParameters(const GHS3DPRLPlugin_Hypothesis* hyp
     _NbPart = hyp->GetNbPart();
     _KeepFiles = hyp->GetKeepFiles();
     _Background = hyp->GetBackground();
-    _ToMeshHoles = hyp->GetToMeshHoles();
+    _ToMergeSubdomains = hyp->GetToMergeSubdomains();
+    _ToTagSubdomains = hyp->GetToTagSubdomains();
+    _ToOutputInterfaces = hyp->GetToOutputInterfaces();
+    _ToDiscardSubdomains = hyp->GetToDiscardSubdomains();
   }
 }
 
@@ -439,9 +443,171 @@ static TCollection_AsciiString getTmpDir()
 }
 
 //=============================================================================
-// Here we are going to use the GHS3DPRL mesher
+// 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)
+{
+   bool Ok=false;
+   TCollection_AsciiString pluginerror("ghs3dprl: ");
+   SMESHDS_Mesh* meshDS = theMesh.GetMeshDS();
+   //cout<<"GetMeshDS done\n";
+   if (_countSubMesh==0){
+      MESSAGE("GHS3DPRLPlugin_GHS3DPRL::Compute for tetra-hpc");
+      _countTotal=0;
+      TopExp_Explorer expf(meshDS->ShapeToMesh(), TopAbs_SOLID);
+      for ( ; expf.More(); expf.Next() ) _countTotal++;
+   }
+   _countSubMesh++;
+   //cout<<"Compute _countSubMesh "<<_countSubMesh<<endl;
+   //no stuff if multiples submesh, multiple call compute
+   //mesh all in one pass tepal (the last)
+   if (_countSubMesh != _countTotal ) return true;
+
+   //stuff on last call 
+   if (_hypothesis==NULL){
+      pluginerror += "No existing parameters/hypothesis for GHS3DPRL";
+      cout <<"\n"<<pluginerror<<"\n\n";
+      error(COMPERR_ALGO_FAILED, pluginerror.ToCString() );
+      return false;
+   }
+   SetParameters(_hypothesis);
+   cout << "\n" << _name << " parameters :\n" << endl;
+   cout << "     generic path/name of MED Files = " << _MEDName << endl;
+   cout << "     number of partitions = " << _NbPart << endl;
+   cout << "     merge subdomains = " << _ToMergeSubdomains << endl;
+   cout << "     tag subdomains = " << _ToTagSubdomains << endl;
+   cout << "     output interfaces = " << _ToOutputInterfaces << endl;
+   cout << "     discard dubdomains = " << _ToDiscardSubdomains << endl;
+   cout << "     keep intermediates files (from tetra-hpc) = " << _KeepFiles << endl;
+   cout << "     background (from tetra-hpc) = " << _Background << "\n\n";
+
+      //string tmpDir=getTmpDir_new();
+      TCollection_AsciiString
+         tmpDir=getTmpDir(),
+         GHS3DPRL_In,GHS3DPRL_Out,GHS3DPRL_Outxml,
+         run_GHS3DPRL("tetrahpc2med "),rm("rm -f "),run_nokeep_files,
+         NbPart,fileskinmed(""),fileskinmesh(""),path,casenamemed;  //_MEDName.c_str());
+
+      casenamemed += (char *)_MEDName.c_str();
+      int n=casenamemed.SearchFromEnd('/');
+      if (n>0) {
+         path=casenamemed.SubString(1,n);
+         casenamemed=casenamemed.SubString(n+1,casenamemed.Length()); 
+      }
+      else
+         path=tmpDir;
+
+      if (casenamemed.Length()>20){
+         casenamemed=casenamemed.SubString(1,20);
+         cerr<<"MEDName truncated (no more 20 characters) = "<<casenamemed<<endl;
+      }
+      cout<<"path="<<path<<endl;
+      cout<<"casenamemed="<<casenamemed<<endl;
+
+      map <int,int> aSmdsToGHS3DPRLIdMap;
+      map <int,const SMDS_MeshNode*> aGHS3DPRLIdToNodeMap;
+      GHS3DPRL_In = path + "GHS3DPRL";
+      GHS3DPRL_Out = path + casenamemed;
+      GHS3DPRL_Outxml = path + casenamemed + ".xml"; //master file
+      NbPart=_NbPart;
+      //tepal2med --casename=/home/whoami/tmp/GHS3DPRL --number=5 --medname=DOMAIN 
+      //          --limitswap=1000 --verbose=0 --test=no --menu=no --launchtepal=yes;
+      
+      run_GHS3DPRL = run_GHS3DPRL +
+                     " --casename=" + GHS3DPRL_In + 
+                     " --number=" + NbPart + 
+                     " --medname=" + GHS3DPRL_Out +
+                     " --launchtetra=yes";
+      //no more meshhole option
+      //if (_ToMeshHoles) run_GHS3DPRL += " --meshholes=yes"; else run_GHS3DPRL += " --meshholes=no";
+      //if (_ToMergeSubdomains) run_GHS3DPRL += " --merge_subdomains=yes"; else run_GHS3DPRL += " --merge_subdomains=no";
+      //if (_ToTagSubdomains) run_GHS3DPRL += " --tag_subdomains=yes"; else run_GHS3DPRL += " --tag_subdomains=no";
+      //if (_ToOutputInterfaces) run_GHS3DPRL += " --output_interfaces=yes"; else run_GHS3DPRL += " --output_interfaces=no";
+      //if (_ToDiscardSubdomains) run_GHS3DPRL += " --discard_subdomains=yes"; else run_GHS3DPRL += " --discard_subdomains=no";
+      //if (_Background) run_GHS3DPRL += " --background=yes"; else run_GHS3DPRL += " --background=no";
+      run_nokeep_files = rm +GHS3DPRL_In + "* " + path + "tetrahpc.log";
+      system( run_nokeep_files.ToCString() ); //clean files
+      run_nokeep_files = rm + GHS3DPRL_In + "* ";
+
+      cout<<"GHS3DPRL command : "<<run_GHS3DPRL.ToCString()<<endl;
+      fileskinmesh=path + "GHS3DPRL.mesh";
+      cout<<"Write input file for tetra_hpc.exe "<<fileskinmesh<<"...";
+      GHS3DPRL_Out = path + casenamemed;
+      removeFile( GHS3DPRL_Outxml ); //only the master xml file
+      //Ok=writeGHS3DPRLFiles(GHS3DPRL_In, meshDS, aSmdsToGHS3DPRLIdMap, aGHS3DPRLIdToNodeMap);
+      bool toCreateGroups = false;
+      theMesh.ExportGMF(fileskinmesh.ToCString(), meshDS, toCreateGroups );
+      cout<<" ...done\n";
+      //else {
+      //   cout<<" ...NOT done\n";
+      //   pluginerror = pluginerror + "problem writing input tepal files " + GHS3DPRL_In + ".mesh";
+
+      //Ecriture dans un fichier MED ?v2.? meme si not Ok
+      //create empty file -> avoid warning message
+      //med_idt fid=MEDouvrir((const char *)fileskinmed.ToCString(),MED_CREATION);
+      //med_err ret=MEDfermer(fid);
+      //fileskinmed=fileskinmed + "cp /home/wambeke/empty.med "+ path + "GHS3DPRL_skin.med";
+      //system( fileskinmed.ToCString() );
+      fileskinmed=path + "GHS3DPRL_skin.med";
+      cout<<"Write file "<<fileskinmed<<"...";
+      theMesh.ExportMED(fileskinmed.ToCString(),"SKIN_INITIAL",true,1);
+      cout<<" ...done\n";
+
+      /*
+      if (!Ok) {
+         error(COMPERR_ALGO_FAILED, pluginerror.ToCString());
+         return false; //pb abandonne
+      }*/
+
+      //sometimes it is better to wait flushing files on slow filesystem...
+      system( "sleep 3" );
+      system( run_GHS3DPRL.ToCString() );
+      system( "sleep 3" );
+
+      //cout<<"!!!reprise plugin!!!"<<endl;
+
+      if (_Background) {
+         pluginerror = pluginerror + "backgrounding... plugin is not waiting for output files "+ casenamemed + "_*.med";
+         cout<<pluginerror<<endl;
+         error(COMPERR_ALGO_FAILED, pluginerror.ToCString());
+         return false; //but it is not a problem but if true my message is overwritten
+         //return true; //but it is not a problem, 
+      }
+
+      // read a result, GHS3DPRL_Out is the name of master file (previous xml format)
+      FILE * aResultFile = fopen( GHS3DPRL_Outxml.ToCString(), "r" );
+      if (aResultFile){
+          //Ok = readResult( aResultFile, meshDS, theShape, aGHS3DPRLIdToNodeMap, GHS3DPRL_Out, _nodeRefNumber );
+          Ok = true;
+          Ok = false; //but it is not a problem but if true my message is overwritten
+          fclose(aResultFile);
+          cout<<"GHS3DPRL OK output master file "<<casenamemed<<".xml exist !\n\n";
+          pluginerror = pluginerror + "new tetraedra not in memory, but stored in files "+ casenamemed + "_*.med";
+          cout<<pluginerror<<endl;
+          error(COMPERR_ALGO_FAILED, pluginerror.ToCString());
+          if (!_KeepFiles) system( run_nokeep_files.ToCString() );
+      }
+      else{
+          Ok = false; //it is a problem AND my message is NOT overwritten
+          pluginerror = pluginerror + "output master file " + casenamemed + ".xml do not exist";
+          cout<<pluginerror<<endl;
+          error(COMPERR_ALGO_FAILED, pluginerror.ToCString() );
+          cout<<"GHS3DPRL KO output files "<<GHS3DPRL_Out<<" do not exist ! see intermediates files keeped:\n";
+          TCollection_AsciiString run_list_files("ls -alt ");
+          run_list_files +=  GHS3DPRL_Out + "* " + GHS3DPRL_In + "* " + path + "tetrahpc.log";
+          system( run_list_files.ToCString() );
+          cout<<endl;
+      }
+      _countSubMesh=0;
+
+
+    return Ok;
+}
+
+//=============================================================================
+// Here we are going to use the GHS3DPRL mesher (old obsolescent version tepal in v1 & v2 (before 2014))
+bool GHS3DPRLPlugin_GHS3DPRL::ComputeForTepal(SMESH_Mesh& theMesh,
+                                     const TopoDS_Shape& theShape)
 {
    bool Ok;
    TCollection_AsciiString pluginerror("ghs3dprl: ");
@@ -470,7 +636,8 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
    cout << "\n" << _name << " parameters :\n" << endl;
    cout << "     generic path/name of MED Files = " << _MEDName << endl;
    cout << "     number of partitions = " << _NbPart << endl;
-   cout << "     mesh holes = " << _ToMeshHoles << endl;
+   //cout << "     mesh holes = " << _ToMeshHoles << endl;
+   cout << "     mesh holes = " << 1 << endl;
    cout << "     keep intermediates files (from tepal) = " << _KeepFiles << endl;
    cout << "     background (from tepal) = " << _Background << "\n\n";
 
@@ -511,7 +678,8 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
                      " --number=" + NbPart + 
                      " --medname=" + GHS3DPRL_Out +
                      " --launchtepal=yes";
-      if (_ToMeshHoles) run_GHS3DPRL += " --meshholes=yes"; else run_GHS3DPRL += " --meshholes=no";
+      //if (_ToMeshHoles) run_GHS3DPRL += " --meshholes=yes"; else run_GHS3DPRL += " --meshholes=no";
+      if (1) run_GHS3DPRL += " --meshholes=yes"; else run_GHS3DPRL += " --meshholes=no";
       if (_Background) run_GHS3DPRL += " --background=yes"; else run_GHS3DPRL += " --background=no";
       run_nokeep_files = rm +GHS3DPRL_In + "* " + path + "tepal.log";
       system( run_nokeep_files.ToCString() ); //clean files
@@ -567,7 +735,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
           Ok = false; //but it is not a problem but if true my message is overwritten
           fclose(aResultFile);
           cout<<"GHS3DPRL OK output master file "<<casenamemed<<".xml exist !\n\n";
-          pluginerror = pluginerror + "new tetaedra not in memory, but stored in files "+ casenamemed + "_*.med";
+          pluginerror = pluginerror + "new tetraedra not in memory, but stored in files "+ casenamemed + "_*.med";
           cout<<pluginerror<<endl;
           error(COMPERR_ALGO_FAILED, pluginerror.ToCString());
           if (!_KeepFiles) system( run_nokeep_files.ToCString() );
@@ -589,7 +757,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
     return Ok;
    /*pid_t pid = fork();
    if (pid > 0) {
-      //Processus père
+      //Processus pere
       cout<<"le pere est la\n";
       system("echo le pere > lepere.tmp");
       system("sleep 10");
@@ -600,7 +768,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
    } else if (pid == 0) {
       //Processus fils
       cout<<"le fils est la\n";
-      //On rend le fils indépendant de tout terminal
+      //On rend le fils independant de tout terminal
       setsid();
       system("sleep 20");
       system("echo le fils > lefils.tmp");
@@ -615,39 +783,14 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh,
    }*/
 }
 
-//=============================================================================
-ostream & GHS3DPRLPlugin_GHS3DPRL::SaveTo(ostream & save)
-{
-  return save;
-}
-
-//=============================================================================
-istream & GHS3DPRLPlugin_GHS3DPRL::LoadFrom(istream & load)
-{
-  return load;
-}
-
-//=============================================================================
-ostream & operator << (ostream & save, GHS3DPRLPlugin_GHS3DPRL & hyp)
-{
-  return hyp.SaveTo( save );
-}
-
-//=============================================================================
-istream & operator >> (istream & load, GHS3DPRLPlugin_GHS3DPRL & hyp)
-{
-  return hyp.LoadFrom( load );
-}
-
-
 //=============================================================================
 /*!
  *  
  */
 //=============================================================================
 bool GHS3DPRLPlugin_GHS3DPRL::Evaluate(SMESH_Mesh& aMesh,
-                                      const TopoDS_Shape& aShape,
-                                      MapShapeNbElems& aResMap)
+                                       const TopoDS_Shape& aShape,
+                                       MapShapeNbElems& aResMap)
 {
   int nbtri = 0, nbqua = 0;
   double fullArea = 0.0;
@@ -658,7 +801,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::Evaluate(SMESH_Mesh& aMesh,
     if( anIt==aResMap.end() ) {
       SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
       smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,
-                                           "Submesh can not be evaluated",this));
+                                            "Submesh can not be evaluated",this));
       return false;
     }
     std::vector<int> aVec = (*anIt).second;