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
Merge branch 'master' into pre/penta18
[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 3b36e0058a9c20103606b4f621589cabe9f2b5b4..bbf339a8b124c022eda732e432df85d6ad46d563 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
@@
-179,13
+179,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;
@@
-598,7
+598,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 )
{