Salome HOME
Nom du r├ęsultat
authorGERALD NICOLAS <D68518@dsp0864451.atlas.edf.fr>
Wed, 3 Mar 2021 17:47:59 +0000 (18:47 +0100)
committerGERALD NICOLAS <D68518@dsp0864451.atlas.edf.fr>
Wed, 3 Mar 2021 17:47:59 +0000 (18:47 +0100)
22 files changed:
src/Tools/blocFissure/CasTests/cubeAngle.py
src/Tools/blocFissure/CasTests/cubeAngle2.py
src/Tools/blocFissure/CasTests/cylindre.py
src/Tools/blocFissure/CasTests/ellipse_1.py
src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
src/Tools/blocFissure/CasTests/eprouvetteDroite.py
src/Tools/blocFissure/CasTests/faceGauche.py
src/Tools/blocFissure/CasTests/faceGauche_2.py
src/Tools/blocFissure/CasTests/fissureCoude_1.py
src/Tools/blocFissure/CasTests/fissureCoude_10.py
src/Tools/blocFissure/CasTests/fissureCoude_2.py
src/Tools/blocFissure/CasTests/fissureCoude_3.py
src/Tools/blocFissure/CasTests/fissureCoude_4.py
src/Tools/blocFissure/CasTests/fissureCoude_5.py
src/Tools/blocFissure/CasTests/fissureCoude_6.py
src/Tools/blocFissure/CasTests/fissureCoude_7.py
src/Tools/blocFissure/CasTests/fissureCoude_8.py
src/Tools/blocFissure/CasTests/fissureCoude_9.py
src/Tools/blocFissure/CasTests/fissure_Coude.py
src/Tools/blocFissure/CasTests/fissure_Coude_4.py
src/Tools/blocFissure/CasTests/tube.py
src/Tools/blocFissure/CasTests/vis_1.py

index c3d3db7e1b208866dd98224a8c853435e735b122..9ed946f58271cfb4116f7c724ac4eae445c2ecf6 100644 (file)
@@ -88,7 +88,7 @@ class cubeAngle(fissureGenerique):
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 10)
index a1c78684a685adb612072ee96d17bf3b059c1c0b..21c3375d6100ba676bd2019165de0a056489cf50 100644 (file)
@@ -45,7 +45,7 @@ class cubeAngle2(cubeAngle):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 32,
                                       areteFaceFissure = 5)
index adb8c2e382d77a6c3b99626ead32559a9c244393..9e29286af8d03cfa03ba8f8001bcf152b1ff1e19 100644 (file)
@@ -85,7 +85,7 @@ class cylindre(fissureGenerique):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 20)
index 273ea859f3e56c956ab00324b0c7872939ec1709..80811a5be80d03a9388c9b8832b0333ef6d836dc 100644 (file)
@@ -95,7 +95,7 @@ class ellipse_1(fissureGenerique):
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
index 4c45e54ff7e6651925f7328a40119f5e8361ae7a..ddfb85757ed5d346753f538f1df87cfc2de9d83a 100644 (file)
@@ -89,7 +89,7 @@ class eprouvetteCourbe(fissureGenerique):
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 15)
index 6d09410fe87b50b90ece7cf8f762bc3d3d163e87..9b4d131f018a2da39f16acd366d6def5fce6638b 100644 (file)
@@ -93,7 +93,7 @@ class eprouvetteDroite(fissureGenerique):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 15)
index a6251088e8efafa428ec4e3b302300bfe814862d..1a554736c4c128b4d6a92d3268555d1745491605 100644 (file)
@@ -89,7 +89,7 @@ class faceGauche(fissureGenerique):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
index bbddb58528e61202dfd291f7bd4a6f714fa8a746..e9271d21da0eb0aea17ce05c3d25fe47d633458c 100644 (file)
@@ -89,7 +89,7 @@ class faceGauche_2(fissureGenerique):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
index 539d1b147430216e02996c94ac097e31d313df26..678bd1063024f3abc0adaa672671487946c5f5ba 100644 (file)
@@ -92,7 +92,7 @@ class fissureCoude_1(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 6,
                                       areteFaceFissure = 5)
index a803e3a1d6263296745c923dfae594f00f8b55ae..08893f0fc40eacef930d4d47bdfd5ed83c71a087 100644 (file)
@@ -94,7 +94,7 @@ class fissureCoude_10(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 3,
                                       nbsegCercle   = 8,
                                       areteFaceFissure = 2.5)
