ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR: SMDS memory improvement, VTK version from Paraview 3.9

Browse Source
This commit is contained in:
prascle 2010-11-29 13:35:09 +00:00
parent fa2966afd4
commit 090c556dd9
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NETGENPlugin/Makefile.am
View File

@ -75,6 +75,7 @@ libNETGENEngine_la_CPPFLAGS = \
$(MED_CXXFLAGS) \
$(GEOM_CXXFLAGS) \
$(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \
$(NETGEN_INCLUDES) \
$(SMESH_CXXFLAGS) \
$(CORBA_CXXFLAGS) \

8
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -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++;

4
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
View File

@ -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;

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -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 ))
{