From: GERALD NICOLAS <D68518@dsp0864451.atlas.edf.fr>
Date: Thu, 15 Apr 2021 12:47:43 +0000 (+0200)
Subject: Ménage dans les imports
X-Git-Tag: V9_7_0a1~3^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=6cdcd4fb150ef14b95d677a7a8942ae2cfd2ac86

Ménage dans les imports
---

diff --git a/src/Tools/blocFissure/gmu/casStandard.py b/src/Tools/blocFissure/gmu/casStandard.py
index f7f1ce7be..0243a84e9 100644
--- a/src/Tools/blocFissure/gmu/casStandard.py
+++ b/src/Tools/blocFissure/gmu/casStandard.py
@@ -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
diff --git a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes.py b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes.py
index 03d1d1244..eaa260e8d 100644
--- a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes.py
+++ b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes.py
@@ -20,9 +20,6 @@
 """Construit les arêtes débouchantes"""
 
 import logging
-import GEOM
-
-from . import initLog
 
 from .construitEdgesRadialesDebouchantes_a import construitEdgesRadialesDebouchantes_a
 from .construitEdgesRadialesDebouchantes_b import construitEdgesRadialesDebouchantes_b
diff --git a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_b.py b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_b.py
index 4f7275dd9..3d35e934d 100644
--- a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_b.py
+++ b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_b.py
@@ -20,11 +20,11 @@
 """Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
 
 import logging
-import GEOM
 
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
-from . import initLog
+#from .geomsmesh import geomPublish
+
+#from . import initLog
 
 def construitEdgesRadialesDebouchantes_b(facesPipePeau, facesDebouchantes, listNappes):
   """Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
diff --git a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_c.py b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_c.py
index 44f9525aa..6a4377079 100644
--- a/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_c.py
+++ b/src/Tools/blocFissure/gmu/construitEdgesRadialesDebouchantes_c.py
@@ -20,11 +20,12 @@
 """Construction des listes d'edges radiales sur chaque extrémité débouchante"""
 
 import logging
-import GEOM
 
 from .geomsmesh import geompy
 from .geomsmesh import geomPublish
+
 from . import initLog
