From 48214ca967a3756842730ad81b5bfbd84941476e Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 7 Aug 2015 17:03:07 +0300 Subject: [PATCH] 23102: [CEA 1486 ] Add the parameters for defining the boundary layers facesWithLayers is obligatory parameter Dot't try to use inexistent gmf file --- src/HexoticPlugin/HexoticPLUGINBuilder.py | 12 ++++++------ src/HexoticPlugin/HexoticPlugin_Hexotic.cxx | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/HexoticPlugin/HexoticPLUGINBuilder.py b/src/HexoticPlugin/HexoticPLUGINBuilder.py index 7edd7d5..849547f 100644 --- a/src/HexoticPlugin/HexoticPLUGINBuilder.py +++ b/src/HexoticPlugin/HexoticPLUGINBuilder.py @@ -126,16 +126,16 @@ class Hexotic_Algorithm(Mesh_Algorithm): # @param firstLayerSize height of the first layer # @param growth geometric progression for the boundary layer growth # @param direction describes whether the layers grow inwards or outwards. - # if direction is: - # \c Inward : means the layers grow inwards, - # \c Outward : means the layers grow outwards - # @param facesWithLayers list of surface references from which the boundary + # Possible values are: + # - \c smeshBuilder.Inward : means the layers grow inwards, + # - \c smeshBuilder.Outward : means the layers grow outwards + # @param facesWithLayers list of surfaces from which the boundary # layers should be grown - # @param imprintedFaces list of surface references that can be imprinted by + # @param imprintedFaces list of surfaces that can be imprinted by # boundary layers # @return hypothesis object def SetViscousLayers(self, numberOfLayers, firstLayerSize, growth, - direction=Inward, facesWithLayers=[], imprintedFaces=[]): + facesWithLayers, imprintedFaces=[], direction=Inward): self.Parameters().SetNbLayers(numberOfLayers) self.Parameters().SetFirstLayerSize(firstLayerSize) self.Parameters().SetGrowth(growth) diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx index 7c781af..eeee0c2 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx @@ -1592,8 +1592,9 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, #ifdef WITH_BLSURFPLUGIN bool defaultInputFile = true; if (_blsurfHypo && !_blsurfHypo->GetQuadAllowed()) { - Hexotic_In = TCollection_AsciiString(_blsurfHypo->GetGMFFile().c_str()); - if (Hexotic_In != "") + Hexotic_In = _blsurfHypo->GetGMFFile().c_str(); + if ( !Hexotic_In.IsEmpty() && + SMESH_File( _blsurfHypo->GetGMFFile() ).exists() ) defaultInputFile = false; } if (defaultInputFile) { -- 2.39.2