From: eap <eap@opencascade.com>
Date: Fri, 5 Feb 2016 14:59:25 +0000 (+0300)
Subject: 53045: MG-Tetra and MG-Tetra parallel failed on sub-shape #1
X-Git-Tag: V8_0_0rc1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3a27791948143e29d2d838a6e7303b3cd38df4be;p=plugins%2Fghs3dplugin.git

53045: MG-Tetra and MG-Tetra parallel failed on sub-shape #1

fix bug: if a sole enforced vertex is out of the domain, mg-tetra fails
         with a message that *_required.mesh file is missing.
after the fix: mesh is computed OK + a warning that enforced vertices are
         incorrectly defined
---

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
index 0fc1457..20cc2ed 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
@@ -95,6 +95,29 @@ extern "C"
 
 #define HOLE_ID -1
 
+// flags returning state of enforced entities, returned from writeGMFFile
+enum InvalidEnforcedFlags { FLAG_BAD_ENF_VERT = 1,
+                            FLAG_BAD_ENF_NODE = 2,
+                            FLAG_BAD_ENF_EDGE = 4,
+                            FLAG_BAD_ENF_TRIA = 8
+};
+static std::string flagsToErrorStr( int anInvalidEnforcedFlags )
+{
+  std::string str;
+  if ( anInvalidEnforcedFlags != 0 )
+  {
+    if ( anInvalidEnforcedFlags & FLAG_BAD_ENF_VERT )
+      str = "There are enforced vertices incorrectly defined.\n";
+    if ( anInvalidEnforcedFlags & FLAG_BAD_ENF_NODE )
+      str += "There are enforced nodes incorrectly defined.\n";
+    if ( anInvalidEnforcedFlags & FLAG_BAD_ENF_EDGE )
+      str += "There are enforced edge incorrectly defined.\n";
+    if ( anInvalidEnforcedFlags & FLAG_BAD_ENF_TRIA )
+      str += "There are enforced triangles incorrectly defined.\n";
+  }
+  return str;
+}
+
 typedef const list<const SMDS_MeshFace*> TTriaList;
 
 static const char theDomainGroupNamePrefix[] = "Domain_";
@@ -1049,7 +1072,8 @@ static bool writeGMFFile(const char*                                     theMesh
                          GHS3DPlugin_Hypothesis::TIDSortedElemGroupMap & theEnforcedEdges,
                          GHS3DPlugin_Hypothesis::TIDSortedElemGroupMap & theEnforcedTriangles,
                          std::map<std::vector<double>, std::string> &    enfVerticesWithGroup,
-                         GHS3DPlugin_Hypothesis::TGHS3DEnforcedVertexCoordsValues & theEnforcedVertices)
+                         GHS3DPlugin_Hypothesis::TGHS3DEnforcedVertexCoordsValues & theEnforcedVertices,
+                         int &                                           theInvalidEnforcedFlags)
 {
   MESSAGE("writeGMFFile w/o geometry");
   std::string tmpStr;
@@ -1074,7 +1098,8 @@ static bool writeGMFFile(const char*                                     theMesh
     ( SMESH_MeshAlgos::GetElementSearcher(*theMesh->GetMeshDS()));
   
   int nbEnforcedVertices = theEnforcedVertices.size();
-  
+  theInvalidEnforcedFlags = 0;
+
   // count faces
   int nbFaces = theProxyMesh.NbFaces();
   int nbNodes;
@@ -1126,6 +1151,7 @@ static bool writeGMFFile(const char*                                     theMesh
       TopAbs_State result = pntCls->GetPointState( myPoint );
       if ( result == TopAbs_OUT ) {
         isOK = false;
+        theInvalidEnforcedFlags |= FLAG_BAD_ENF_EDGE;
         break;
       }
       aNodeToTopAbs_StateMap.insert( make_pair( node, result ));
@@ -1162,6 +1188,8 @@ static bool writeGMFFile(const char*                                     theMesh
       }
       if (isOK)
         theKeptEnforcedEdges.insert(elem);
+      else
+        theInvalidEnforcedFlags |= FLAG_BAD_ENF_EDGE;
     }
   }
   
@@ -1181,6 +1209,7 @@ static bool writeGMFFile(const char*                                     theMesh
       TopAbs_State result = pntCls->GetPointState( myPoint );
       if ( result == TopAbs_OUT ) {
         isOK = false;
+        theInvalidEnforcedFlags |= FLAG_BAD_ENF_TRIA;
         break;
       }
       aNodeToTopAbs_StateMap.insert( make_pair( node, result ));
@@ -1216,6 +1245,8 @@ static bool writeGMFFile(const char*                                     theMesh
       }
       if (isOK)
         theKeptEnforcedTriangles.insert(elem);
+      else
+        theInvalidEnforcedFlags |= FLAG_BAD_ENF_TRIA;
     }
   }
   