+
 from .sortEdges import sortEdges
 
 def construitEdgesRadialesDebouchantes_c(facesPipePeau, edgeRadFacePipePeau, \
diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale.py b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
index 060805323..3b0dd6767 100644
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
@@ -25,8 +25,6 @@ from . import initLog
 
 import salome
 from salome.smesh import smeshBuilder
-import GEOM
-import SMESH
 
 from .geomsmesh import geompy
 from .geomsmesh import geomPublishInFather
diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py b/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
index 4143dc3c1..e46ddf28d 100644
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
@@ -23,13 +23,10 @@ import os
 
 import logging
 
-import salome
 from salome.smesh import smeshBuilder
-import GEOM
 import SMESH
 
 from .geomsmesh import geompy
-from .geomsmesh import smesh
 
 from .putName import putName
 from .enleveDefaut import enleveDefaut
diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_a.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_a.py
index 1db8dd88f..596266968 100644
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_a.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_a.py
@@ -19,8 +19,6 @@
 #
 """Les points"""
 
-import logging
-
 from .geomsmesh import geompy
 
 def construitMaillagePipe_a(idisk, \
diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
index 1b8bf7efe..b874c493b 100644
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
@@ -19,8 +19,6 @@
 #
 """Les groupes des edges des cercles débouchants"""
 
-import logging
-
 def construitMaillagePipe_b(idisk, \
                             idisklim, nbsegCercle, \
                             meshPipe, mptdsk, \
diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
index 0c6fd1c9b..15eec0e4a 100644
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
@@ -19,8 +19,6 @@
 #
 """Les groupes des faces débouchantes"""
 
-import logging
-
 def construitMaillagePipe_c(idisk, \
                             idisklim, nbsegCercle, \
                             meshPipe, mptdsk, nbsegRad, \
diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_d.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_d.py
index 722bd4903..5fbd170f1 100644
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_d.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_d.py
@@ -19,10 +19,6 @@
 #
 """Mailles volumiques, groupes noeuds et edges de fond de fissure, groupe de face de fissure"""
 
-import logging
-
-import SMESH
-
 def construitMaillagePipe_d(idisk, \
                             idisklim, nbsegCercle, nbsegRad, \
                             meshPipe, mptdsk, oldmpts, \
diff --git a/src/Tools/blocFissure/gmu/creeZoneDefautDansObjetSain.py b/src/Tools/blocFissure/gmu/creeZoneDefautDansObjetSain.py
index d3ee31437..24bfeff6c 100644
--- a/src/Tools/blocFissure/gmu/creeZoneDefautDansObjetSain.py
+++ b/src/Tools/blocFissure/gmu/creeZoneDefautDansObjetSain.py
@@ -22,8 +22,6 @@
 import os
 
 import logging
-import SMESH
-import SALOMEDS
 
 from .geomsmesh import smesh
 
diff --git a/src/Tools/blocFissure/gmu/facesCirculaires.py b/src/Tools/blocFissure/gmu/facesCirculaires.py
index 9af6c3c27..88636eb11 100644
--- a/src/Tools/blocFissure/gmu/facesCirculaires.py
+++ b/src/Tools/blocFissure/gmu/facesCirculaires.py
@@ -23,6 +23,8 @@ import logging
 
 from . import initLog
 
+import GEOM
+
 from .geomsmesh import geompy
 from .geomsmesh import geomPublishInFather
 
diff --git a/src/Tools/blocFissure/gmu/findWireEndVertices.py b/src/Tools/blocFissure/gmu/findWireEndVertices.py
index cf70523f0..e469f43b9 100644
--- a/src/Tools/blocFissure/gmu/findWireEndVertices.py
+++ b/src/Tools/blocFissure/gmu/findWireEndVertices.py
@@ -21,8 +21,6 @@
 
 import logging
 
-from . import initLog
-
 from .geomsmesh import geompy
 
 from .findWireVertices import findWireVertices
diff --git a/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py b/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
index 015f63667..1245e2345 100644
--- a/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
+++ b/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
@@ -21,8 +21,6 @@
 
 import logging
 
-from . import initLog
-
 from .geomsmesh import geompy
 
 from .findWireVertices import findWireVertices
diff --git a/src/Tools/blocFissure/gmu/fissureCoude.py b/src/Tools/blocFissure/gmu/fissureCoude.py
index ad1154e5f..e5b22727d 100644
--- a/src/Tools/blocFissure/gmu/fissureCoude.py
+++ b/src/Tools/blocFissure/gmu/fissureCoude.py
@@ -24,7 +24,6 @@ import os
 import logging
 import math
 import GEOM
-import SALOMEDS
 import SMESH
 
 from . import initLog
diff --git a/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py b/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py
index 3305bac0f..0633c3040 100644
--- a/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py
+++ b/src/Tools/blocFissure/gmu/getStatsMaillageFissure.py
@@ -21,8 +21,6 @@
 
 import os
 import logging
-import SMESH
-
 
 def getStatsMaillageFissure(maillage, referencesMaillageFissure, maillageFissureParams):
   """"Statistiques maillage"""
diff --git a/src/Tools/blocFissure/gmu/initEtude.py b/src/Tools/blocFissure/gmu/initEtude.py
index 58a9b68eb..f97fe16ce 100644
--- a/src/Tools/blocFissure/gmu/initEtude.py
+++ b/src/Tools/blocFissure/gmu/initEtude.py
@@ -19,8 +19,6 @@
 #
 """Création d'une nouvelle étude"""
 
-import logging
-
 def initEtude():
   """Création nouvelle etude salome"""
   from . import geomsmesh
diff --git a/src/Tools/blocFissure/gmu/insereFissureElliptique.py b/src/Tools/blocFissure/gmu/insereFissureElliptique.py
index aa0e945f7..bf7bef0d2 100644
--- a/src/Tools/blocFissure/gmu/insereFissureElliptique.py
+++ b/src/Tools/blocFissure/gmu/insereFissureElliptique.py
@@ -24,7 +24,6 @@ import os
 import logging
 
 import salome
-import SMESH
 
 from .partitionBlocDefaut import partitionBlocDefaut
 from .facesVolumesToriques import facesVolumesToriques
@@ -39,9 +38,6 @@ from .enleveDefaut import enleveDefaut
 from .regroupeSainEtDefaut import RegroupeSainEtDefaut
 from .putName import putName
 
-# -----------------------------------------------------------------------------
-# --- procedure complete fissure elliptique
-
 def insereFissureElliptique(geometriesSaines, maillagesSains, \
                             shapesFissure, shapeFissureParams, \
                             maillageFissureParams, elementsDefaut, step=-1):
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_a.py b/src/Tools/blocFissure/gmu/insereFissureLongue_a.py
index cd8b719ed..6cff91ff6 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_a.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_a.py
@@ -21,8 +21,6 @@
 
 import logging
 
-import salome
-
 from .geomsmesh import geompy
 from .geomsmesh import geomPublish
 from .geomsmesh import geomPublishInFather
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_b.py b/src/Tools/blocFissure/gmu/insereFissureLongue_b.py
index 247a38cf8..2cad3c053 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_b.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_b.py
@@ -21,8 +21,6 @@
 
 import logging
 
-import salome
-from salome.smesh import smeshBuilder
 import SMESH
 
 from .geomsmesh import geompy
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_c.py b/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
index 1ddd26c58..3d4fe3e0a 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
@@ -22,7 +22,6 @@
 import logging
 import math
 
-import salome
 from salome.smesh import smeshBuilder
 import SMESH
 
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_d.py b/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
index 394012b7c..206b71c6b 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
@@ -21,7 +21,6 @@
 
 import logging
 
-import salome
 from salome.smesh import smeshBuilder
 import SMESH
 
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_e.py b/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
index 34e9592b1..3a505845e 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
@@ -24,7 +24,6 @@ import math
 
 import SMESH
 from salome.smesh import smeshBuilder
-import salome
 
 from .geomsmesh import smesh
 
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_f.py b/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
index c2891d1f3..034d5b0ec 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
@@ -21,7 +21,6 @@
 
 import logging
 
-import salome
 from salome.smesh import smeshBuilder
 import SMESH
 
diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_g.py b/src/Tools/blocFissure/gmu/insereFissureLongue_g.py
index ff534b01b..17847c0d2 100644
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_g.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_g.py
@@ -21,7 +21,6 @@
 
 import logging
 
-import salome
 import SMESH
 
 from .geomsmesh import geompy
diff --git a/src/Tools/blocFissure/gmu/mailleFacesPeau.py b/src/Tools/blocFissure/gmu/mailleFacesPeau.py
index 4da78f07f..e8289c22f 100644
--- a/src/Tools/blocFissure/gmu/mailleFacesPeau.py
+++ b/src/Tools/blocFissure/gmu/mailleFacesPeau.py
@@ -138,7 +138,7 @@ def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
         texte = "i_aux = {}".format(i_aux)
         logging.info(texte)
         if edgeCirc is not None:
-          logging.info("UseExisting1DElements depuis edgeCirc ='%s'", edgeCirc.GetName())
+          logging.info("UseExisting1DElements depuis edgeCirc = '%s'", edgeCirc.GetName())
           algo1d = meshFacePeau.UseExisting1DElements(geom=edgeCirc) # addToStudy() failed ?
           if boutFromIfil[ifil] is None:
             hypo1d = algo1d.SourceEdges([ edgesCircPipeGroup[i_aux] ],0,0)
diff --git a/src/Tools/blocFissure/gmu/partitionVolumeSain.py b/src/Tools/blocFissure/gmu/partitionVolumeSain.py
index 5e3bf41f6..3d713249c 100644
--- a/src/Tools/blocFissure/gmu/partitionVolumeSain.py
+++ b/src/Tools/blocFissure/gmu/partitionVolumeSain.py
@@ -21,6 +21,8 @@
 
 import logging
 
+import GEOM
+
 from .geomsmesh import geompy
 from .geomsmesh import geomPublish
 from .geomsmesh import geomPublishInFather