ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

22572: [CEA 1148] Radial Quadrangle does not create quadratics cells

Browse Source
This commit is contained in:
eap 2014-04-24 17:35:15 +04:00
parent 26d8315709
commit 136e10ec81
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
View File

@ -419,7 +419,7 @@ void StdMeshers_RadialQuadrangle_1D2D::SubmeshRestored(SMESH_subMesh* faceSubMes
//======================================================================= //=======================================================================
//function : Compute //function : Compute
//purpose : //purpose :
//======================================================================= //=======================================================================
bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh, bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
@ -428,9 +428,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
SMESHDS_Mesh * meshDS = aMesh.GetMeshDS(); SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
myHelper = new SMESH_MesherHelper( aMesh ); myHelper = new SMESH_MesherHelper( aMesh );
myHelper->IsQuadraticSubMesh( aShape );
// to delete helper at exit from Compute() // to delete helper at exit from Compute()
auto_ptr<SMESH_MesherHelper> helperDeleter( myHelper ); SMESHUtils::Deleter<SMESH_MesherHelper> helperDeleter( myHelper );
TNodeDistributor* algo1d = TNodeDistributor::GetDistributor(aMesh); TNodeDistributor* algo1d = TNodeDistributor::GetDistributor(aMesh);
@ -438,8 +437,9 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 ); int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 );
Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast( getCurve( CircEdge )); Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast( getCurve( CircEdge ));
if( nbe>3 || nbe < 1 || aCirc.IsNull() ) if( nbe>3 || nbe < 1 || aCirc.IsNull() )
return error("The face must be a full circle or a part of circle (i.e. the number of edges is less or equal to 3 and one of them is a circle curve)"); return error("The face must be a full circle or a part of circle (i.e. the number "
"of edges is less or equal to 3 and one of them is a circle curve)");
gp_Pnt P0, P1; gp_Pnt P0, P1;
// points for rotation // points for rotation
TColgp_SequenceOfPnt Points; TColgp_SequenceOfPnt Points;
@ -466,6 +466,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes)) if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
return error("Circular edge is incorrectly meshed"); return error("Circular edge is incorrectly meshed");
myHelper->IsQuadraticSubMesh( aShape );
CNodes.clear(); CNodes.clear();
map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin(); map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
const SMDS_MeshNode* NF = (*itn).second; const SMDS_MeshNode* NF = (*itn).second;
@ -540,6 +542,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes) ) if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes) )
return error("Circular edge is incorrectly meshed"); return error("Circular edge is incorrectly meshed");
myHelper->IsQuadraticSubMesh( aShape );
map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin(); map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
CNodes.clear(); CNodes.clear();
CNodes.push_back( itn->second ); CNodes.push_back( itn->second );
@ -676,6 +680,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes)) if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
return error("Circular edge is incorrectly meshed"); return error("Circular edge is incorrectly meshed");
myHelper->IsQuadraticSubMesh( aShape );
const SMDS_MeshNode* NF = theNodes.begin()->second; const SMDS_MeshNode* NF = theNodes.begin()->second;
const SMDS_MeshNode* NL = theNodes.rbegin()->second; const SMDS_MeshNode* NL = theNodes.rbegin()->second;
CNodes.clear(); CNodes.clear();