ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix MakeMeshOnFxy1(): set medium nodes to the Fxy1 face instead of volume

Browse Source
This commit is contained in:
eap 2009-08-27 10:43:10 +00:00
parent 20a656158d
commit e069a4fc65
1 changed files with 73 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/StdMeshers/StdMeshers_Penta_3D.cxx
View File

@ -69,7 +69,7 @@ enum { NB_WALL_FACES = 4 };
//purpose : //purpose :
//======================================================================= //=======================================================================
StdMeshers_Penta_3D::StdMeshers_Penta_3D() StdMeshers_Penta_3D::StdMeshers_Penta_3D()
: myErrorStatus(SMESH_ComputeError::New()) : myErrorStatus(SMESH_ComputeError::New())
{ {
myTol3D=0.1; myTol3D=0.1;
myWallNodesMaps.resize( SMESH_Block::NbFaces() ); myWallNodesMaps.resize( SMESH_Block::NbFaces() );
@ -437,7 +437,7 @@ void StdMeshers_Penta_3D::MakeNodes()
FindNodeOnShape(aS, aCoords, i, aTN); FindNodeOnShape(aS, aCoords, i, aTN);
} }
else{ else{
// create node and get it id // create node and get its id
CreateNode (bIsUpperLayer, aCoords, aTN); CreateNode (bIsUpperLayer, aCoords, aTN);
// //
if ( bIsUpperLayer ) { if ( bIsUpperLayer ) {
@ -477,33 +477,6 @@ void StdMeshers_Penta_3D::MakeNodes()
myTNodes[ij]=aTN; myTNodes[ij]=aTN;
} }
} }
//DEB
/*
{
int iSSID, iBNID, aID;
//
for (i=0; i<myISize; ++i) {
printf(" Layer# %d\n", i);
for (j=0; j<myJSize; ++j) {
ij=i*myJSize+j;
const StdMeshers_TNode& aTN=myTNodes[ij];
//const StdMeshers_TNode& aTN=aTNodes[ij];
const gp_XYZ& aXYZ=aTN.NormCoord();
iSSID=aTN.ShapeSupportID();
iBNID=aTN.BaseNodeID();
//
const SMDS_MeshNode* aNode=aTN.Node();
aID=aNode->GetID();
aX=aNode->X();
aY=aNode->Y();
aZ=aNode->Z();
printf("*** j:%d BNID#%d iSSID:%d ID:%d { %lf %lf %lf }, { %lf %lf %lf }\n",
j, iBNID, iSSID, aID, aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aX, aY, aZ);
}
}
}
*/
//DEB t
} }
@ -634,16 +607,16 @@ double StdMeshers_Penta_3D::SetHorizEdgeXYZ(const gp_XYZ& aBase
} }
else { else {
// this variant is better for other cases // this variant is better for other cases
// SMESH_MesherHelper helper( *GetMesh() ); // SMESH_MesherHelper helper( *GetMesh() );
// const TopoDS_Edge & edge = TopoDS::Edge( myBlock.Shape( edgeVec[ TOP ])); // const TopoDS_Edge & edge = TopoDS::Edge( myBlock.Shape( edgeVec[ TOP ]));
// double u1 = helper.GetNodeU( edge, n1 ); // double u1 = helper.GetNodeU( edge, n1 );
// double u2 = helper.GetNodeU( edge, n2 ); // double u2 = helper.GetNodeU( edge, n2 );
// double u = ( 1. - r ) * u1 + r * u2; // double u = ( 1. - r ) * u1 + r * u2;
// gp_XYZ topNodeParams; // gp_XYZ topNodeParams;
// myBlock.Block().EdgeParameters( edgeVec[ TOP ], u, topNodeParams ); // myBlock.Block().EdgeParameters( edgeVec[ TOP ], u, topNodeParams );
// myBlock.Block().EdgePoint( edgeVec[ TOP ], // myBlock.Block().EdgePoint( edgeVec[ TOP ],
// topNodeParams, // topNodeParams,
// myShapeXYZ[ edgeVec[ TOP ]]); // myShapeXYZ[ edgeVec[ TOP ]]);
} }
// base edge // base edge
@ -822,7 +795,7 @@ void StdMeshers_Penta_3D::MakeMeshOnFxy1()
itn = aSM0->GetNodes(); itn = aSM0->GetNodes();
aNbNodes = aSM0->NbNodes(); aNbNodes = aSM0->NbNodes();
//printf("** aNbNodes=%d\n", aNbNodes); //printf("** aNbNodes=%d\n", aNbNodes);
myTool->SetSubShape( aFxy1 ); // to set medium nodes to aFxy1
// //
// set elements on aFxy1 // set elements on aFxy1
vector<const SMDS_MeshNode*> aNodes1; vector<const SMDS_MeshNode*> aNodes1;
@ -873,6 +846,7 @@ void StdMeshers_Penta_3D::MakeMeshOnFxy1()
} }
meshDS->SetMeshElementOnShape(face, aFxy1); meshDS->SetMeshElementOnShape(face, aFxy1);
} }
myTool->SetSubShape( myShape );
// update compute state of top face submesh // update compute state of top face submesh
aSubMesh1->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); aSubMesh1->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
@ -949,15 +923,15 @@ void StdMeshers_Penta_3D::CreateNode(const bool bIsUpperLayer,
SMDS_MeshNode* pNode=NULL; SMDS_MeshNode* pNode=NULL;
aTN.SetNode(pNode); aTN.SetNode(pNode);
// //
// if (bIsUpperLayer) { // if (bIsUpperLayer) {
// // point on face Fxy1 // // point on face Fxy1
// const TopoDS_Shape& aS=myBlock.Shape(SMESH_Block::ID_Fxy1); // const TopoDS_Shape& aS=myBlock.Shape(SMESH_Block::ID_Fxy1);
// myBlock.Point(aParams, aS, aP); // myBlock.Point(aParams, aS, aP);
// } // }
// else { // else {
// // point inside solid // // point inside solid
// myBlock.Point(aParams, aP); // myBlock.Point(aParams, aP);
// } // }
if (bIsUpperLayer) { if (bIsUpperLayer) {
double u = aParams.X(), v = aParams.Y(); double u = aParams.X(), v = aParams.Y();
double u1 = ( 1. - u ), v1 = ( 1. - v ); double u1 = ( 1. - u ), v1 = ( 1. - v );
@ -975,11 +949,11 @@ void StdMeshers_Penta_3D::CreateNode(const bool bIsUpperLayer,
SMESH_Block::ShellPoint( aParams, myShapeXYZ, aP.ChangeCoord() ); SMESH_Block::ShellPoint( aParams, myShapeXYZ, aP.ChangeCoord() );
} }
// //
// iErr=myBlock.ErrorStatus(); // iErr=myBlock.ErrorStatus();
// if (iErr) { // if (iErr) {
// myErrorStatus=12; // can not find the node point; // myErrorStatus=12; // can not find the node point;
// return; // return;
// } // }
// //
aX=aP.X(); aY=aP.Y(); aZ=aP.Z(); aX=aP.X(); aY=aP.Y(); aZ=aP.Z();
// //
@ -1784,8 +1758,7 @@ void StdMeshers_SMESHBlock::ComputeParameters(const double& theU,
//function : Point //function : Point
//purpose : //purpose :
//======================================================================= //=======================================================================
void StdMeshers_SMESHBlock::Point(const gp_XYZ& theParams, void StdMeshers_SMESHBlock::Point(const gp_XYZ& theParams, gp_Pnt& aP3D)
gp_Pnt& aP3D)
{ {
TopoDS_Shape aS; TopoDS_Shape aS;
// //
@ -1796,7 +1769,7 @@ void StdMeshers_SMESHBlock::ComputeParameters(const double& theU,
//function : Point //function : Point
//purpose : //purpose :
//======================================================================= //=======================================================================
void StdMeshers_SMESHBlock::Point(const gp_XYZ& theParams, void StdMeshers_SMESHBlock::Point(const gp_XYZ& theParams,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
gp_Pnt& aP3D) gp_Pnt& aP3D)
{ {