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
IPAL22856 2D quadrangle mesher of reduced type works wrong
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Penta_3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Penta_3D.cxx
b/src/StdMeshers/StdMeshers_Penta_3D.cxx
index 9cfacf91efe4dd1184fbf10c57eeab42d73d3705..29c935a64042f4f12735af016e75e944de6bfba5 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Penta_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_Penta_3D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-849,7
+849,8
@@
void StdMeshers_Penta_3D::MakeMeshOnFxy1()
// assure that mesh on the top face will be cleaned when it is cleaned
// on the bottom face
SMESH_subMesh* volSM = pMesh->GetSubMesh( myTool->GetSubShape() );
// assure that mesh on the top face will be cleaned when it is cleaned
// on the bottom face
SMESH_subMesh* volSM = pMesh->GetSubMesh( myTool->GetSubShape() );
- volSM->SetEventListener( new SMESH_subMeshEventListener(true),
+ volSM->SetEventListener( new SMESH_subMeshEventListener(true, // deletable by SMESH_subMesh
+ "StdMeshers_Penta_3D"),
SMESH_subMeshEventListenerData::MakeData( aSubMesh1 ),
aSubMesh0 ); // translate CLEAN event of aSubMesh0 to aSubMesh1
}
SMESH_subMeshEventListenerData::MakeData( aSubMesh1 ),
aSubMesh0 ); // translate CLEAN event of aSubMesh0 to aSubMesh1
}
@@
-1336,8
+1337,8
@@
void StdMeshers_Penta_3D::CheckData()
iNb=aM.Extent();
if (iNb!=iNbEx[i]){
MESSAGE("StdMeshers_Penta_3D::CheckData() ");
iNb=aM.Extent();
if (iNb!=iNbEx[i]){
MESSAGE("StdMeshers_Penta_3D::CheckData() ");
- myErrorStatus->myName=4; // number of subshape is not compatible
- myErrorStatus->myComment="Wrong number of subshapes of a block";
+ myErrorStatus->myName=4; // number of sub
-
shape is not compatible
+ myErrorStatus->myComment="Wrong number of sub
-
shapes of a block";
return;
}
}
return;
}
}
@@
-1649,7
+1650,7
@@
SMESH_ComputeErrorPtr StdMeshers_SMESHBlock::GetError() const
case 3: text = "Internal error of StdMeshers_Penta_3D"; break;
case 4: text = "Can't compute normalized parameters of a point inside a block"; break;
case 5: text = "Can't compute coordinates by normalized parameters inside a block"; break;
case 3: text = "Internal error of StdMeshers_Penta_3D"; break;
case 4: text = "Can't compute normalized parameters of a point inside a block"; break;
case 5: text = "Can't compute coordinates by normalized parameters inside a block"; break;
- case 6: text = "Can't detect block subshapes. Not a block?"; break;
+ case 6: text = "Can't detect block sub
-
shapes. Not a block?"; break;
}
if (!text.empty())
err->myName = myErrorStatus;
}
if (!text.empty())
err->myName = myErrorStatus;