Noms des algorithmes

diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude.py b/src/Tools/blocFissure/CasTests/fissure_Coude.py
index 2201f1e39ba57806912216450a459ebcb6f5ccc2..52c6a6b2eab1965467517110043c053089bcb5a0 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py
@@ -233,8 +233,8 @@ class fissure_Coude(fissureGenerique):
 
     algo3d = maillageSain.Hexahedron()
     algo2d = maillageSain.Quadrangle()
-    putName(algo3d, "algo3d_maillageSain", i_pref=self.numeroCas)
-    putName(algo2d, "algo2d_maillageSain", i_pref=self.numeroCas)
+    putName(algo3d, "{}_3d_maillageSain".format(self.mailleur), i_pref=self.numeroCas)
+    putName(algo2d, "{}_2d_maillageSain".format(self.mailleur), i_pref=self.numeroCas)
 
     algo1d_long_p1 = maillageSain.Segment(geom=long_p1)
     hypo1d_long_p1 = algo1d_long_p1.NumberOfSegments(n_long_p1)

diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py b/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
index 73824d621302d2b0da2e96974d43f862829e3130..4143dc3c1409b7c35d00b3a359ad8a27af40237e 100644 (file)
--- a/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
+++ b/src/Tools/blocFissure/gmu/construitFissureGenerale_c.py
@@ -78,7 +78,7 @@ def construitFissureGenerale_c(maillageSain, meshBoiteDefaut, \
     hypo3d.SetStandardOutputLog( 0 )
     hypo3d.SetRemoveLogOnSuccess( 1 )
   putName(algo3d.GetSubMesh(), "boiteDefaut", i_pref=nro_cas)
-  putName(algo3d, "algo3d_boiteDefaut", i_pref=nro_cas)
+  putName(algo3d, "{}_3d_boiteDefaut".format(mailleur), i_pref=nro_cas)
 
   is_done = meshBoiteDefaut.Compute()
   text = "meshBoiteDefaut.Compute"

diff --git a/src/Tools/blocFissure/gmu/fissureCoude.py b/src/Tools/blocFissure/gmu/fissureCoude.py
index 00f7fb3992945c9714554e58346ed471caa4e151..c8b70cf7937f03ca50de21b261242c26166aedab 100644 (file)
--- a/src/Tools/blocFissure/gmu/fissureCoude.py
+++ b/src/Tools/blocFissure/gmu/fissureCoude.py
@@ -263,8 +263,8 @@ class fissureCoude(fissureGenerique):
 
     algo3d = maillageSain.Hexahedron()
     algo2d = maillageSain.Quadrangle()
-    putName(algo3d, "algo3d_maillageSain", i_pref=self.numeroCas)
-    putName(algo2d, "algo2d_maillageSain", i_pref=self.numeroCas)
+    putName(algo3d, "{}_3d_maillageSain".format(self.mailleur2d3d()), i_pref=self.numeroCas)
+    putName(algo2d, "{}_2d_maillageSain".format(self.mailleur2d3d()), i_pref=self.numeroCas)
 
     algo1d_long_p1 = maillageSain.Segment(geom=long_p1)
     hypo1d_long_p1 = algo1d_long_p1.NumberOfSegments(n_long_p1)

diff --git a/src/Tools/blocFissure/gmu/genereMeshCalculZoneDefaut.py b/src/Tools/blocFissure/gmu/genereMeshCalculZoneDefaut.py
index 729ace6c1fd8f5ebdd13e022f851e963d13e1365..f245e9c8e216bf8dfaef9d54ac9c7c5df1cbcd2d 100644 (file)
--- a/src/Tools/blocFissure/gmu/genereMeshCalculZoneDefaut.py
+++ b/src/Tools/blocFissure/gmu/genereMeshCalculZoneDefaut.py
@@ -76,7 +76,7 @@ def genereMeshCalculZoneDefaut(facefiss, minSize, maxSize, \
     hypo2d.SetFineness( 2 )
     hypo2d.SetMinSize( minSize )
     hypo2d.SetQuadAllowed( 0 )
-  putName(algo2d, "algo2d_zoneFiss", i_pref=nro_cas)
+  putName(algo2d, "{}_2d_zoneFiss".format(mailleur), i_pref=nro_cas)
   putName(hypo2d, "hypo1d_zoneFiss", i_pref=nro_cas)
 
   is_done = meshFissure.Compute()

diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_c.py b/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
index 12680a089f428c45248bb09e107b0b60fd118fe2..040f5a12f847b369d2ba7a261e831fe63bcbc517 100644 (file)
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_c.py
@@ -48,13 +48,13 @@ def insereFissureLongue_c (pipeFondFiss, disques, rayons, demiCercles, demiCercl
   algo2d = meshFondFiss.Quadrangle(algo=smeshBuilder.QUADRANGLE)
   algo3d = meshFondFiss.Prism()
   putName(algo3d.GetSubMesh(), "pipe", i_pref=nro_cas)
-  putName(algo3d, "algo3d_pipe", i_pref=nro_cas)
-  putName(algo2d, "algo2d_pipe", i_pref=nro_cas)
+  putName(algo3d, "{}_3d_pipe".format(mailleur), i_pref=nro_cas)
+  putName(algo2d, "{}_2d_pipe".format(mailleur), i_pref=nro_cas)
 
   for i_aux, face in enumerate(disques):
     algo2d = meshFondFiss.Quadrangle(algo=smeshBuilder.RADIAL_QUAD,geom=face)
     putName(algo2d.GetSubMesh(), "disque", i_aux, nro_cas)
-    putName(algo2d, "algo2d_disque", i_aux, nro_cas)
+    putName(algo2d, "{}_2d_disque".format(mailleur), i_aux, nro_cas)
 
   for i_aux, edge in enumerate(rayons):
     algo1d = meshFondFiss.Segment(geom=edge)

diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_d.py b/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
index 6a61f6f079dcf3441dd7f3d784aa34a5a4adcf9f..394012b7c5f8d1b31d82955eaf975f0541dd413a 100644 (file)
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_d.py
@@ -58,7 +58,7 @@ def insereFissureLongue_d (facePeau, edgePeauFiss, groupEdgesBordPeau, bordsLibr
     hypo2d.SetMinSize( 2 )
     hypo2d.SetQuadAllowed( 0 )
   putName(algo2d.GetSubMesh(), "facePeau", i_pref=nro_cas)
-  putName(algo2d, "algo2d_facePeau", i_pref=nro_cas)
+  putName(algo2d, "{}_2d_facePeau".format(mailleur), i_pref=nro_cas)
   putName(hypo2d, "hypo2d_facePeau", i_pref=nro_cas)
   #
   lenEdgePeauFiss = geompy.BasicProperties(edgePeauFiss)[0]

diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_e.py b/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
index bbc289ab72866f6e83f1e1e95c62ec6f984dbd23..34e9592b133ce329d9be9945f863736f34e0455d 100644 (file)
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_e.py
@@ -58,7 +58,7 @@ def insereFissureLongue_e (faceFiss, edgePeauFiss, groupEdgesPeauFiss, group_gen
     hypo2d.SetMinSize( 2 )
     hypo2d.SetQuadAllowed( 0 )
   putName(algo2d.GetSubMesh(), "faceFiss", i_pref=nro_cas)
-  putName(algo2d, "algo2d_faceFiss", i_pref=nro_cas)
+  putName(algo2d, "{}_2d_faceFiss".format(mailleur), i_pref=nro_cas)
   putName(hypo2d, "hypo2d_faceFiss", i_pref=nro_cas)
   #
   algo1d = meshFaceFiss.UseExisting1DElements(geom=edgePeauFiss)

diff --git a/src/Tools/blocFissure/gmu/insereFissureLongue_f.py b/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
index 564cc88b943aa19204db4d03934ad882432b1106..c2891d1f3e28f313904d3edeb85034f2a3ba4117 100644 (file)
--- a/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
+++ b/src/Tools/blocFissure/gmu/insereFissureLongue_f.py
@@ -66,7 +66,7 @@ def insereFissureLongue_f (internalBoundary, meshFondFiss, meshFacePeau, meshFac
     hypo3d.SetStandardOutputLog( 0 )
     hypo3d.SetRemoveLogOnSuccess( 1 )
   putName(algo3d.GetSubMesh(), "boiteDefaut", i_pref=nro_cas)
-  putName(algo3d, "algo3d_boiteDefaut", i_pref=nro_cas)
+  putName(algo3d, "{}_3d_boiteDefaut".format(mailleur), i_pref=nro_cas)
   putName(meshBoiteDefaut, "boiteDefaut", i_pref=nro_cas)
 
   is_done = meshBoiteDefaut.Compute()

diff --git a/src/Tools/blocFissure/gmu/mailleFacesFissure.py b/src/Tools/blocFissure/gmu/mailleFacesFissure.py
index 450309351e6e6d73fa9f7dd770dd20f22a530d84..e4f86fcdd1bad82dd99ef3b1a5b4b37d4096439c 100644 (file)
--- a/src/Tools/blocFissure/gmu/mailleFacesFissure.py
+++ b/src/Tools/blocFissure/gmu/mailleFacesFissure.py
@@ -54,9 +54,10 @@ def mailleFacesFissure(faceFissureExterne, \
     hypo2d.SetOptimize( 1 )
     hypo2d.SetFineness( 2 )
     hypo2d.SetMinSize( rayonPipe/float(nbsegRad) )
+    hypo2d.SetChordalError( areteFaceFissure*0.25 )
     hypo2d.SetQuadAllowed( 0 )
   putName(algo2d.GetSubMesh(), "faceFiss", i_pref=nro_cas)
-  putName(algo2d, "algo2d_faceFiss", i_pref=nro_cas)
+  putName(algo2d, "{}_2d_faceFiss".format(mailleur), i_pref=nro_cas)
   putName(hypo2d, "hypo2d_faceFiss", i_pref=nro_cas)
 
   texte = "Récupération des arêtes de '{}'".format(edgesPipeFissureExterneC.GetName())

diff --git a/src/Tools/blocFissure/gmu/meshBlocPart.py b/src/Tools/blocFissure/gmu/meshBlocPart.py
index c97920cddfe21f412145811d530d28ccf734378f..9d399c60be94d4746c52b4ef73762dfc30b560e8 100644 (file)
--- a/src/Tools/blocFissure/gmu/meshBlocPart.py
+++ b/src/Tools/blocFissure/gmu/meshBlocPart.py
@@ -63,7 +63,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
     hypo2d.LengthFromEdges()
     hypo2d.SetAllowQuadrangles(0)
     putName(algo2d.GetSubMesh(), "sharedFaces", i_aux, nro_cas)
-    putName(algo2d, "algo2d_sharedFaces", i_aux, nro_cas)
+    putName(algo2d, "{}_2d_sharedFaces".format(mailleur), i_aux, nro_cas)
     putName(hypo2d, "hypo2d_sharedFaces", i_aux, nro_cas)
 
   for i_aux, sharedEdges_i in enumerate(sharedEdges):
@@ -78,7 +78,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
     algo3d = bloc1.Tetrahedron(algo=smeshBuilder.NETGEN,geom=ellipsoidep)
     hypo3d = algo3d.MaxElementVolume(1000.0)
     putName(algo3d.GetSubMesh(), "ellipsoide", i_pref=nro_cas)
-    putName(algo3d, "algo3d_ellipsoide", i_pref=nro_cas)
+    putName(algo3d, "{}_3d_ellipsoide".format(mailleur), i_pref=nro_cas)
     putName(hypo3d, "hypo3d_ellipsoide", i_pref=nro_cas)
 
   algo3d = bloc1.Prism(geom=tore)
@@ -86,8 +86,8 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
   algo1d = bloc1.Segment(geom=tore)
   hypo1d = algo1d.NumberOfSegments(nbsegGen)
   putName(algo3d.GetSubMesh(), "tore", i_pref=nro_cas)
-  putName(algo3d, "algo3d_tore", i_pref=nro_cas)
-  putName(algo2d, "algo2d_tore", i_pref=nro_cas)
+  putName(algo3d, "{}_3d_tore".format(mailleur), i_pref=nro_cas)
+  putName(algo2d, "{}_2d_tore".format(mailleur), i_pref=nro_cas)
   putName(algo1d, "algo1d_tore", i_pref=nro_cas)
   putName(hypo1d, "hypo1d_tore", i_pref=nro_cas)
 
@@ -98,7 +98,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
     hypo2d.SetQuadType( StdMeshersBuilder.QUAD_STANDARD )
     _ = bloc1.AddHypothesis(hypo2d,faces_i)
     putName(algo2d.GetSubMesh(), "faces", i_aux, nro_cas)
-    putName(algo2d, "algo2d_faces", i_aux, nro_cas)
+    putName(algo2d, "{}_2d_faces".format(mailleur), i_aux, nro_cas)
     putName(hypo2d, "hypo2d_faces", i_aux, nro_cas)
 
   for i_aux, edges_i in enumerate(edges):
@@ -152,7 +152,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
   algo2d = bloc1.Triangle(algo=smeshBuilder.NETGEN_2D, geom=facefissoutore)
   hypo2d = algo2d.LengthFromEdges()
   putName(algo2d.GetSubMesh(), "facefissoutore", i_pref=nro_cas)
-  putName(algo2d, "algo2d_facefissoutore", i_pref=nro_cas)
+  putName(algo2d, "{}_2d_facefissoutore".format(mailleur), i_pref=nro_cas)
   putName(hypo2d, "hypo2d_facefissoutore", i_pref=nro_cas)
 
 
@@ -166,7 +166,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
       algo1d = bloc1.Segment(geom=facesExternes_i)
       hypo1d = algo1d.NumberOfSegments(1)
     putName(algo2d.GetSubMesh(), "facesExternes", i_aux, nro_cas)
-    putName(algo2d, "algo2d_facesExternes", i_aux, nro_cas)
+    putName(algo2d, "{}2d_facesExternes".format(mailleur), i_aux, nro_cas)
     putName(hypo2d, "hypo2d_facesExternes", i_aux, nro_cas)
     if edgesBords is None:
       putName(algo1d, "algo1d_facesExternes", i_aux, nro_cas)
@@ -190,7 +190,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
     algo3d = bloc1.Tetrahedron(algo=smeshBuilder.NETGEN,geom=ellipsoidep)
     hypo3d = algo3d.MaxElementVolume(1000.0)
     putName(algo3d.GetSubMesh(), "ellipsoide", i_pref=nro_cas)
-    putName(algo3d, "algo3d_ellipsoide", i_pref=nro_cas)
+    putName(algo3d, "{}_3d_ellipsoide".format(mailleur), i_pref=nro_cas)
     putName(hypo3d, "hypo3d_ellipsoide", i_pref=nro_cas)
 
   _ = bloc1.GroupOnGeom(faceFissure,'FACE1',SMESH.FACE)
@@ -232,7 +232,7 @@ def meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circle
   algo3d = blocMesh.Tetrahedron(algo=smeshBuilder.NETGEN)
   hypo3d = algo3d.MaxElementVolume(1000.0)
   putName(algo3d.GetSubMesh(), "bloc", i_pref=nro_cas)
-  putName(algo3d, "algo3d_bloc", i_pref=nro_cas)
+  putName(algo3d, "{}_3d_bloc".format(mailleur), i_pref=nro_cas)
   putName(hypo3d, "hypo3d_bloc", i_pref=nro_cas)
 
   is_done = blocMesh.Compute()