Regression of SALOME_TESTS/Grids/smesh/viscous_layers_01/B2

[plugins/netgenplugin.git] / src / NETGENPlugin / NETGENPlugin_NETGEN_2D.cxx

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
index d6d1a270e358698ad911dcee05428417eec088b0..cc5bb1895014c26c64deac4f0e2f47b4080afb56 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,12 +41,10 @@
 
 #include <list>
 
-#ifdef WITH_SMESH_CANCEL_COMPUTE
 namespace nglib {
 #include <nglib.h>
 }
 #include <meshing.hpp>
-#endif
 
 using namespace std;
 
@@ -60,7 +58,6 @@ NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId, int studyId,
                                                SMESH_Gen* gen)
   : SMESH_2D_Algo(hypId, studyId, gen)
 {
-  MESSAGE("NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D");
   _name = "NETGEN_2D";
   _shapeType = (1 << TopAbs_FACE); // 1 bit /shape type
   _compatibleHypothesis.push_back("NETGEN_Parameters_2D");
@@ -80,7 +77,6 @@ NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId, int studyId,
 
 NETGENPlugin_NETGEN_2D::~NETGENPlugin_NETGEN_2D()
 {
-  MESSAGE("NETGENPlugin_NETGEN_2D::~NETGENPlugin_NETGEN_2D");
 }
 
 //=============================================================================
@@ -95,6 +91,7 @@ bool NETGENPlugin_NETGEN_2D::CheckHypothesis (SMESH_Mesh&         aMesh,
 {
   _hypothesis        = NULL;
   _isViscousLayers2D = false;
+  _mesher            = NULL;
 
   // can work with no hypothesis
   aStatus = SMESH_Hypothesis::HYP_OK;
@@ -113,6 +110,9 @@ bool NETGENPlugin_NETGEN_2D::CheckHypothesis (SMESH_Mesh&         aMesh,
       _hypothesis = theHyp;
   }
 
+  if ( aStatus == HYP_OK && _isViscousLayers2D )
+    error( StdMeshers_ViscousLayers2D::CheckHypothesis( aMesh, aShape, aStatus ));
+
   return aStatus == SMESH_Hypothesis::HYP_OK;
 }
 
@@ -155,7 +155,7 @@ void NETGENPlugin_NETGEN_2D::CancelCompute()
 
 double NETGENPlugin_NETGEN_2D::GetProgress() const
 {
-  return _mesher ? _mesher->GetProgress(this, &_progressTic) : 0;
+  return _mesher ? _mesher->GetProgress(this, &_progressTic, &_progress) : 0;
 }
 
 //=============================================================================