Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo-fix by Kunda
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_RadialPrism_3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
index a06cf86082e30e84a8f95ab62554ee7f8742faa3..aac2bfa4171b2db4fd451753185ebbd008428a82 100644
(file)
--- a/
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_RadialPrism_3D.cxx
// Module : SMESH
// Created : Fri Oct 20 11:37:07 2006
// File : StdMeshers_RadialPrism_3D.cxx
// Module : SMESH
// Created : Fri Oct 20 11:37:07 2006
@@
-29,8
+29,6
@@
#include "StdMeshers_RadialPrism_3D.hxx"
#include "StdMeshers_RadialPrism_3D.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_NumberOfLayers.hxx"
#include "StdMeshers_LayerDistribution.hxx"
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_NumberOfLayers.hxx"
#include "StdMeshers_LayerDistribution.hxx"
@@
-57,11
+55,7
@@
#include <TopoDS_Solid.hxx>
#include <gp.hxx>
#include <gp_Pnt.hxx>
#include <TopoDS_Solid.hxx>
#include <gp.hxx>
#include <gp_Pnt.hxx>
-#if OCC_VERSION_LARGE > 0x06050400
#include <BRepClass3d.hxx>
#include <BRepClass3d.hxx>
-#else
-#include <BRepTools.hxx>
-#endif
using namespace std;
using namespace std;
@@
-75,8
+69,8
@@
namespace ProjectionUtils = StdMeshers_ProjectionUtils;
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-StdMeshers_RadialPrism_3D::StdMeshers_RadialPrism_3D(int hypId,
int studyId,
SMESH_Gen* gen)
- :SMESH_3D_Algo(hypId,
studyId,
gen)
+StdMeshers_RadialPrism_3D::StdMeshers_RadialPrism_3D(int hypId, SMESH_Gen* gen)
+ :SMESH_3D_Algo(hypId, gen)
{
_name = "RadialPrism_3D";
_shapeType = (1 << TopAbs_SOLID); // 1 bit per shape type
{
_name = "RadialPrism_3D";
_shapeType = (1 << TopAbs_SOLID); // 1 bit per shape type
@@
-169,11
+163,7
@@
bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
-#if OCC_VERSION_LARGE > 0x06050400
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
-#else
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
-#endif
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@
-187,13
+177,13
@@
bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// ----------------------------------
ProjectionUtils::TShapeShapeMap shape2ShapeMaps[2];
// ----------------------------------
ProjectionUtils::TShapeShapeMap shape2ShapeMaps[2];
-
if ( !
ProjectionUtils::FindSubShapeAssociation( innerShell, &aMesh,
- outerShell, &aMesh,
- shape2ShapeMaps[0])
- &&
-
!ProjectionUtils::FindSubShapeAssociation( innerShell.Reversed()
, &aMesh,
- outerShell, &aMesh,
-
shape2ShapeMaps[1])
)
+
bool mapOk1 =
ProjectionUtils::FindSubShapeAssociation( innerShell, &aMesh,
+
outerShell, &aMesh,
+ shape2ShapeMaps[0]);
+ bool mapOk2 = ProjectionUtils::FindSubShapeAssociation( innerShell.Reversed(), &aMesh,
+
outerShell
, &aMesh,
+ shape2ShapeMaps[1]);
+
if ( !mapOk1 && !mapOk2
)
return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" );
int iMap;
return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" );
int iMap;
@@
-287,7
+277,7
@@
bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
/*!
* \brief Create a column of nodes from outNode to inNode
* \param n2ColMap - map of node columns to add a created column
/*!
* \brief Create a column of nodes from outNode to inNode
* \param n2ColMap - map of node columns to add a created column
- * \param outNode - botto
n
node of a column
+ * \param outNode - botto
m
node of a column
* \param inNode - top node of a column
* \retval const TNodeColumn* - a new column pointer
*/
* \param inNode - top node of a column
* \retval const TNodeColumn* - a new column pointer
*/
@@
-346,7
+336,7
@@
public:
const int myID = -1000;
TNodeDistributor* myHyp = dynamic_cast<TNodeDistributor*>( aMesh.GetHypothesis( myID ));
if ( !myHyp )
const int myID = -1000;
TNodeDistributor* myHyp = dynamic_cast<TNodeDistributor*>( aMesh.GetHypothesis( myID ));
if ( !myHyp )
- myHyp = new TNodeDistributor( myID,
0,
aMesh.GetGen() );
+ myHyp = new TNodeDistributor( myID, aMesh.GetGen() );
return myHyp;
}
// -----------------------------------------------------------------------------
return myHyp;
}
// -----------------------------------------------------------------------------
@@
-384,8
+374,8
@@
public:
}
protected:
// -----------------------------------------------------------------------------
}
protected:
// -----------------------------------------------------------------------------
- TNodeDistributor( int hypId,
int studyId,
SMESH_Gen* gen)
- : StdMeshers_Regular_1D( hypId,
studyId,
gen)
+ TNodeDistributor( int hypId, SMESH_Gen* gen)
+ : StdMeshers_Regular_1D( hypId, gen)
{
}
// -----------------------------------------------------------------------------
{
}
// -----------------------------------------------------------------------------
@@
-439,11
+429,7
@@
bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh,
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
-#if OCC_VERSION_LARGE > 0x06050400
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
-#else
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
-#endif
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@
-610,7
+596,6
@@
bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh,
bool StdMeshers_RadialPrism_3D::IsApplicable( const TopoDS_Shape & aShape, bool toCheckAll )
{
bool StdMeshers_RadialPrism_3D::IsApplicable( const TopoDS_Shape & aShape, bool toCheckAll )
{
- bool isCurShellApp;
int nbFoundSolids = 0;
for (TopExp_Explorer exp( aShape, TopAbs_SOLID ); exp.More(); exp.Next(), ++nbFoundSolids )
{
int nbFoundSolids = 0;
for (TopExp_Explorer exp( aShape, TopAbs_SOLID ); exp.More(); exp.Next(), ++nbFoundSolids )
{