From: eap <eap@opencascade.com>
Date: Wed, 21 Nov 2012 11:07:33 +0000 (+0000)
Subject: 0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes
X-Git-Tag: V6_6_0rc1~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cc4d17c75ba63bd1517054e8dbe38feec1063b68;p=modules%2Fsmesh.git

0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes

  In checkMissing(), avoid reporting "global 1D algorithm is missing"
  with a local GHS3D and a global NETGEN 1D-2D.
---

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 99a84ef7b..5cdd596df 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -670,7 +670,7 @@ static bool checkMissing(SMESH_Gen*                aGen,
   }
   case SMESH_subMesh::MISSING_HYP: {
     // notify if an algo missing hyp is attached to aSubMesh
-    algo = aGen->GetAlgo( aMesh, aSubMesh->GetSubShape() );
+    algo = aSubMesh->GetAlgo();
     ASSERT( algo );
     bool IsGlobalHypothesis = aGen->IsGlobalHypothesis( algo, aMesh );
     if (!IsGlobalHypothesis || !globalChecked[ algo->GetDim() ])
@@ -721,7 +721,7 @@ static bool checkMissing(SMESH_Gen*                aGen,
   {
     bool checkNoAlgo2 = ( algo->NeedDiscreteBoundary() );
     SMESH_subMeshIteratorPtr itsub = aSubMesh->getDependsOnIterator( /*includeSelf=*/false,
-                                                                     /*complexShapeFirst=*/false);
+                                                                     /*complexShapeFirst=*/true);
     while ( itsub->more() )
     {
       // sub-meshes should not be checked further more