X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfaceGauche_2.py;h=1cb43188f5910e118193aa858e65d5687d4d504e;hb=f4829e7aed561f68bb1d736a63c64c537349eb9e;hp=e3863efc5185643a45d4d191dacc36776cb02708;hpb=d7ce9e283f7e6671e4b9d65f89b6320d6f57774b;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/faceGauche_2.py b/src/Tools/blocFissure/CasTests/faceGauche_2.py index e3863efc5..1cb43188f 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche_2.py +++ b/src/Tools/blocFissure/CasTests/faceGauche_2.py @@ -22,6 +22,7 @@ import os from blocFissure import gmu from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.putName import putName import GEOM import SALOMEDS @@ -54,7 +55,7 @@ class faceGauche_2(fissureGenerique): logging.info("genereMaillageSain %s", self.nomCas) ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "boiteSaine.med")) - smesh.SetName(objetSain.GetMesh(), 'objetSain') + putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -85,7 +86,7 @@ class faceGauche_2(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 return [shellFiss, centre, lgInfluence, coordsNoeudsFissure, fondFiss] @@ -101,7 +102,8 @@ class faceGauche_2(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 # --------------------------------------------------------------------------- @@ -113,18 +115,18 @@ class faceGauche_2(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur) + step, mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 2542, \ - Entity_Quad_Hexa = 3435, \ - Entity_Node = 44095, \ - Entity_Quad_Edge = 323, \ - Entity_Quad_Triangle = 634, \ - Entity_Quad_Tetra = 18400, \ - Entity_Quad_Pyramid = 859, \ - Entity_Quad_Penta = 288 \ + Entity_Quad_Quadrangle = 2560, \ + Entity_Quad_Hexa = 3467, \ + Entity_Node = 44442, \ + Entity_Quad_Edge = 328, \ + Entity_Quad_Triangle = 772, \ + Entity_Quad_Tetra = 18414, \ + Entity_Quad_Pyramid = 867, \ + Entity_Quad_Penta = 296 \ )