simplification

diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale.py b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
index 71df308c89717690d9f78f7bd0a3b72b0430f742..a2aa580c469f0a96d99055c81ba768d2c06db3ec 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
@@ -180,7 +180,7 @@ def construitFissureGenerale(shapesFissure, shapeFissureParams, \
 
    # --- maillage effectif du pipe
 
 
    # --- maillage effectif du pipe
 

-  (meshPipe, meshPipeGroups, edgesCircPipeGroup) =  \
+  (meshPipe, edgeFaceFissGroup, edgesCircPipeGroup) =  \

       construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
                              nro_cas)
 
       construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
                              nro_cas)
 


@@ -195,7 +195,7 @@ def construitFissureGenerale(shapesFissure, shapeFissureParams, \
   (meshFaceFiss, _, grpEdgesPeauFissureExterne, _) = \
       mailleFacesFissure(faceFissureExterne, \
                          edgesPipeFissureExterneC, edgesPeauFissureExterneC, \
   (meshFaceFiss, _, grpEdgesPeauFissureExterne, _) = \
       mailleFacesFissure(faceFissureExterne, \
                          edgesPipeFissureExterneC, edgesPeauFissureExterneC, \

-                         meshPipeGroups, areteFaceFissure, rayonPipe, nbsegRad, \
+                         edgeFaceFissGroup, areteFaceFissure, rayonPipe, nbsegRad, \

                          mailleur, nro_cas)
 
   # --- maillage faces de peau
                          mailleur, nro_cas)
 
   # --- maillage faces de peau

diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe.py b/src/Tools/blocFissure/gmu/construitMaillagePipe.py
index 17b570594f6e898309df20f4b0213097e3ea2e22..77403b4e1e9138d64620d90ca59bc4e62de53d8f 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe.py
@@ -41,14 +41,12 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
   meshPipe = smesh.Mesh(None, "meshPipe")
   putName(meshPipe, "meshPipe", i_pref=nro_cas)
 
   meshPipe = smesh.Mesh(None, "meshPipe")
   putName(meshPipe, "meshPipe", i_pref=nro_cas)
 

+  edgesCircPipeGroup = list()
+

   fondFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "FONDFISS")
   nodesFondFissGroup = meshPipe.CreateEmptyGroup(SMESH.NODE, "nfondfis")
   faceFissGroup = meshPipe.CreateEmptyGroup(SMESH.FACE, "fisInPi")
   edgeFaceFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeFaceFiss")
   fondFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "FONDFISS")
   nodesFondFissGroup = meshPipe.CreateEmptyGroup(SMESH.NODE, "nfondfis")
   faceFissGroup = meshPipe.CreateEmptyGroup(SMESH.FACE, "fisInPi")
   edgeFaceFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeFaceFiss")

-  edgeCircPipe0Group = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeCircPipe0")
-  edgeCircPipe1Group = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeCircPipe1")
-  faceCircPipe0Group = meshPipe.CreateEmptyGroup(SMESH.FACE, "faceCircPipe0")
-  faceCircPipe1Group = meshPipe.CreateEmptyGroup(SMESH.FACE, "faceCircPipe1")

 
   mptdsk     = list() # vertices de chaque disque au fur et à mesure
   mptsdisks  = list() # vertices maillage de tous les disques
 
   mptdsk     = list() # vertices de chaque disque au fur et à mesure
   mptsdisks  = list() # vertices maillage de tous les disques


@@ -75,7 +73,7 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
       construitMaillagePipe_b(idisk, \
                               idisklim, nbsegCercle, \
                               meshPipe, mptdsk, \
       construitMaillagePipe_b(idisk, \
                               idisklim, nbsegCercle, \
                               meshPipe, mptdsk, \

-                              edgeCircPipe0Group, edgeCircPipe1Group)
+                              edgesCircPipeGroup)

 
     # -----------------------------------------------------------------------
     # --- Les groupes des faces débouchantes
 
     # -----------------------------------------------------------------------
     # --- Les groupes des faces débouchantes


