Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2954ed
)
Ajout d'un préfix aux noms des objets SMESH - début
author
GERALD NICOLAS
<D68518@dsp0864451.atlas.edf.fr>
Mon, 29 Mar 2021 16:13:22 +0000
(18:13 +0200)
committer
GERALD NICOLAS
<D68518@dsp0864451.atlas.edf.fr>
Mon, 29 Mar 2021 16:13:22 +0000
(18:13 +0200)
13 files changed:
src/Tools/blocFissure/CasTests/cubeAngle.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/cylindre.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/ellipse_1.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/eprouvetteDroite.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/faceGauche.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/faceGauche_2.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/tube.py
patch
|
blob
|
history
src/Tools/blocFissure/CasTests/vis_1.py
patch
|
blob
|
history
src/Tools/blocFissure/gmu/construitFissureGenerale.py
patch
|
blob
|
history
src/Tools/blocFissure/gmu/fissureCoude.py
patch
|
blob
|
history
src/Tools/blocFissure/gmu/mailleFacesPeau.py
patch
|
blob
|
history
src/Tools/blocFissure/gmu/putName.py
patch
|
blob
|
history
diff --git
a/src/Tools/blocFissure/CasTests/cubeAngle.py
b/src/Tools/blocFissure/CasTests/cubeAngle.py
index 236b7ea46e8a4303048325bd18b7d0ff47ac6322..ba5392e5a3d94d46a481ffc5b5a044ceaa1f0651 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/cubeAngle.py
+++ b/
src/Tools/blocFissure/CasTests/cubeAngle.py
@@
-113,7
+113,7
@@
class cubeAngle(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/cylindre.py
b/src/Tools/blocFissure/CasTests/cylindre.py
index 4da9161661d16eddb5bc9ea11fa8fb766a8bc93c..2e01fb91b616eca818fb057d019d16e183604ac8 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/cylindre.py
+++ b/
src/Tools/blocFissure/CasTests/cylindre.py
@@
-108,7
+108,7
@@
class cylindre(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/ellipse_1.py
b/src/Tools/blocFissure/CasTests/ellipse_1.py
index 7ca10b8c104a6902a4e5742cb41cf0b6ec5210fd..08c8187db9afab86552b31208a636e568e3d97a3 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/ellipse_1.py
+++ b/
src/Tools/blocFissure/CasTests/ellipse_1.py
@@
-122,7
+122,7
@@
class ellipse_1(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
index d3110d863e6789bf07bc290178bdc5333d7df93a..30e0a2ac7a4e6ad69b2022ba4f79ce78097745a7 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
+++ b/
src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
@@
-116,7
+116,7
@@
class eprouvetteCourbe(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/eprouvetteDroite.py
b/src/Tools/blocFissure/CasTests/eprouvetteDroite.py
index 8122f01a9da320fd7d77d687e9b64a5fdbe1c9a0..150dc5c6268800b1581e1715b6e239a5f09dca93 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/eprouvetteDroite.py
+++ b/
src/Tools/blocFissure/CasTests/eprouvetteDroite.py
@@
-113,7
+113,7
@@
class eprouvetteDroite(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/faceGauche.py
b/src/Tools/blocFissure/CasTests/faceGauche.py
index 1427d943c9ad4e7cdb382cae1e52a97a2b15c70f..739f74eb1205ebc856678d62f4a5073103f2e125 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/
src/Tools/blocFissure/CasTests/faceGauche.py
@@
-111,7
+111,7
@@
class faceGauche(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/faceGauche_2.py
b/src/Tools/blocFissure/CasTests/faceGauche_2.py
index e3863efc5185643a45d4d191dacc36776cb02708..f624f8764409dd50e605e08cb434a8bd1474c459 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/faceGauche_2.py
+++ b/
src/Tools/blocFissure/CasTests/faceGauche_2.py
@@
-113,7
+113,7
@@
class faceGauche_2(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/tube.py
b/src/Tools/blocFissure/CasTests/tube.py
index 3653c9ac3788d23eb61bd4142522b4e41a86e38a..c579b384d475576a0cb7276801d8e9f178e587f8 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/tube.py
+++ b/
src/Tools/blocFissure/CasTests/tube.py
@@
-118,7
+118,7
@@
class tube(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/CasTests/vis_1.py
b/src/Tools/blocFissure/CasTests/vis_1.py
index f7b07a0b5a294f9350bc1cd61c88c9d9efa2ae0a..b1f2dde7c525ba2b8bed0019d80a97131c7e0170 100644
(file)
--- a/
src/Tools/blocFissure/CasTests/vis_1.py
+++ b/
src/Tools/blocFissure/CasTests/vis_1.py
@@
-119,7
+119,7
@@
class vis_1(fissureGenerique):
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur = self.mailleur2d3d()
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/gmu/construitFissureGenerale.py
b/src/Tools/blocFissure/gmu/construitFissureGenerale.py
index c1f46c8fd048ae500916d1c80d88b990ecf91f08..feed23ef9e0c2697f86484dc2d0afa2dbcab9c3a 100644
(file)
--- a/
src/Tools/blocFissure/gmu/construitFissureGenerale.py
+++ b/
src/Tools/blocFissure/gmu/construitFissureGenerale.py
@@
-53,10
+53,11
@@
from .construitFissureGenerale_c import construitFissureGenerale_c
def construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
def construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step=-1, mailleur="MeshGems"):
+ step=-1, mailleur="MeshGems"
, nro_cas=-1
):
"""procédure complète fissure générale"""
logging.info('start')
logging.info("Usage du mailleur %s", mailleur)
"""procédure complète fissure générale"""
logging.info('start')
logging.info("Usage du mailleur %s", mailleur)
+ logging.info("pour le cas %d", nro_cas)
shapeDefaut = shapesFissure[0] # faces de fissure, débordant
shapeDefaut = shapesFissure[0] # faces de fissure, débordant
@@
-195,7
+196,7
@@
def construitFissureGenerale(shapesFissure, shapeFissureParams, \
facesPeaux, edCircPeau, ptCircPeau, gpedgeBord, gpedgeVifs, edFissPeau, \
bordsLibres, grpEdgesPeauFissureExterne, grpAretesVives, \
edgesCircPipeGroup, dmoyen, rayonPipe, nbsegRad, \
facesPeaux, edCircPeau, ptCircPeau, gpedgeBord, gpedgeVifs, edFissPeau, \
bordsLibres, grpEdgesPeauFissureExterne, grpAretesVives, \
edgesCircPipeGroup, dmoyen, rayonPipe, nbsegRad, \
- mailleur)
+ mailleur
, nro_cas
)
# --- regroupement des maillages du défaut
# --- regroupement des maillages du défaut
diff --git
a/src/Tools/blocFissure/gmu/fissureCoude.py
b/src/Tools/blocFissure/gmu/fissureCoude.py
index ac6d17b687026dbbc8f6d0a764f6ccee831363a5..1eed558276672537b04f31a22e196724d7850daf 100644
(file)
--- a/
src/Tools/blocFissure/gmu/fissureCoude.py
+++ b/
src/Tools/blocFissure/gmu/fissureCoude.py
@@
-684,7
+684,7
@@
class fissureCoude(fissureGenerique):
mailleur="MeshGems"):
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
mailleur="MeshGems"):
maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
maillageFissureParams, elementsDefaut, \
- step, mailleur)
+ step, mailleur
, self.numeroCas
)
return maillageFissure
# ---------------------------------------------------------------------------
return maillageFissure
# ---------------------------------------------------------------------------
diff --git
a/src/Tools/blocFissure/gmu/mailleFacesPeau.py
b/src/Tools/blocFissure/gmu/mailleFacesPeau.py
index 949218f07f0c7fc385c4b38186275419f5c197e6..0839e3573a1c99c1c168b597a2a8008cef1f0dce 100644
(file)
--- a/
src/Tools/blocFissure/gmu/mailleFacesPeau.py
+++ b/
src/Tools/blocFissure/gmu/mailleFacesPeau.py
@@
-36,10
+36,10
@@
def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
facesPeaux, edCircPeau, ptCircPeau, gpedgeBord, gpedgeVifs, edFissPeau, \
bordsLibres, grpEdgesPeauFissureExterne, grpAretesVives, \
edgesCircPipeGroup, dmoyen, rayonPipe, nbsegRad, \
facesPeaux, edCircPeau, ptCircPeau, gpedgeBord, gpedgeVifs, edFissPeau, \
bordsLibres, grpEdgesPeauFissureExterne, grpAretesVives, \
edgesCircPipeGroup, dmoyen, rayonPipe, nbsegRad, \
- mailleur="MeshGems"):
+ mailleur="MeshGems"
, nro_cas=-1
):
"""maillage faces de peau"""
logging.info('start')
"""maillage faces de peau"""
logging.info('start')
- logging.info(mailleur)
+ logging.info(mailleur
+" pour le cas n° %d"%nro_cas
)
nbFacesFilling = len(partitionsPeauFissFond)
boutFromIfil = [None for i in range(nbFacesFilling)]
if idFillingFromBout[0] != idFillingFromBout[1]: # repérage des extremites du pipe quand elles débouchent sur des faces différentes
nbFacesFilling = len(partitionsPeauFissFond)
boutFromIfil = [None for i in range(nbFacesFilling)]
if idFillingFromBout[0] != idFillingFromBout[1]: # repérage des extremites du pipe quand elles débouchent sur des faces différentes
@@
-65,9
+65,9
@@
def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
algo1d = meshFacePeau.UseExisting1DElements(geom=groupEdgesBordPeau)
hypo1d = algo1d.SourceEdges([ bordsLibres ],0,0)
algo1d = meshFacePeau.UseExisting1DElements(geom=groupEdgesBordPeau)
hypo1d = algo1d.SourceEdges([ bordsLibres ],0,0)
- putName(algo1d.GetSubMesh(), "bordsLibres", ifil)
- putName(algo1d, "algo1d_bordsLibres", ifil)
- putName(hypo1d, "hypo1d_bordsLibres", ifil)
+ putName(algo1d.GetSubMesh(), "bordsLibres", ifil
, nro_cas
)
+ putName(algo1d, "algo1d_bordsLibres", ifil
, nro_cas
)
+ putName(hypo1d, "hypo1d_bordsLibres", ifil
, nro_cas
)
else:
else:
@@
-84,23
+84,23
@@
def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
algo1d = meshFacePeau.UseExisting1DElements(geom=groupEdgesBordPeau)
hypo1d = algo1d.SourceEdges([ bordsLibres ],0,0)
algo1d = meshFacePeau.UseExisting1DElements(geom=groupEdgesBordPeau)
hypo1d = algo1d.SourceEdges([ bordsLibres ],0,0)
- putName(algo1d.GetSubMesh(), "bordsLibres", ifil)
- putName(algo1d, "algo1d_bordsLibres", ifil)
- putName(hypo1d, "hypo1d_bordsLibres", ifil)
+ putName(algo1d.GetSubMesh(), "bordsLibres", ifil
, nro_cas
)
+ putName(algo1d, "algo1d_bordsLibres", ifil
, nro_cas
)
+ putName(hypo1d, "hypo1d_bordsLibres", ifil
, nro_cas
)
logging.info("b")
algo1d = meshFacePeau.UseExisting1DElements(geom=geompy.MakeCompound(edgesFissurePeau))
hypo1d = algo1d.SourceEdges([ grpEdgesPeauFissureExterne ],0,0)
logging.info("b")
algo1d = meshFacePeau.UseExisting1DElements(geom=geompy.MakeCompound(edgesFissurePeau))
hypo1d = algo1d.SourceEdges([ grpEdgesPeauFissureExterne ],0,0)
- putName(algo1d.GetSubMesh(), "edgePeauFiss", ifil)
- putName(algo1d, "algo1d_edgePeauFiss", ifil)
- putName(hypo1d, "hypo1d_edgePeauFiss", ifil)
+ putName(algo1d.GetSubMesh(), "edgePeauFiss", ifil
, nro_cas
)
+ putName(algo1d, "algo1d_edgePeauFiss", ifil
, nro_cas
)
+ putName(hypo1d, "hypo1d_edgePeauFiss", ifil
, nro_cas
)
if bordsVifs is not None:
algo1d = meshFacePeau.UseExisting1DElements(geom=bordsVifs)
hypo1d = algo1d.SourceEdges([ grpAretesVives ],0,0)
if bordsVifs is not None:
algo1d = meshFacePeau.UseExisting1DElements(geom=bordsVifs)
hypo1d = algo1d.SourceEdges([ grpAretesVives ],0,0)
- putName(algo1d.GetSubMesh(), "bordsVifs", ifil)
- putName(algo1d, "algo1d_bordsVifs", ifil)
- putName(hypo1d, "hypo1d_bordsVifs", ifil)
+ putName(algo1d.GetSubMesh(), "bordsVifs", ifil
, nro_cas
)
+ putName(algo1d, "algo1d_bordsVifs", ifil
, nro_cas
)
+ putName(hypo1d, "hypo1d_bordsVifs", ifil
, nro_cas
)
for i, edgeCirc in enumerate(edgesCircPeau):
logging.info("i = {}".format(i))
for i, edgeCirc in enumerate(edgesCircPeau):
logging.info("i = {}".format(i))
@@
-111,9
+111,9
@@
def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
else:
hypo1d = algo1d.SourceEdges([ edgesCircPipeGroup[boutFromIfil[ifil]] ],0,0)
name = "cercle%d"%i
else:
hypo1d = algo1d.SourceEdges([ edgesCircPipeGroup[boutFromIfil[ifil]] ],0,0)
name = "cercle%d"%i
- putName(algo1d.GetSubMesh(), name, ifil)
- putName(algo1d, "algo1d_" + name, ifil)
- putName(hypo1d, "hypo1d_" + name, ifil)
+ putName(algo1d.GetSubMesh(), name, ifil
, nro_cas
)
+ putName(algo1d, "algo1d_" + name, ifil
, nro_cas
)
+ putName(hypo1d, "hypo1d_" + name, ifil
, nro_cas
)
logging.info("c")
logging.info("Maillage avec %s", mailleur)
logging.info("c")
logging.info("Maillage avec %s", mailleur)
@@
-134,9
+134,9
@@
def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
hypo2d.SetMinSize( rayonPipe/float(nbsegRad) )
hypo2d.SetQuadAllowed( 0 )
logging.info("d")
hypo2d.SetMinSize( rayonPipe/float(nbsegRad) )
hypo2d.SetQuadAllowed( 0 )
logging.info("d")
- putName(algo2d.GetSubMesh(), "facePeau", ifil)
- putName(algo2d, "algo2d_facePeau", ifil)
- putName(hypo2d, "hypo2d_facePeau", ifil)
+ putName(algo2d.GetSubMesh(), "facePeau", ifil
, nro_cas
)
+ putName(algo2d, "algo2d_facePeau", ifil
, nro_cas
)
+ putName(hypo2d, "hypo2d_facePeau", ifil
, nro_cas
)
is_done = meshFacePeau.Compute()
text = "meshFacePeau {} .Compute".format(ifil)
is_done = meshFacePeau.Compute()
text = "meshFacePeau {} .Compute".format(ifil)
diff --git
a/src/Tools/blocFissure/gmu/putName.py
b/src/Tools/blocFissure/gmu/putName.py
index ccc0a35b02b6b94da6cbc2c92bedbda685d8d075..c7480fb8f20a7f88bb9fc425ebede280a758fa6d 100644
(file)
--- a/
src/Tools/blocFissure/gmu/putName.py
+++ b/
src/Tools/blocFissure/gmu/putName.py
@@
-23,9
+23,17
@@
from .geomsmesh import smesh
# -----------------------------------------------------------------------------
# --- nommage des objets mesh (algorithme, hypothèse, subMesh)
# -----------------------------------------------------------------------------
# --- nommage des objets mesh (algorithme, hypothèse, subMesh)
-def putName(objmesh,name, i=-1):
- if i >= 0:
- suffix = "_%d"%i
- name += suffix
+def putName (objmesh, name, i_suff=-1, i_pref=-1):
+
+ # suffixe éventuel :
+ if i_suff >= 0:
+ suffixe = "_{}".format(i_suff)
+ name += suffixe
+
+ # préfixe éventuel :
+ if i_pref >= 0:
+ prefixe = "Cas{:02d}_".format(i_pref)
+ name = prefixe + name
+
smesh.SetName(objmesh, name)
smesh.SetName(objmesh, name)