From 7ca1783377c671913c104349b01007fd59f5dd53 Mon Sep 17 00:00:00 2001 From: gdd Date: Wed, 25 Apr 2012 12:22:56 +0000 Subject: [PATCH] Remove some prints --- src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx | 41 +++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx index ab19f9c..6b58f37 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx @@ -1079,15 +1079,18 @@ static bool readGMFFile(const char* theFile, SMESHDS_Mesh* theMeshDS = theHelper->GetMeshDS(); int nbInitialNodes = theNodeByGhs3dId.size(); - std::cout << "theNodeByGhs3dId.size(): " << nbInitialNodes << std::endl; int nbMeshNodes = theMeshDS->NbNodes(); - std::cout << "theHelper->GetMesh()->NbNodes(): " << nbMeshNodes << std::endl; const bool isQuadMesh = theHelper->GetMesh()->NbEdges( ORDER_QUADRATIC ) || theHelper->GetMesh()->NbFaces( ORDER_QUADRATIC ) || theHelper->GetMesh()->NbVolumes( ORDER_QUADRATIC ); + +#ifdef _DEBUG_ + std::cout << "theNodeByGhs3dId.size(): " << nbInitialNodes << std::endl; + std::cout << "theHelper->GetMesh()->NbNodes(): " << nbMeshNodes << std::endl; std::cout << "isQuadMesh: " << isQuadMesh << std::endl; +#endif if (theHelper->GetSubShapeID() != 0) theHelper->IsQuadraticSubMesh( theHelper->GetSubShape() ); @@ -1502,8 +1505,10 @@ static bool writeGMFFile(const char* theMesh const SMDS_MeshNode* node = castToNode( nodeIt->next() ); gp_Pnt myPoint(node->X(),node->Y(),node->Z()); nbFoundElems = pntCls->FindElementsByPoint(myPoint, SMDSAbs_Node, foundElems); +#ifdef _DEBUG_ std::cout << "Node at "<X()<<", "<Y()<<", "<Z()<next() ); gp_Pnt myPoint(node->X(),node->Y(),node->Z()); nbFoundElems = pntCls->FindElementsByPoint(myPoint, SMDSAbs_Node, foundElems); +#ifdef _DEBUG_ std::cout << "Nb nodes found : "<::const_iterator n2id = aNodeToGhs3dIdMap.begin(); for ( ; n2id != aNodeToGhs3dIdMap.end(); ++ n2id) @@ -1585,7 +1598,9 @@ static bool writeGMFFile(const char* theMesh } // put nodes to anEnforcedNodeToGhs3dIdMap vector +#ifdef _DEBUG_ std::cout << "anEnforcedNodeToGhs3dIdMap.size(): "<X()); coords.push_back(node->Y()); coords.push_back(node->Z()); +#ifdef _DEBUG_ std::cout << "Node at " << node->X()<<", " <Y()<<", " <Z(); +#endif if (nodesCoords.find(coords) != nodesCoords.end()) { // node already exists in original mesh +#ifdef _DEBUG_ std::cout << " found" << std::endl; +#endif continue; } if (theEnforcedVertices.find(coords) != theEnforcedVertices.end()) { // node already exists in enforced vertices +#ifdef _DEBUG_ std::cout << " found" << std::endl; +#endif continue; } @@ -1657,7 +1678,9 @@ static bool writeGMFFile(const char* theMesh // theOrderedNodes.push_back(existingNode); // } +#ifdef _DEBUG_ std::cout << " not found" << std::endl; +#endif nodesCoords.insert(coords); theOrderedNodes.push_back(node); @@ -1676,24 +1699,32 @@ static bool writeGMFFile(const char* theMesh coords.push_back(node->X()); coords.push_back(node->Y()); coords.push_back(node->Z()); +#ifdef _DEBUG_ std::cout << "Node at " << node->X()<<", " <Y()<<", " <Z(); +#endif // Test if point is inside shape to mesh gp_Pnt myPoint(node->X(),node->Y(),node->Z()); TopAbs_State result = pntCls->GetPointState( myPoint ); if ( result == TopAbs_OUT ) { +#ifdef _DEBUG_ std::cout << " out of volume" << std::endl; +#endif continue; } if (nodesCoords.find(coords) != nodesCoords.end()) { +#ifdef _DEBUG_ std::cout << " found in nodesCoords" << std::endl; +#endif // theRequiredNodes.push_back(node); continue; } if (theEnforcedVertices.find(coords) != theEnforcedVertices.end()) { +#ifdef _DEBUG_ std::cout << " found in theEnforcedVertices" << std::endl; +#endif continue; } @@ -1720,7 +1751,9 @@ static bool writeGMFFile(const char* theMesh // if ( result != TopAbs_IN ) // continue; +#ifdef _DEBUG_ std::cout << " not found" << std::endl; +#endif nodesCoords.insert(coords); // theOrderedNodes.push_back(node); theRequiredNodes.push_back(node); @@ -1800,12 +1833,16 @@ static bool writeGMFFile(const char* theMesh for (int i=0;isecond; +#ifdef _DEBUG_ std::cout << "aNodeGroupByGhs3dId["<