@@ -83,8 +81,7 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
     if idisk in (idisklim[0],idisklim[1]):
       construitMaillagePipe_c(idisk, \
                               idisklim, nbsegCercle, \
     if idisk in (idisklim[0],idisklim[1]):
       construitMaillagePipe_c(idisk, \
                               idisklim, nbsegCercle, \

-                              meshPipe, mptdsk, nbsegRad, \
-                              faceCircPipe0Group, faceCircPipe1Group)
+                              meshPipe, mptdsk, nbsegRad)

 
     # -----------------------------------------------------------------------
     # --- mailles volumiques, groupes noeuds et edges de fond de fissure, groupe de face de fissure
 
     # -----------------------------------------------------------------------
     # --- mailles volumiques, groupes noeuds et edges de fond de fissure, groupe de face de fissure


@@ -100,23 +97,10 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
   _ = pipeFissGroup.AddFrom( meshPipe.GetMesh() )
 
   _, _, _ = meshPipe.MakeBoundaryElements(SMESH.BND_2DFROM3D, "pipeBoundaries")
   _ = pipeFissGroup.AddFrom( meshPipe.GetMesh() )
 
   _, _, _ = meshPipe.MakeBoundaryElements(SMESH.BND_2DFROM3D, "pipeBoundaries")

-  edgesCircPipeGroup = [edgeCircPipe0Group, edgeCircPipe1Group]
-
-  meshPipeGroups = dict(fondFissGroup = fondFissGroup, \
-                        nodesFondFissGroup = nodesFondFissGroup, \
-                        faceFissGroup = faceFissGroup, \
-                        edgeFaceFissGroup = edgeFaceFissGroup, \
-                        edgeCircPipe0Group = edgeCircPipe0Group, \
-                        edgeCircPipe1Group = edgeCircPipe1Group, \
-                        faceCircPipe0Group = faceCircPipe0Group, \
-                        faceCircPipe1Group = faceCircPipe1Group, \
-                        pipeFissGroup = pipeFissGroup, \
-                        edgesCircPipeGroup = edgesCircPipeGroup \
-                        )

 
   #if meshPipe:
     #text = "Arrêt rapide.\n"
     #logging.info(text)
     #raise Exception(text)
 
 
   #if meshPipe:
     #text = "Arrêt rapide.\n"
     #logging.info(text)
     #raise Exception(text)
 

-  return (meshPipe, meshPipeGroups, edgesCircPipeGroup)
+  return (meshPipe, edgeFaceFissGroup, edgesCircPipeGroup)

diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
index b874c493bbc327946da57655368dadbf70ef6bad..76f1d5216d89e33d7e32360e249031c15fd68006 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_b.py
@@ -19,16 +19,19 @@
 #
 """Les groupes des edges des cercles débouchants"""
 
 #
 """Les groupes des edges des cercles débouchants"""
 

+import SMESH
+

 def construitMaillagePipe_b(idisk, \
                             idisklim, nbsegCercle, \
                             meshPipe, mptdsk, \
 def construitMaillagePipe_b(idisk, \
                             idisklim, nbsegCercle, \
                             meshPipe, mptdsk, \

-                            edgeCircPipe0Group, edgeCircPipe1Group):
+                            edgesCircPipeGroup):

   """Les groupes des edges des cercles débouchants"""
   #logging.info('start')
 
   pts = list()
   for n_cercle in range(nbsegCercle):
     pts.append(mptdsk[n_cercle][-1])
   """Les groupes des edges des cercles débouchants"""
   #logging.info('start')
 
   pts = list()
   for n_cercle in range(nbsegCercle):
     pts.append(mptdsk[n_cercle][-1])

+

   edges = list()
   nb_pts = len(pts)
   for n_cercle in range(nb_pts):
   edges = list()
   nb_pts = len(pts)
   for n_cercle in range(nb_pts):


