X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FrestreintFaceFissure.py;h=d220f436b8fa2ea68bead48678de45269e211bc9;hb=6cdcd4fb150ef14b95d677a7a8942ae2cfd2ac86;hp=cdda80f8533415932be2b6976ef0f50858fe96d1;hpb=8a9d91b414c3f26586dea735c22c7700898a0a1e;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/gmu/restreintFaceFissure.py b/src/Tools/blocFissure/gmu/restreintFaceFissure.py
index cdda80f85..d220f436b 100644
--- a/src/Tools/blocFissure/gmu/restreintFaceFissure.py
+++ b/src/Tools/blocFissure/gmu/restreintFaceFissure.py
@@ -1,27 +1,53 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2014-2021  EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+"""Restriction de la face de fissure au domaine solide"""
 
 import logging
+
+import traceback
+
 from .geomsmesh import geompy
 from .geomsmesh import geomPublish
-from .geomsmesh import geomPublishInFather
+
 from . import initLog
+
 from .sortFaces import sortFaces
-import traceback
 from .fissError import fissError
 
-def restreintFaceFissure(shapeDefaut, facesDefaut, pointInterne):
-  """
-  restriction de la face de fissure au domaine solide
+def restreintFaceFissure(shapeDefaut, facesDefaut, pointInterne, \
+                         nro_cas=None):
+  """restriction de la face de fissure au domaine solide
+
   partition face fissure étendue par fillings
   """
   logging.info('start')
+
   partShapeDefaut = geompy.MakePartition([shapeDefaut], facesDefaut, [], [], geompy.ShapeType["FACE"], 0, [], 0)
-  geomPublish(initLog.debug, partShapeDefaut, 'partShapeDefaut')
+  geomPublish(initLog.debug, partShapeDefaut, 'partShapeDefaut', i_pref=nro_cas)
   facesPartShapeDefaut = geompy.ExtractShapes(partShapeDefaut, geompy.ShapeType["FACE"], False)
+
   if pointInterne is not None:
     distfaces = [(geompy.MinDistance(face,pointInterne), i, face) for i, face in enumerate(facesPartShapeDefaut)]
     distfaces.sort()
-    logging.debug("selection de la face la plus proche du point interne, distance=%s",distfaces[0][0])
+    texte = "Sélection de la face la plus proche du point interne, distance={}".format(distfaces[0][0])
+    logging.debug(texte)
     facesPortFissure = distfaces[0][2]
   else:
     try:
@@ -34,8 +60,10 @@ def restreintFaceFissure(shapeDefaut, facesDefaut, pointInterne):
       texte += "<li>le prémaillage de la face de fissure est trop grossier, les mailles à enlever dans le maillage sain "
       texte += "n'ont pas toutes été détectées.</li></ul>"
       raise fissError(traceback.extract_stack(),texte)
-    logging.debug("surfaces faces fissure étendue, min %s, max %s", minSurf, maxSurf)
+    texte = "surfaces faces fissure étendue, min {}, max {}".format(minSurf, maxSurf)
+    logging.debug(texte)
     facesPortFissure = facesPartShapeDefautSorted[-1]
-  
-  geomPublish(initLog.debug, facesPortFissure, "facesPortFissure")
+
+  geomPublish(initLog.debug, facesPortFissure, "facesPortFissure", i_pref=nro_cas)
+
   return facesPortFissure