X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Penta_3D.cxx;h=ad6ebc83198609b882539342061257d2b33e4f5d;hb=15549165c3faa2be13dfb2df8676b2bad9e9b64c;hp=e1a4c028fc7de4d22f44e34ae1108dda4aefec48;hpb=8cc5e7af94aaeb9f166c387fb8c3315df7f37ec9;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index e1a4c028f..ad6ebc831 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -60,10 +60,6 @@ using namespace std; typedef map < int, int, less >::iterator \ StdMeshers_IteratorOfDataMapOfIntegerInteger; -//======================================================================= -// -// StdMeshers_Penta_3D -// //======================================================================= //function : StdMeshers_Penta_3D //purpose : @@ -597,17 +593,10 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() // int i, j, ij, ik, i1, i2, aSSID; // - TopoDS_Shell aShell; - TopExp_Explorer aExp; - // SMESH_Mesh* pMesh =GetMesh(); SMESHDS_Mesh* meshDS=pMesh->GetMeshDS(); // - aExp.Init(myShape, TopAbs_SHELL); - for (; aExp.More(); aExp.Next()){ - aShell=TopoDS::Shell(aExp.Current()); - break; - } + int shapeID = meshDS->ShapeToIndex( myShape ); // // 1. Set Node In Volume ik=myISize-1; @@ -618,7 +607,7 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() aSSID=aTN.ShapeSupportID(); if (aSSID==SMESH_Block::ID_NONE) { SMDS_MeshNode* aNode=(SMDS_MeshNode*)aTN.Node(); - meshDS->SetNodeInVolume(aNode, aShell); + meshDS->SetNodeInVolume(aNode, shapeID); } } } @@ -714,7 +703,7 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() default: continue; } - meshDS->SetMeshElementOnShape(aV, aShell); + meshDS->SetMeshElementOnShape(aV, shapeID); } } } @@ -873,7 +862,7 @@ void StdMeshers_Penta_3D::CreateNode(const bool bIsUpperLayer, { myErrorStatus=0; // - int iErr; + // int iErr; double aX, aY, aZ; // gp_Pnt aP;