X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fvis_1.py;h=58c59e2e397a6e6d17618e3718965c0cd147bc1b;hb=e55b4566a423f05e3f986988a596b299bc9d58a3;hp=b1f2dde7c525ba2b8bed0019d80a97131c7e0170;hpb=4e6f2284a44bc1da45d137fe825e31b2feadaa9a;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py
index b1f2dde7c..58c59e2e3 100644
--- a/src/Tools/blocFissure/CasTests/vis_1.py
+++ b/src/Tools/blocFissure/CasTests/vis_1.py
@@ -19,17 +19,17 @@
 #
 """problème de fissure non plane, débouchante non normale"""
 
+import logging
 import os
+
 from blocFissure import gmu
+from blocFissure.gmu import initLog
 from blocFissure.gmu.geomsmesh import geompy, smesh
+from blocFissure.gmu.geomsmesh import geomPublish
+from blocFissure.gmu.geomsmesh import geomPublishInFather
 
-import GEOM
-import SALOMEDS
-import SMESH
-import logging
-
+from blocFissure.gmu.putName import putName
 from blocFissure.gmu.fissureGenerique import fissureGenerique
-
 from blocFissure.gmu.triedreBase import triedreBase
 from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain
@@ -51,7 +51,7 @@ class vis_1(fissureGenerique):
     logging.info(texte)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "visSain.med"))
-    smesh.SetName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme))
+    putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas)
 
     return [objetSain, True] # True : maillage hexa
 
@@ -80,12 +80,12 @@ 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.addToStudy( shellFiss, 'shellFiss' )
-    geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' )
+    geompy.UnionIDs(fondFiss, [6, 8])
+    geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas)
+    geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas)
 
     mailleur = self.mailleur2d3d()
-    coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.1 ,0.2, mailleur)
+    coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.1 ,0.2, mailleur, self.numeroCas)
 
     centre = None
 
@@ -96,15 +96,16 @@ 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)
 
   # ---------------------------------------------------------------------------
   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
 
   # ---------------------------------------------------------------------------
@@ -119,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 \
                                          )