X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fellipse_1.py;h=5008debbbcfa07a43cd99c8ad1a578cf138de78b;hb=1f61ca9786ef9635a6e0dddc799d49deebedc019;hp=273ea859f3e56c956ab00324b0c7872939ec1709;hpb=71e110654cdcad80ed80b0e6f3bee102dcfa7147;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py index 273ea859f..5008debbb 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_1.py +++ b/src/Tools/blocFissure/CasTests/ellipse_1.py @@ -70,7 +70,8 @@ class ellipse_1(fissureGenerique): rayonPipe = 20) # --------------------------------------------------------------------------- - def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): + def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \ + mailleur="MeshGems"): """Importe la géométrie de la fissure""" texte = "genereShapeFissure pour '{}'".format(self.nomCas) logging.info(texte) @@ -83,7 +84,8 @@ class ellipse_1(fissureGenerique): geompy.addToStudy( shellFiss, 'shellFiss' ) geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25) + mailleur = self.mailleur2d3d() + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25, mailleur) centre = None @@ -95,7 +97,7 @@ class ellipse_1(fissureGenerique): logging.info(texte) self.maillageFissureParams = dict(nomRep = os.curdir, nomFicSain = self.nomCas, - nomFicFissure = 'fissure_' + self.nomCas, + nomFicFissure = self.nomCas + "_fissure", nbsegRad = 5, nbsegCercle = 8, areteFaceFissure = 1000) @@ -108,12 +110,17 @@ class ellipse_1(fissureGenerique): # --------------------------------------------------------------------------- def genereMaillageFissure(self, geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step): + maillageFissureParams, elementsDefaut, step, \ + mailleur="MeshGems"): + texte = "genereMaillageFissure pour '{}'".format(self.nomCas) logging.info(texte) + + mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(maillagesSains, shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step) + maillageFissureParams, elementsDefaut, step, \ + mailleur) return maillageFissure # ---------------------------------------------------------------------------