PR: SMDS memory improvement, VTK version from Paraview 3.9

diff --git a/src/NETGENPlugin/Makefile.am b/src/NETGENPlugin/Makefile.am
index 235d9ccdf90763af544837e2b4de5b0de5b9d64f..4d7ea9a60f08f9b6e4a11e943d1ed7cbab2cff6e 100644 (file)
--- a/src/NETGENPlugin/Makefile.am
+++ b/src/NETGENPlugin/Makefile.am
@@ -75,6 +75,7 @@ libNETGENEngine_la_CPPFLAGS = \
        $(MED_CXXFLAGS) \
        $(GEOM_CXXFLAGS) \
        $(CAS_CPPFLAGS) \
+        $(VTK_INCLUDES) \
        $(NETGEN_INCLUDES) \
        $(SMESH_CXXFLAGS) \
        $(CORBA_CXXFLAGS) \

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index d2f917704731f21846b935ff4dfbf11eb92323b2..e44b2cc2292782174e8d36eccfd390c2424ddfa4 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -601,9 +601,9 @@ bool NETGENPlugin_Mesher::fillNgMesh(const netgen::OCCGeometry&     occgeom,
           const SMDS_MeshNode* node = f->GetNode( i ), * inFaceNode=0;
 
           // get node UV on face
-          int shapeID = node->GetPosition()->GetShapeId();
+          int shapeID = node->getshapeId();
           if ( helper.IsSeamShape( shapeID ))
-            if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->GetPosition()->GetShapeId() ))
+            if ( helper.IsSeamShape( f->GetNodeWrap( i+1 )->getshapeId() ))
               inFaceNode = f->GetNodeWrap( i-1 );
             else 
               inFaceNode = f->GetNodeWrap( i+1 );
@@ -2127,7 +2127,7 @@ NETGENPlugin_Mesher::readErrors(const vector<const SMDS_MeshNode* >& nodeVec)
          strncmp( file, badEdgeStr, badEdgeStrLen ) == 0 &&
          two[0] < nodeVec.size() && two[1] < nodeVec.size())
     {
-      err->myBadElements.push_back( new SMDS_MeshEdge( nodeVec[ two[0]], nodeVec[ two[1]] ));
+      err->myBadElements.push_back( new SMDS_LinearEdge( nodeVec[ two[0]], nodeVec[ two[1]] ));
       file += badEdgeStrLen;
     }
     else if ( strncmp( file, "Intersecting: ", 14 ) == 0 )
@@ -2355,7 +2355,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems
           {
             int nbDblNodes = 0;
             for ( int i = 0; i < nbNodes; ++i )
-              nbDblNodes += isInternalShape( f->GetNode(i)->GetPosition()->GetShapeId() );
+              nbDblNodes += isInternalShape( f->GetNode(i)->getshapeId() );
             if ( nbDblNodes )
               suspectFaces[ nbDblNodes < 2 ].push_back( f );
             nbSuspectFaces++;

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 99e71a7df3df239ff69244a3329638ff356e2614..75339490d525b2222ac7529b4883eb0ec99b497e 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -226,12 +226,12 @@ static TError AddSegmentsToMesh(netgen::Mesh&                    ngMesh,
     {
       // Add the first point of a segment
       const SMDS_MeshNode * n = uvPtVec[ i ].node;
-      const int posShapeID = n->GetPosition()->GetShapeId();
+      const int posShapeID = n->getshapeId();
       bool onVertex = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
 
       // skip nodes on degenerated edges
       if ( helper.IsDegenShape( posShapeID ) &&
-           helper.IsDegenShape( uvPtVec[ i+1 ].node->GetPosition()->GetShapeId() ))
+           helper.IsDegenShape( uvPtVec[ i+1 ].node->getshapeId() ))
         continue;
 
       int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1;

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index fb0a1bd403f17750fcde4c056d740597f85c42f8..ef2d18dcd83e97d204032a3f30a0a53d24c18dc1 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -254,7 +254,7 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh&         aMesh,
           for ( int iN = 0; iN < 3; ++iN )
           {
             const SMDS_MeshNode* node = trias[i]->GetNode( iN );
-            int shapeID = node->GetPosition()->GetShapeId();
+            int shapeID = node->getshapeId();
             if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_EDGE &&
                  helper.IsDegenShape( shapeID ))
             {