passage en classe

[modules/smesh.git] / src / Tools / blocFissure / CasTests / vis_1.py

diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py
index 3b51987879e4fc44e808ea355fd6e667a2187dac..58c59e2e397a6e6d17618e3718965c0cd147bc1b 100644 (file)
--- a/src/Tools/blocFissure/CasTests/vis_1.py
+++ b/src/Tools/blocFissure/CasTests/vis_1.py
@@ -27,12 +27,8 @@ from blocFissure.gmu import initLog
 from blocFissure.gmu.geomsmesh import geompy, smesh
 from blocFissure.gmu.geomsmesh import geomPublish
 from blocFissure.gmu.geomsmesh import geomPublishInFather
-from blocFissure.gmu.putName import putName
-
-import GEOM
-import SALOMEDS
-import SMESH
 
+from blocFissure.gmu.putName import putName
 from blocFissure.gmu.fissureGenerique import fissureGenerique
 from blocFissure.gmu.triedreBase import triedreBase
 from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
@@ -55,7 +51,7 @@ class vis_1(fissureGenerique):
     logging.info(texte)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "visSain.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
 
@@ -84,7 +80,7 @@ class vis_1(fissureGenerique):
 
     shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep"))
     fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"])
-    geompy.UnionIDs(fondFiss, [6, 8, 3])
+    geompy.UnionIDs(fondFiss, [6, 8])
     geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas)
     geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas)
 
@@ -100,8 +96,8 @@ class vis_1(fissureGenerique):
     texte = "setParamMaillageFissure pour '{}'".format(self.nomCas)
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
-                                      nomFicSain       = self.nomCas,
-                                      nomFicFissure    = self.nomCas + "_fissure",
+                                      nomFicSain       = self.nomProbleme,
+                                      nomFicFissure    = self.nomProbleme + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 32,
                                       areteFaceFissure = 0.1)
@@ -124,18 +120,18 @@ class vis_1(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 = 4285 ,\
-                                          Entity_Quad_Hexa       = 6416, \
-                                          Entity_Node            = 85673, \
-                                          Entity_Quad_Edge       = 758, \
-                                          Entity_Quad_Triangle   = 2336, \
-                                          Entity_Quad_Tetra      = 35990, \
-                                          Entity_Quad_Pyramid    = 1284, \
-                                          Entity_Quad_Penta      = 984 \
+                                          Entity_Quad_Quadrangle = 11596, \
+                                          Entity_Quad_Hexa = 37008, \
+                                          Entity_Node = 250929, \
+                                          Entity_Quad_Edge = 30356, \
+                                          Entity_Quad_Triangle = 8088, \
+                                          Entity_Quad_Tetra = 49055, \
+                                          Entity_Quad_Pyramid = 3026, \
+                                          Entity_Quad_Penta = 4392 \
                                          )