X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fellipse_1.py;h=d35a48ffb853a68cb30b21cab04adf58ecf8ba5e;hb=403a6925d3258b5d5aa5ed723c334256b883ef24;hp=5008debbbcfa07a43cd99c8ad1a578cf138de78b;hpb=1f61ca9786ef9635a6e0dddc799d49deebedc019;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py index 5008debbb..d35a48ffb 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_1.py +++ b/src/Tools/blocFissure/CasTests/ellipse_1.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 EDF R&D +# Copyright (C) 2014-2021 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,9 @@ class ellipse_1(fissureGenerique): """problème de fissure non plane, débouchante non normale""" nomProbleme = "ellipse1" + shapeFissureParams = dict() + maillageFissureParams = dict() + referencesMaillageFissure = dict() # # --------------------------------------------------------------------------- # def genereGeometrieSaine(self, geomParams): @@ -85,7 +88,7 @@ class ellipse_1(fissureGenerique): geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) mailleur = self.mailleur2d3d() - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25, mailleur) + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25, mailleur, self.numeroCas) centre = None @@ -108,19 +111,18 @@ class ellipse_1(fissureGenerique): return elementsDefaut # --------------------------------------------------------------------------- - def genereMaillageFissure(self, geometriesSaines, maillagesSains, - shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step, \ + def genereMaillageFissure(self, geometriesSaines, maillagesSains, \ + shapesFissure, shapeFissureParams, \ + 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, \ - mailleur) + maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, \ + step, mailleur, self.numeroCas) return maillageFissure # ---------------------------------------------------------------------------