X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FpeauInterne.py;h=6c241a75ce883946ce0fd04bd8e04e82c1281828;hb=f44efbc02056a2734440b736789b8cfa380430bb;hp=4e4004e404549110ad3b99a338121a6e991e721c;hpb=8d297d6698f361d4f2dde723050bcfbaea050920;p=modules%2Fsmesh.git
diff --git a/src/Tools/blocFissure/gmu/peauInterne.py b/src/Tools/blocFissure/gmu/peauInterne.py
index 4e4004e40..6c241a75c 100644
--- a/src/Tools/blocFissure/gmu/peauInterne.py
+++ b/src/Tools/blocFissure/gmu/peauInterne.py
@@ -1,77 +1,107 @@
# -*- 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
+#
+"""Peau interne du defaut dans le maillage sain"""
import logging
-from .geomsmesh import smesh
-import SMESH
import traceback
-from .fissError import fissError
+import SMESH
+
+from .geomsmesh import smesh
+
+from .fissError import fissError
from .listOfExtraFunctions import lookForCorner
from .fusionMaillageAttributionDefaut import fusionMaillageDefaut
-# -----------------------------------------------------------------------------
-# --- peau interne du defaut dans le maillage sain
-
def peauInterne(fichierMaillage, shapeDefaut, nomZones):
- """
- Retrouve les groupes de défaut dans le maillage sain modifié par CreateHoleSkin (CreeZoneDefautMaillage)
+ """Retrouve les groupes de défaut dans le maillage sain modifié par CreateHoleSkin (CreeZoneDefautMaillage)
+
On récupère le volume et la peau de la zone de défaut, les éventuelles faces et arêtes internes de cette zone.
+ Remarque : intérêt du passage par fichierMaillage plutôt que par maillageSain ?
"""
logging.info("start")
- ([maillageSain], status) = smesh.CreateMeshesFromMED(fichierMaillage)
+ ([maillageSain], _) = smesh.CreateMeshesFromMED(fichierMaillage)
groups = maillageSain.GetGroups()
+ #print ("groupes :")
+ #for grp in groups:
+ #print ("\t{}".format(grp.GetName()))
zoneDefaut = None
for grp in groups:
logging.debug("groupe %s",grp.GetName())
if grp.GetName() == nomZones + "_vol":
zoneDefaut = grp
break
+ #print ("zoneDefaut = {}".format(zoneDefaut))
zoneDefaut_skin = None
for grp in groups:
if grp.GetName() == nomZones + "_skin":
zoneDefaut_skin = grp
break
+ #print ("zoneDefaut_skin = {}".format(zoneDefaut_skin))
zoneDefaut_internalFaces = None
for grp in groups:
if grp.GetName() == nomZones + "_internalFaces":
zoneDefaut_internalFaces = grp
break
+ #print ("zoneDefaut_internalFaces = {}".format(zoneDefaut_internalFaces))
zoneDefaut_internalEdges = None
for grp in groups:
if grp.GetName() == nomZones + "_internalEdges":
zoneDefaut_internalEdges = grp
break
-
+ #print ("zoneDefaut_internalEdges = {}".format(zoneDefaut_internalEdges))
+
# --- Le groupe ZoneDefaut ne doit contenir que des Hexaèdres"
-
- info=maillageSain.GetMeshInfo(zoneDefaut)
- keys = list(info.keys()); keys.sort()
- nbelem=0
- nbhexa=0
- for i in keys:
- #print " %s : %d" % ( i, info[i] )
- nbelem+=info[i]
- if "Entity_Hexa" in str(i):
- nbhexa+=info[i]
- if (nbelem == 0) or (nbhexa < nbelem) :
+
+ info = maillageSain.GetMeshInfo(zoneDefaut)
+ #print ("info = {}".format(info))
+ nbelem = 0
+ nbhexa = 0
+ for entity_type in info:
+ #print (". {} : {})".format(entity_type, info[entity_type]))
+ nbelem += info[entity_type]
+ if ( str(entity_type) == "Entity_Hexa" ):
+ nbhexa += info[entity_type]
+ nbhexa += info[entity_type]
+ #print ("==> nbelem = {}, nbhexa = {}".format(nbelem,nbhexa))
+
+ if ( (nbelem == 0) or (nbhexa < nbelem) ):
+ print ("==> nbelem = {}, nbhexa = {}".format(nbelem,nbhexa))
texte = "La zone a remailler est incorrecte.
"
texte += "Causes possibles :