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

[modules/smesh.git] / src / StdMeshers / StdMeshers_RadialQuadrangle_1D2D.cxx

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
index 92b2949002e18f62f822772b8113341583e509cb..30612ef3deb340ab1a367b5300866cf6979aa9cd 100644 (file)
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
@@ -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();
 
   myHelper = new SMESH_MesherHelper( aMesh );
   SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
 
   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 );
   Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast( getCurve( CircEdge ));
   if( nbe>3 || nbe < 1 || aCirc.IsNull() )
   int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 );
   Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast( getCurve( CircEdge ));
   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;
   // points for rotation
   TColgp_SequenceOfPnt Points;
   gp_Pnt P0, P1;
   // points for rotation
   TColgp_SequenceOfPnt Points;


@@ -466,6 +466,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh&         aMesh,
     if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
       return error("Circular edge is incorrectly meshed");
 
     if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
       return error("Circular edge is incorrectly meshed");
 

+    myHelper->IsQuadraticSubMesh( aShape );
+

     CNodes.clear();
     map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
     const SMDS_MeshNode* NF = (*itn).second;
     CNodes.clear();
     map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
     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) )
       return error("Circular edge is incorrectly meshed");
 
     if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes) )
       return error("Circular edge is incorrectly meshed");
 

+    myHelper->IsQuadraticSubMesh( aShape );
+

     map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
     CNodes.clear();
     CNodes.push_back( itn->second );
     map< double, const SMDS_MeshNode* >::iterator itn = theNodes.begin();
     CNodes.clear();
     CNodes.push_back( itn->second );


@@ -676,6 +680,8 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh&         aMesh,
     if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
       return error("Circular edge is incorrectly meshed");
 
     if ( !GetSortedNodesOnEdge(aMesh.GetMeshDS(),CircEdge,true,theNodes))
       return error("Circular edge is incorrectly meshed");
 

+    myHelper->IsQuadraticSubMesh( aShape );
+

     const SMDS_MeshNode* NF = theNodes.begin()->second;
     const SMDS_MeshNode* NL = theNodes.rbegin()->second;
     CNodes.clear();
     const SMDS_MeshNode* NF = theNodes.begin()->second;
     const SMDS_MeshNode* NL = theNodes.rbegin()->second;
     CNodes.clear();