@@ -37,8 +40,11 @@ def construitMaillagePipe_b(idisk, \
     edges.append(id_edge)
 
   if idisk == idisklim[0]:
     edges.append(id_edge)
 
   if idisk == idisklim[0]:

-    edgeCircPipe0Group.Add(edges)
+    groupe = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeCircPipe0")

   else:
   else:

-    edgeCircPipe1Group.Add(edges)
+    groupe = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeCircPipe1")
+
+  groupe.Add(edges)
+  edgesCircPipeGroup.append(groupe)

 
   return
 
   return

diff --git a/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py b/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
index 15eec0e4aaaa92fd99702c68e68aa80a80a91336..342fbfd7983d17a1fdde2983de40cb9248fa1301 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
+++ b/src/Tools/blocFissure/gmu/construitMaillagePipe_c.py
@@ -19,10 +19,11 @@
 #
 """Les groupes des faces débouchantes"""
 
 #
 """Les groupes des faces débouchantes"""
 

+import SMESH
+

 def construitMaillagePipe_c(idisk, \
                             idisklim, nbsegCercle, \
 def construitMaillagePipe_c(idisk, \
                             idisklim, nbsegCercle, \

-                            meshPipe, mptdsk, nbsegRad, \
-                            faceCircPipe0Group, faceCircPipe1Group):
+                            meshPipe, mptdsk, nbsegRad):

   """Les groupes des faces débouchantes"""
   #logging.info('start')
 
   """Les groupes des faces débouchantes"""
   #logging.info('start')
 


@@ -39,8 +40,10 @@ def construitMaillagePipe_c(idisk, \
       faces.append(id_face)
 
   if idisk == idisklim[0]:
       faces.append(id_face)
 
   if idisk == idisklim[0]:

-    faceCircPipe0Group.Add(faces)
+    groupe = meshPipe.CreateEmptyGroup(SMESH.FACE, "faceCircPipe0")

   else:
   else:

-    faceCircPipe1Group.Add(faces)
+    groupe = meshPipe.CreateEmptyGroup(SMESH.FACE, "faceCircPipe1")
+
+  groupe.Add(faces)

 
   return
 
   return

diff --git a/src/Tools/blocFissure/gmu/mailleFacesFissure.py b/src/Tools/blocFissure/gmu/mailleFacesFissure.py
index ca14afbd51c0169548f1cf1e415e74ad18370149..0b63cfa9d27a62639f0cdd95acd058f9a2078cd3 100644 (file)
--- a/src/Tools/blocFissure/gmu/mailleFacesFissure.py
+++ b/src/Tools/blocFissure/gmu/mailleFacesFissure.py
@@ -30,7 +30,7 @@ from .putName import putName
 
 def mailleFacesFissure(faceFissureExterne, \
                        edgesPipeFissureExterneC, edgesPeauFissureExterneC, \
 
 def mailleFacesFissure(faceFissureExterne, \
                        edgesPipeFissureExterneC, edgesPeauFissureExterneC, \

-                       meshPipeGroups, areteFaceFissure, rayonPipe, nbsegRad, \
+                       edgeFaceFissGroup, areteFaceFissure, rayonPipe, nbsegRad, \

                        mailleur="MeshGems", nro_cas=None):
   """maillage faces de fissure"""
   logging.info('start')
                        mailleur="MeshGems", nro_cas=None):
   """maillage faces de fissure"""
   logging.info('start')


@@ -62,7 +62,7 @@ def mailleFacesFissure(faceFissureExterne, \
 
   logging.info("UseExisting1DElements depuis '%s'", edgesPipeFissureExterneC.GetName())
   algo1d = meshFaceFiss.UseExisting1DElements(geom=edgesPipeFissureExterneC)
 
   logging.info("UseExisting1DElements depuis '%s'", edgesPipeFissureExterneC.GetName())
   algo1d = meshFaceFiss.UseExisting1DElements(geom=edgesPipeFissureExterneC)

-  hypo1d = algo1d.SourceEdges([ meshPipeGroups['edgeFaceFissGroup'] ],0,0)
+  hypo1d = algo1d.SourceEdges([ edgeFaceFissGroup ],0,0)

   putName(algo1d.GetSubMesh(), "edgeFissPeau", i_pref=nro_cas)
   putName(algo1d, "algo1d_edgeFissPeau", i_pref=nro_cas)
   putName(hypo1d, "hypo1d_edgeFissPeau", i_pref=nro_cas)
   putName(algo1d.GetSubMesh(), "edgeFissPeau", i_pref=nro_cas)
   putName(algo1d, "algo1d_edgeFissPeau", i_pref=nro_cas)
   putName(hypo1d, "hypo1d_edgeFissPeau", i_pref=nro_cas)