From: eap <eap@opencascade.com>
Date: Fri, 6 May 2011 07:25:19 +0000 (+0000)
Subject: 0021238: EDF 1817 SMESH: GHS3D on quadratic meshes
X-Git-Tag: V6_3_0~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1a3cae9890acf2a07de40fff8b516bd220132513;p=plugins%2Fghs3dplugin.git

0021238: EDF 1817 SMESH: GHS3D on quadratic meshes
  fix orientation of volumes
---

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
index 1074ac9..72afa56 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
@@ -1178,7 +1178,7 @@ static bool readGMFFile(const char*                     theFile,
 //         case GmfQuadrilaterals:
 //           theHelper->AddFace( node[0], node[1], node[2], node[3] ); break;
         case GmfTetrahedra:
-          theHelper->AddVolume( node[0], node[1], node[2], node[3], /*id =*/0, /*force3d =*/false );
+          theHelper->AddVolume( node[1], node[0], node[2], node[3], /*id =*/0, /*force3d =*/false );
           break;
 //         case GmfHexahedra:
 //           theHelper->AddVolume( node[0], node[3], node[2], node[1],
@@ -1196,14 +1196,6 @@ static bool readGMFFile(const char*                     theFile,
 
   shapeID = theHelper->GetSubShapeID();
   for ( int i = 0; i < nbVertices; ++i ) {
-#ifdef WITH_SMESH_CANCEL_COMPUTE
-    if(theAlgo->computeCanceled()) {
-      GmfCloseMesh(InpMsh);
-      delete [] GMFNode;
-      delete [] nodeAssigne;
-      return false;
-    }
-#endif
     if ( !nodeAssigne[ i+1 ])
       theMeshDS->SetNodeInVolume( GMFNode[ i+1 ], shapeID );
   }