X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Ftube.py;h=81088ec5412985612e9e91e3590d3b0071535274;hb=2bc0b72d57113b349258b2b4efaf538e1bd39eb9;hp=c579b384d475576a0cb7276801d8e9f178e587f8;hpb=045cedf24f735d1f8ce34c0c88c7cbb54969d02a;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/tube.py b/src/Tools/blocFissure/CasTests/tube.py index c579b384d..81088ec54 100644 --- a/src/Tools/blocFissure/CasTests/tube.py +++ b/src/Tools/blocFissure/CasTests/tube.py @@ -25,10 +25,13 @@ import logging from blocFissure import gmu from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.geomsmesh import geomPublish +from blocFissure.gmu.geomsmesh import geomPublishInFather from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale +from blocFissure.gmu.putName import putName import GEOM import SALOMEDS @@ -48,7 +51,7 @@ class tube(fissureGenerique): logging.info(texte) ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "Tube.med")) - smesh.SetName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme)) + putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -80,11 +83,11 @@ class tube(fissureGenerique): l_aux.append(group) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) geompy.UnionList(fondFiss, l_aux ) - geompy.addToStudy( shellFiss, 'shellFiss' ) - geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) + geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas) + geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas) mailleur = self.mailleur2d3d() - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.025, 0.1, mailleur) + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.025, 0.1, mailleur, self.numeroCas) centre = None @@ -103,7 +106,8 @@ class tube(fissureGenerique): # --------------------------------------------------------------------------- def genereZoneDefaut(self, geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams): - elementsDefaut = creeZoneDefautDansObjetSain(geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams) + elementsDefaut = creeZoneDefautDansObjetSain(geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams, \ + self.numeroCas) return elementsDefaut # ---------------------------------------------------------------------------