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
Fix MA construction
[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..3334af950e7b1ab61dbb8a95dee0bf798767c240 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
5
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;