mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-31 21:50:32 +05:00
0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes
Fix checkConformIgnoredAlgos()
This commit is contained in:
parent
4173d6c483
commit
46c3fa32c4
@ -585,7 +585,8 @@ static bool checkConformIgnoredAlgos(SMESH_Mesh& aMesh,
|
|||||||
int dim = algo->GetDim();
|
int dim = algo->GetDim();
|
||||||
int aMaxGlobIgnoDim = ( aGlobIgnoAlgo ? aGlobIgnoAlgo->GetDim() : -1 );
|
int aMaxGlobIgnoDim = ( aGlobIgnoAlgo ? aGlobIgnoAlgo->GetDim() : -1 );
|
||||||
|
|
||||||
if ( dim < aMaxGlobIgnoDim )
|
if ( dim < aMaxGlobIgnoDim &&
|
||||||
|
( isGlobal || !aGlobIgnoAlgo->SupportSubmeshes() ))
|
||||||
{
|
{
|
||||||
// algo is hidden by a global algo
|
// algo is hidden by a global algo
|
||||||
theErrors.push_back( SMESH_Gen::TAlgoStateError() );
|
theErrors.push_back( SMESH_Gen::TAlgoStateError() );
|
||||||
@ -812,7 +813,8 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh,
|
|||||||
for (dim = 3; dim > 0; dim--)
|
for (dim = 3; dim > 0; dim--)
|
||||||
{
|
{
|
||||||
if (aGlobAlgoArr[ dim ] &&
|
if (aGlobAlgoArr[ dim ] &&
|
||||||
!aGlobAlgoArr[ dim ]->NeedDiscreteBoundary())
|
!aGlobAlgoArr[ dim ]->NeedDiscreteBoundary() /*&&
|
||||||
|
!aGlobAlgoArr[ dim ]->SupportSubmeshes()*/ )
|
||||||
{
|
{
|
||||||
aGlobIgnoAlgo = aGlobAlgoArr[ dim ];
|
aGlobIgnoAlgo = aGlobAlgoArr[ dim ];
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user