X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Penta_3D.cxx;h=0223a7a074cb9b2852fb11bc345510b3fbb8cc21;hp=69485a746eadeef7daf42fe8cceec2970b74ed44;hb=88141f757b048eaa5aae0be49faaf274448bbcaf;hpb=c98d9fcd7f02c1f1f5c24dd3e709ed75228d66c4 diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 69485a746..0223a7a07 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH StdMeshers_Penta_3D implementaion of SMESH idl descriptions +// SMESH StdMeshers_Penta_3D implementation of SMESH idl descriptions // File : StdMeshers_Penta_3D.cxx // Module : SMESH // @@ -33,6 +33,7 @@ #include "SMDS_MeshElement.hxx" #include "SMDS_VolumeOfNodes.hxx" #include "SMDS_VolumeTool.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" #include "SMESH_Comment.hxx" #include "SMESH_Mesh.hxx" @@ -95,8 +96,6 @@ StdMeshers_Penta_3D::~StdMeshers_Penta_3D() bool StdMeshers_Penta_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) { - MESSAGE("StdMeshers_Penta_3D::Compute()"); - // bool bOK=false; // myShape=aShape; @@ -360,7 +359,7 @@ void StdMeshers_Penta_3D::MakeNodes() // set XYZ on horizontal edges and get node columns of faces: // 2 columns for each face, between which a base node is located vector* nColumns[8]; - double ratio[ NB_WALL_FACES ]; // base node position between columns [0.-1.] + double ratio[ NB_WALL_FACES ] = {0,0,0,0}; // base node position between columns [0.-1.] if ( createNode ) { for ( k = 0; k < NB_WALL_FACES ; ++k ) { ratio[ k ] = SetHorizEdgeXYZ (aBNXYZ, wallFaceID[ k ], @@ -422,10 +421,10 @@ void StdMeshers_Penta_3D::MakeNodes() aZ=(double)i/(double)(myISize-1); aCoords.SetCoord(aX, aY, aZ); // - // suporting shape ID + // supporting shape ID ShapeSupportID(bIsUpperLayer, aBNSSID, aSSID); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeNodes() "); + MESSAGE("StdMeshers_Penta_3D::MakeNodes() pb"); return; } // @@ -472,7 +471,7 @@ void StdMeshers_Penta_3D::MakeNodes() } } if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeNodes() "); + MESSAGE("StdMeshers_Penta_3D::MakeNodes() err"); return; } // @@ -575,7 +574,7 @@ double StdMeshers_Penta_3D::SetHorizEdgeXYZ(const gp_XYZ& aBase SMESH_Block::GetFaceEdgesIDs( aFaceID, edgeVec ); // int coord = SMESH_Block::GetCoordIndOnEdge( edgeVec[ BASE ] ); - bool isForward = myBlock.IsForwadEdge( edgeVec[ BASE ] ); + bool isForward = myBlock.IsForwardEdge( edgeVec[ BASE ] ); double param = aBaseNodeParams.Coord( coord ); if ( !isForward) @@ -684,7 +683,7 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() aID0 = pNode->GetID(); aJ[k] = GetIndexOnLayer(aID0); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeVolumeMesh"); + MESSAGE("StdMeshers_Penta_3D::MakeVolumeMesh pb"); return; } } @@ -819,7 +818,7 @@ void StdMeshers_Penta_3D::MakeMeshOnFxy1() aID0 = pNode->GetID(); aJ = GetIndexOnLayer(aID0); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeMeshOnFxy1() "); + MESSAGE("StdMeshers_Penta_3D::MakeMeshOnFxy1() pb"); return; } // @@ -1046,7 +1045,7 @@ void StdMeshers_Penta_3D::MakeBlock() if (iCnt>1) { // \begin{E.A.} // The current algorithm fails if there is more that one - // face wich contains triangles ... + // face which contains triangles ... // In that case, replace return by break to try another // method (coded in "if (iCnt != 1) { ... }") // @@ -1223,7 +1222,7 @@ void StdMeshers_Penta_3D::MakeBlock() // 1.1 Base vertex V000 iNbE = aME.Extent(); if (iNbE!= NB_WALL_FACES ){ - MESSAGE("StdMeshers_Penta_3D::MakeBlock() "); + MESSAGE("StdMeshers_Penta_3D::MakeBlock() err"); myErrorStatus->myName=7; // too few edges are in base face aFTr myErrorStatus->myComment=SMESH_Comment("Not a quadrilateral face #") <GetMeshDS()->ShapeToIndex( aFTr )<<": "<myName=7; // too few edges meet in base vertex myErrorStatus->myComment=SMESH_Comment("3 edges must share vertex #") <GetMeshDS()->ShapeToIndex( aV000 )<<" but there are "<myName=8; // can not find reper V001 myErrorStatus->myComment=SMESH_Comment("Can't find opposite vertex for vertex #") <GetMeshDS()->ShapeToIndex( aV000 ); @@ -1367,7 +1366,7 @@ bool StdMeshers_Penta_3D::LoadIJNodes(StdMeshers_IJNodeMap & theIJNodes, // find the other edges of theFace and orientation of e1 TopoDS_Edge e1, e2, eTop; - bool rev1, CumOri = false; + bool rev1 = false, CumOri = false; TopExp_Explorer exp( theFace, TopAbs_EDGE ); int nbEdges = 0; for ( ; exp.More(); exp.Next() ) { @@ -1544,7 +1543,7 @@ bool StdMeshers_Penta_3D::LoadIJNodes(StdMeshers_IJNodeMap & theIJNodes, } // look for a not loaded node of the bool found = false; - const SMDS_MeshNode* n3 = 0; // a node defferent from n1 and n2 + const SMDS_MeshNode* n3 = 0; // a node different from n1 and n2 eIt = face->nodesIterator() ; while ( !found && eIt->more() ) { node = static_cast( eIt->next() ); @@ -1610,11 +1609,11 @@ StdMeshers_SMESHBlock::StdMeshers_SMESHBlock() } //======================================================================= -//function : IsForwadEdge +//function : IsForwardEdge //purpose : //======================================================================= -bool StdMeshers_SMESHBlock::IsForwadEdge(const int theEdgeID) +bool StdMeshers_SMESHBlock::IsForwardEdge(const int theEdgeID) { int index = myTBlock.ShapeIndex( theEdgeID ); if ( !myTBlock.IsEdgeID( theEdgeID )) @@ -1862,8 +1861,6 @@ bool StdMeshers_Penta_3D::Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, MapShapeNbElems& aResMap) { - MESSAGE("StdMeshers_Penta_3D::Evaluate()"); - // find face contains only triangles vector < SMESH_subMesh * >meshFaces; TopTools_SequenceOfShape aFaces;