From 427668dbb6c7a9acdf6d463b33fe0053d6a6de4f Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 22 Aug 2014 15:40:20 +0400 Subject: [PATCH] 22483: EDF 2772 SMESH: Define several 3D viscous layer hypotheses on the same Geometry --- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 4989987..3487b7c 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -332,7 +332,7 @@ bool BLSURFPlugin_BLSURF::CheckHypothesis return true; // can work with no hypothesis } - for ( itl = hyps.begin(); itl != hyps.end(); ++itl ) + for ( itl = hyps.begin(); itl != hyps.end() && ( aStatus == HYP_OK ); ++itl ) { theHyp = *itl; string hypName = theHyp->GetName(); @@ -347,7 +347,11 @@ bool BLSURFPlugin_BLSURF::CheckHypothesis } else if ( hypName == StdMeshers_ViscousLayers2D::GetHypType() ) { - _haveViscousLayers = true; + if ( !_haveViscousLayers ) + { + if ( error( StdMeshers_ViscousLayers2D::CheckHypothesis( aMesh, aShape, aStatus ))) + _haveViscousLayers = true; + } } else { -- 2.39.2