index 1fbcf8972657d3adbbac18dc88b1e64d7cb4a59a..c66531a75b6006e3c81fcfe58ba0ff28b090e9b7 100644 (file)
@@ -93,7 +93,7 @@ class fissureCoude_2(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 6,
                                       areteFaceFissure = 5)
index c5c3504a1598d1151d6d5a39f3e54a6af06e35f0..0f0617a43458e468812a792988229326919f4451 100644 (file)
@@ -92,7 +92,7 @@ class fissureCoude_3(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 6,
                                       areteFaceFissure = 5)
index 821115af3eae2444e87060bf9be16091db152040..fa2d1964fe9cd716154fe560a9dc3519b0759f9f 100644 (file)
@@ -92,7 +92,7 @@ class fissureCoude_4(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 6,
                                       areteFaceFissure = 5)
index 792778bf08f54926a459341b3b2315778a52162a..b8802d51ae2fa86bfa6530d3e035160c075d0fb2 100644 (file)
@@ -92,7 +92,7 @@ class fissureCoude_5(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 8,
                                       areteFaceFissure = 5)
index 2d11d684410fedb2c26d6512a9b845dc8104b984..c002de469093bb0ce2b81e805e7f807934125cb3 100644 (file)
@@ -93,7 +93,7 @@ class fissureCoude_6(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 12,
                                       areteFaceFissure = 5)                                   
index a01b7926120e50fba54762b8f3e783be3416e126..e86736a5f0576eead9997934d72e5575cd471722 100644 (file)
@@ -94,7 +94,7 @@ class fissureCoude_7(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 12,
                                       areteFaceFissure = 5)                                   
index 2a352789d69a419cccabaabba15b44d78e8cddb4..2151fc1518119acf54c839309d260a21ef0407e0 100644 (file)
@@ -94,7 +94,7 @@ class fissureCoude_8(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 4,
                                       nbsegCercle   = 16,
                                       areteFaceFissure = 5)
index 4729a2f0b90b016155068db8843279062eb8edb8..dae917fde7c14c54539c61af4a3aa7f3f2e564bc 100644 (file)
@@ -92,7 +92,7 @@ class fissureCoude_9(fissureCoude):
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegRad      = 6,
                                       nbsegCercle   = 20,
                                       areteFaceFissure = 2.5)
index 7e3443de67b468058553719f794e30268c565cf9..861a921419541a05ca657639a392d163c2b23df3 100644 (file)
@@ -481,7 +481,7 @@ class fissure_Coude(fissureGenerique):
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep        = os.curdir,
                                       nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicFissure = self.nomCas + "_fissure",
                                       nbsegExt      = 5,
                                       nbsegGen      = 25,
                                       nbsegRad      = 5,
index 4db8c9c920a5d77cafcb40b650300f8c8186ab80..2df1c7abd84f6210ed92c5edccc99afb9dbdb407 100644 (file)
@@ -71,7 +71,7 @@ class fissure_Coude_4(fissure_Coude):
     print("setParamShapeFissure", self.nomCas)
     self.shapeFissureParams = dict(nomRep        = os.curdir,
                                    nomFicSain    = self.nomCas,
-                                   nomFicFissure = 'fissure_' + self.nomCas,
+                                   nomFicFissure = self.nomCas + "_fissure",
                                    profondeur  = 10,
                                    azimut      = 90,
                                    alpha       = 20,
index 2b35558c6e4786b9e1540e5ce4ef9a634dc06a38..880df4cd77326ad3c8fe3e4f151dba7afa6a1778 100644 (file)
@@ -91,7 +91,7 @@ class tube(fissureGenerique):
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 0.5)
index 164fc752d0e3ad1debdcdcfbb1ab9cc2f7344448..9963dd1bd05c6393e5e311d89e56934315934d44 100644 (file)
@@ -95,7 +95,7 @@ class vis_1(fissureGenerique):
     logging.info(texte)
     self.maillageFissureParams = dict(nomRep           = os.curdir,
                                       nomFicSain       = self.nomCas,
-                                      nomFicFissure    = 'fissure_' + self.nomCas,
+                                      nomFicFissure    = self.nomCas + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 32,
                                       areteFaceFissure = 0.1)