X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfaceGauche_2.py;h=9c0f33d0391ad591c139462a79e383fc05cc83f9;hb=e55b4566a423f05e3f986988a596b299bc9d58a3;hp=deb7681be3238bd7f2f0fd31b6002cf8b3e63c40;hpb=35f01d3bc6171b9fc6908fa06f1cae0e88fe6db9;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/CasTests/faceGauche_2.py b/src/Tools/blocFissure/CasTests/faceGauche_2.py
index deb7681be..9c0f33d03 100644
--- a/src/Tools/blocFissure/CasTests/faceGauche_2.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche_2.py
@@ -20,21 +20,12 @@
 """problème de fissure non plane, débouchante non normale"""
 
 import os
+import logging
+
 from blocFissure import gmu
 from blocFissure.gmu.geomsmesh import geompy, smesh
 from blocFissure.gmu.putName import putName
-
-import GEOM
-import SALOMEDS
-import SMESH
-#import StdMeshers
-#import GHS3DPlugin
-#import NETGENPlugin
-import logging
-
 from blocFissure.gmu.fissureGenerique import fissureGenerique
-
-
 from blocFissure.gmu.triedreBase import triedreBase
 from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain
@@ -55,7 +46,7 @@ class faceGauche_2(fissureGenerique):
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "boiteSaine.med"))
-    putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas)
+    putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas)
 
     return [objetSain, True] # True : maillage hexa
 
@@ -94,8 +85,8 @@ class faceGauche_2(fissureGenerique):
   # ---------------------------------------------------------------------------
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
-                                      nomFicSain       = self.nomCas,
-                                      nomFicFissure    = self.nomCas + "_fissure",
+                                      nomFicSain       = self.nomProbleme,
+                                      nomFicFissure    = self.nomProbleme + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
@@ -115,18 +106,18 @@ class faceGauche_2(fissureGenerique):
     mailleur = self.mailleur2d3d()
     maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
                                                maillageFissureParams, elementsDefaut, \
-                                               step, mailleur, self.numeroCas)
+                                               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 \
                                          )