@@ -1344,6 +1375,7 @@ static bool writeGMFFile(const char*                                     theMesh
 #ifdef _DEBUG_
       std::cout << " out of volume" << std::endl;
 #endif
+      theInvalidEnforcedFlags |= FLAG_BAD_ENF_NODE;
       continue;
     }
     
@@ -1409,12 +1441,11 @@ static bool writeGMFFile(const char*                                     theMesh
       gp_Pnt myPoint(x,y,z);
       TopAbs_State result = pntCls->GetPointState( myPoint );
       if ( result == TopAbs_OUT )
-        continue;
-      //if (pntCls->FindElementsByPoint(myPoint, SMDSAbs_Node, foundElems) == 0)
-      //continue;
-
-//       if ( result != TopAbs_IN )
-//         continue;
+      {
+        std::cout << "Warning: enforced vertex at ( " << x << "," << y << "," << z << " ) is out of the meshed domain!!!" << std::endl;
+        theInvalidEnforcedFlags |= FLAG_BAD_ENF_VERT;
+        //continue;
+      }
       std::vector<double> coords;
       coords.push_back(x);
       coords.push_back(y);
@@ -1774,12 +1805,13 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
     //       writeFaces ( aFacesFile, *proxyMesh, theShape, 
     //                    aSmdsToGhs3dIdMap, anEnforcedNodeIdToGhs3dIdMap,
     //                    enforcedEdges, enforcedTriangles ));
+    int anInvalidEnforcedFlags = 0;
     Ok = writeGMFFile(aGMFFileName.ToCString(), aRequiredVerticesFileName.ToCString(), aSolFileName.ToCString(),
                       *proxyMesh, helper,
                       aNodeByGhs3dId, aFaceByGhs3dId, aNodeToGhs3dIdMap,
                       aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId,
                       enforcedNodes, enforcedEdges, enforcedTriangles, /*enforcedQuadrangles,*/
-                      enfVerticesWithGroup, coordsSizeMap);
+                      enfVerticesWithGroup, coordsSizeMap, anInvalidEnforcedFlags);
     //}
 
   // Write aSmdsToGhs3dIdMap to temp file
@@ -1892,9 +1924,10 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
 
   if ( Ok )
   {
+    if ( anInvalidEnforcedFlags )
+      error( COMPERR_WARNING, flagsToErrorStr( anInvalidEnforcedFlags ));
     if ( _removeLogOnSuccess )
       removeFile( aLogFileName );
-
     // if ( _hyp && _hyp->GetToMakeGroupsOfDomains() )
     //   error( COMPERR_WARNING, "'toMakeGroupsOfDomains' is ignored since the mesh is on shape" );
   }
@@ -2076,12 +2109,13 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
       proxyMesh.reset( aQuad2Trias );
     }
 
+    int anInvalidEnforcedFlags = 0;
     Ok = writeGMFFile(aGMFFileName.ToCString(), aRequiredVerticesFileName.ToCString(), aSolFileName.ToCString(),
                       *proxyMesh, *theHelper,
                       aNodeByGhs3dId, aFaceByGhs3dId, aNodeToGhs3dIdMap,
                       aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId,
                       enforcedNodes, enforcedEdges, enforcedTriangles,
-                      enfVerticesWithGroup, coordsSizeMap);
+                      enfVerticesWithGroup, coordsSizeMap, anInvalidEnforcedFlags);
     //}
 
   // -----------------
@@ -2138,6 +2172,8 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
 
   if ( Ok )
   {
+    if ( anInvalidEnforcedFlags )
+      error( COMPERR_WARNING, flagsToErrorStr( anInvalidEnforcedFlags ));
     if ( _removeLogOnSuccess )
       removeFile( aLogFileName );