general crack dialog: working on log...

[modules/smesh.git] / src / Tools / blocFissure / gmu / construitFissureGenerale.py

diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale.py b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
index f6858132f469a8aaec7bb8b1a8e771f69bf1b61e..f75c2742b5482481cc21d9b80e6b8394b6b9c49a 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
@@ -3,12 +3,16 @@
 import logging
 import salome
 from geomsmesh import geompy
 import logging
 import salome
 from geomsmesh import geompy

+from geomsmesh import geomPublish
+from geomsmesh import geomPublishInFather
+import initLog

 import GEOM
 from geomsmesh import smesh
 from salome.smesh import smeshBuilder
 import SMESH
 import math
 import bisect
 import GEOM
 from geomsmesh import smesh
 from salome.smesh import smeshBuilder
 import SMESH
 import math
 import bisect

+import traceback

 
 # from extractionOrientee import extractionOrientee
 # from extractionOrienteeMulti import extractionOrienteeMulti
 
 # from extractionOrientee import extractionOrientee
 # from extractionOrienteeMulti import extractionOrienteeMulti


@@ -48,6 +52,7 @@ from construitMaillagePipe import construitMaillagePipe
 from mailleAretesEtJonction import mailleAretesEtJonction
 from mailleFacesFissure import mailleFacesFissure
 from mailleFacesPeau import mailleFacesPeau
 from mailleAretesEtJonction import mailleAretesEtJonction
 from mailleFacesFissure import mailleFacesFissure
 from mailleFacesPeau import mailleFacesPeau

+from fissError import fissError

 
 # -----------------------------------------------------------------------------
 # --- procédure complète fissure générale
 
 # -----------------------------------------------------------------------------
 # --- procédure complète fissure générale


@@ -130,7 +135,7 @@ def construitFissureGenerale(maillagesSains,
   (fissPipe, edgesPipeFiss, edgesFondFiss, wirePipeFiss, wireFondFiss) = partitionneFissureParPipe(shapesFissure, elementsDefaut, rayonPipe)
   edgesFondFiss, edgesIdByOrientation = orderEdgesFromWire(wireFondFiss)
   for i,edge in enumerate(edgesFondFiss):
   (fissPipe, edgesPipeFiss, edgesFondFiss, wirePipeFiss, wireFondFiss) = partitionneFissureParPipe(shapesFissure, elementsDefaut, rayonPipe)
   edgesFondFiss, edgesIdByOrientation = orderEdgesFromWire(wireFondFiss)
   for i,edge in enumerate(edgesFondFiss):

-    geompy.addToStudyInFather(wireFondFiss, edge, "edgeFondFiss%d"%i)
+    geomPublishInFather(initLog.debug, wireFondFiss, edge, "edgeFondFiss%d"%i)

   
   # --- peau et face de fissure
   #
   
   # --- peau et face de fissure
   #


@@ -154,8 +159,8 @@ def construitFissureGenerale(maillagesSains,
   nbFacesFilling = len(partitionsPeauFissFond)
   
   ptEdgeFond = [ []  for i in range(nbFacesFilling)] # pour chaque face [points edge fond de fissure aux débouchés du pipe]
   nbFacesFilling = len(partitionsPeauFissFond)
   
   ptEdgeFond = [ []  for i in range(nbFacesFilling)] # pour chaque face [points edge fond de fissure aux débouchés du pipe]

-  facesPipePeau = [ []  for i in range(nbFacesFilling)] # pour chaque face [faces du pipe débouchantes]
-  edgeRadFacePipePeau = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge radiale des faces du pipe débouchantes ]
+  fsPipePeau = [ []  for i in range(nbFacesFilling)] # pour chaque face [faces du pipe débouchantes]
+  edRadFPiPo = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge radiale des faces du pipe débouchantes ]

   fsFissuExt = [ []  for i in range(nbFacesFilling)] # pour chaque face [faces de fissure externes au pipe]
   edFisExtPe = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge en peau des faces de fissure externes (pas subshape facePeau)]
   edFisExtPi = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge commun au pipe des faces de fissure externes]
   fsFissuExt = [ []  for i in range(nbFacesFilling)] # pour chaque face [faces de fissure externes au pipe]
   edFisExtPe = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge en peau des faces de fissure externes (pas subshape facePeau)]
   edFisExtPi = [ []  for i in range(nbFacesFilling)] # pour chaque face [edge commun au pipe des faces de fissure externes]


@@ -174,8 +179,8 @@ def construitFissureGenerale(maillagesSains,
                                                                       facesDefaut, centreFondFiss, rayonPipe,
                                                                       aretesVivesCoupees)      
       ptEdgeFond[ifil] = dataPPFF['endsEdgeFond']
                                                                       facesDefaut, centreFondFiss, rayonPipe,
                                                                       aretesVivesCoupees)      
       ptEdgeFond[ifil] = dataPPFF['endsEdgeFond']

-      facesPipePeau[ifil] = dataPPFF['facesPipePeau']
-      edgeRadFacePipePeau[ifil] = dataPPFF['edgeRadFacePipePeau']
+      fsPipePeau[ifil] = dataPPFF['facesPipePeau']
+      edRadFPiPo[ifil] = dataPPFF['edgeRadFacePipePeau']

       fsFissuExt[ifil] = dataPPFF['facesFissExt']
       edFisExtPe[ifil] = dataPPFF['edgesFissExtPeau']
       edFisExtPi[ifil] = dataPPFF['edgesFissExtPipe']
       fsFissuExt[ifil] = dataPPFF['facesFissExt']
       edFisExtPe[ifil] = dataPPFF['edgesFissExtPeau']
       edFisExtPi[ifil] = dataPPFF['edgesFissExtPipe']


@@ -187,10 +192,15 @@ def construitFissureGenerale(maillagesSains,
       edFissPeau[ifil] = dataPPFF['edgesFissurePeau']
       ptFisExtPi[ifil] = dataPPFF['verticesPipePeau']
 
       edFissPeau[ifil] = dataPPFF['edgesFissurePeau']
       ptFisExtPi[ifil] = dataPPFF['verticesPipePeau']
 

+  facesPipePeau = []
+  edgeRadFacePipePeau = []
+  for ifil in range(nbFacesFilling):
+    facesPipePeau += fsPipePeau[ifil]
+    edgeRadFacePipePeau += edRadFPiPo[ifil]

   
   for i, avc in enumerate(aretesVivesCoupees):
     name = "areteViveCoupee%d"%i
   
   for i, avc in enumerate(aretesVivesCoupees):
     name = "areteViveCoupee%d"%i

-    geompy.addToStudy(avc, name)
+    geomPublish(initLog.debug, avc, name)

   
   # --- identification des faces et edges de fissure externe pour maillage
   
   
   # --- identification des faces et edges de fissure externe pour maillage