X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FcasStandard.py;h=bc2ab6d715cf68af20b132ef4d02f6f18583b948;hp=7bad05a36c06a0523ea69e9fb3b6dc844f70d65c;hb=HEAD;hpb=403a6925d3258b5d5aa5ed723c334256b883ef24

diff --git a/src/Tools/blocFissure/gmu/casStandard.py b/src/Tools/blocFissure/gmu/casStandard.py
index 7bad05a36..5a4f15886 100644
--- a/src/Tools/blocFissure/gmu/casStandard.py
+++ b/src/Tools/blocFissure/gmu/casStandard.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021  EDF R&D
+# Copyright (C) 2014-2024  EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,6 @@
 import os
 import logging
 
-import GEOM
-import SALOMEDS
-import SMESH
-
 from .geomsmesh import geompy, smesh
 from .geomsmesh import geomPublish
 from .geomsmesh import geomPublishInFather
@@ -54,36 +50,44 @@ class casStandard(fissureGenerique):
   referencesMaillageFissure = None
 
   # ---------------------------------------------------------------------------
-  def __init__ (self, dicoParams, references = None, numeroCas = 0):
+  def __init__ (self, dicoParams, references = None, numeroCas = None):
     initEtude()
     self.references = references
     self.dicoParams = dicoParams
+    self.numeroCas = numeroCas
+
+    if 'nomProbleme' in self.dicoParams:
+      self.nomProbleme = self.dicoParams['nomProbleme']
+
     if 'nomCas' in self.dicoParams:
       self.nomCas = self.dicoParams['nomCas']
     elif 'nomres' in self.dicoParams:
       self.nomCas = os.path.splitext(os.path.split(self.dicoParams['nomres'])[1])[0]
+    elif ( self.numeroCas is not None ):
+      self.nomCas = self.nomProbleme +"_%d"%(self.numeroCas)
     else:
       self.nomCas = 'casStandard'
+
     if 'reptrav' in self.dicoParams:
       self.reptrav = self.dicoParams['reptrav']
     else:
       self.reptrav = os.curdir
-    self.numeroCas = numeroCas
-    if self.numeroCas != 0:
-      self.nomCas = self.nomProbleme +"_%d"%(self.numeroCas)
-    else:
-      self.nomProbleme = self.nomCas
+
     if 'lenSegPipe' in self.dicoParams:
       self.lenSegPipe = self.dicoParams['lenSegPipe']
     else:
-      self.lenSegPipe =self.dicoParams['rayonPipe']
+      self.lenSegPipe = self.dicoParams['rayonPipe']
+
     if 'step' in self.dicoParams:
       step = self.dicoParams['step']
     else:
       step = -1 # exécuter toutes les étapes
+
     if 'aretesVives' not in self.dicoParams:
       self.dicoParams['aretesVives'] = 0
-    if self.numeroCas == 0: # valeur par défaut : exécution immédiate, sinon execution différée dans le cas d'une liste de problèmes
+
+    # valeur par défaut : exécution immédiate, sinon execution différée dans le cas d'une liste de problèmes
+    if ( self.numeroCas is None ):
       self.executeProbleme(step)
 
   # ---------------------------------------------------------------------------
@@ -91,7 +95,7 @@ class casStandard(fissureGenerique):
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(self.dicoParams['maillageSain'])
-    putName(objetSain.GetMesh(), 'objetSain', i_pref=self.numeroCas)
+    putName(objetSain.GetMesh(), objetSain.GetName(), i_pref=self.numeroCas)
 
     return [objetSain, True] # True : maillage hexa
 
@@ -158,8 +162,8 @@ class casStandard(fissureGenerique):
   # ---------------------------------------------------------------------------
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = self.reptrav,
-                                      nomFicSain       = self.nomCas +'_sain',
-                                      nomFicFissure    = self.nomCas,
+                                      nomFicSain       = self.nomCas,
+                                      nomFicFissure    = self.nomProbleme + "_fissure",
                                       nbsegRad         = self.dicoParams['nbSegRad'],
                                       nbsegCercle      = self.dicoParams['nbSegCercle'],
                                       areteFaceFissure = self.dicoParams['areteFaceFissure'],
@@ -167,7 +171,8 @@ class casStandard(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
 
   # ---------------------------------------------------------------------------
@@ -177,7 +182,7 @@ class casStandard(fissureGenerique):
                                   mailleur="MeshGems"):
     maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
                                                maillageFissureParams, elementsDefaut, \
-                                               step, mailleur, self.numeroCas)
+                                               mailleur, self.numeroCas)
     return maillageFissure
 
   # ---------------------------------------------------------------------------