simplification

This commit is contained in:
GERALD NICOLAS 2021-04-15 16:05:00 +02:00
parent eb7885b577
commit 2cf6435f14
5 changed files with 25 additions and 32 deletions

View File

@ -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, \ construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
nro_cas) nro_cas)
@ -195,7 +195,7 @@ def construitFissureGenerale(shapesFissure, shapeFissureParams, \
(meshFaceFiss, _, grpEdgesPeauFissureExterne, _) = \ (meshFaceFiss, _, grpEdgesPeauFissureExterne, _) = \
mailleFacesFissure(faceFissureExterne, \ mailleFacesFissure(faceFissureExterne, \
edgesPipeFissureExterneC, edgesPeauFissureExterneC, \ edgesPipeFissureExterneC, edgesPeauFissureExterneC, \
meshPipeGroups, areteFaceFissure, rayonPipe, nbsegRad, \ edgeFaceFissGroup, areteFaceFissure, rayonPipe, nbsegRad, \
mailleur, nro_cas) mailleur, nro_cas)
# --- maillage faces de peau # --- maillage faces de peau

View File

@ -41,14 +41,12 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
meshPipe = smesh.Mesh(None, "meshPipe") meshPipe = smesh.Mesh(None, "meshPipe")
putName(meshPipe, "meshPipe", i_pref=nro_cas) putName(meshPipe, "meshPipe", i_pref=nro_cas)
edgesCircPipeGroup = list()
fondFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "FONDFISS") fondFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "FONDFISS")
nodesFondFissGroup = meshPipe.CreateEmptyGroup(SMESH.NODE, "nfondfis") nodesFondFissGroup = meshPipe.CreateEmptyGroup(SMESH.NODE, "nfondfis")
faceFissGroup = meshPipe.CreateEmptyGroup(SMESH.FACE, "fisInPi") faceFissGroup = meshPipe.CreateEmptyGroup(SMESH.FACE, "fisInPi")
edgeFaceFissGroup = meshPipe.CreateEmptyGroup(SMESH.EDGE, "edgeFaceFiss") 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 mptdsk = list() # vertices de chaque disque au fur et à mesure
mptsdisks = list() # vertices maillage de tous les disques mptsdisks = list() # vertices maillage de tous les disques
@ -75,7 +73,7 @@ def construitMaillagePipe(gptsdisks, idisklim, nbsegCercle, nbsegRad, \
construitMaillagePipe_b(idisk, \ construitMaillagePipe_b(idisk, \
idisklim, nbsegCercle, \ idisklim, nbsegCercle, \
meshPipe, mptdsk, \ 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]): if idisk in (idisklim[0],idisklim[1]):
construitMaillagePipe_c(idisk, \ construitMaillagePipe_c(idisk, \
idisklim, nbsegCercle, \ idisklim, nbsegCercle, \
meshPipe, mptdsk, nbsegRad, \ meshPipe, mptdsk, nbsegRad)
faceCircPipe0Group, faceCircPipe1Group)
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# --- 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() ) _ = pipeFissGroup.AddFrom( meshPipe.GetMesh() )
_, _, _ = meshPipe.MakeBoundaryElements(SMESH.BND_2DFROM3D, "pipeBoundaries") _, _, _ = 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: #if meshPipe:
#text = "Arrêt rapide.\n" #text = "Arrêt rapide.\n"
#logging.info(text) #logging.info(text)
#raise Exception(text) #raise Exception(text)
return (meshPipe, meshPipeGroups, edgesCircPipeGroup) return (meshPipe, edgeFaceFissGroup, edgesCircPipeGroup)

View File

@ -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, \ def construitMaillagePipe_b(idisk, \
idisklim, nbsegCercle, \ idisklim, nbsegCercle, \
meshPipe, mptdsk, \ meshPipe, mptdsk, \
edgeCircPipe0Group, edgeCircPipe1Group): edgesCircPipeGroup):
"""Les groupes des edges des cercles débouchants""" """Les groupes des edges des cercles débouchants"""
#logging.info('start') #logging.info('start')
pts = list() pts = list()
for n_cercle in range(nbsegCercle): for n_cercle in range(nbsegCercle):
pts.append(mptdsk[n_cercle][-1]) pts.append(mptdsk[n_cercle][-1])
edges = list() edges = list()
nb_pts = len(pts) nb_pts = len(pts)
for n_cercle in range(nb_pts): for n_cercle in range(nb_pts):
@ -37,8 +40,11 @@ def construitMaillagePipe_b(idisk, \
edges.append(id_edge) edges.append(id_edge)
if idisk == idisklim[0]: 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

View File

@ -19,10 +19,11 @@
# #
"""Les groupes des faces débouchantes""" """Les groupes des faces débouchantes"""
import SMESH
def construitMaillagePipe_c(idisk, \ def construitMaillagePipe_c(idisk, \
idisklim, nbsegCercle, \ idisklim, nbsegCercle, \
meshPipe, mptdsk, nbsegRad, \ meshPipe, mptdsk, nbsegRad):
faceCircPipe0Group, faceCircPipe1Group):
"""Les groupes des faces débouchantes""" """Les groupes des faces débouchantes"""
#logging.info('start') #logging.info('start')
@ -39,8 +40,10 @@ def construitMaillagePipe_c(idisk, \
faces.append(id_face) faces.append(id_face)
if idisk == idisklim[0]: 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

View File

@ -30,7 +30,7 @@ from .putName import putName
def mailleFacesFissure(faceFissureExterne, \ def mailleFacesFissure(faceFissureExterne, \
edgesPipeFissureExterneC, edgesPeauFissureExterneC, \ edgesPipeFissureExterneC, edgesPeauFissureExterneC, \
meshPipeGroups, areteFaceFissure, rayonPipe, nbsegRad, \ edgeFaceFissGroup, areteFaceFissure, rayonPipe, nbsegRad, \
mailleur="MeshGems", nro_cas=None): mailleur="MeshGems", nro_cas=None):
"""maillage faces de fissure""" """maillage faces de fissure"""
logging.info('start') logging.info('start')
@ -62,7 +62,7 @@ def mailleFacesFissure(faceFissureExterne, \
logging.info("UseExisting1DElements depuis '%s'", edgesPipeFissureExterneC.GetName()) logging.info("UseExisting1DElements depuis '%s'", edgesPipeFissureExterneC.GetName())
algo1d = meshFaceFiss.UseExisting1DElements(geom=edgesPipeFissureExterneC) 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.GetSubMesh(), "edgeFissPeau", i_pref=nro_cas)
putName(algo1d, "algo1d_edgeFissPeau", i_pref=nro_cas) putName(algo1d, "algo1d_edgeFissPeau", i_pref=nro_cas)
putName(hypo1d, "hypo1d_edgeFissPeau", i_pref=nro_cas) putName(hypo1d, "hypo1d_edgeFissPeau", i_pref=nro_cas)