Précisions sur le lancement individualisé des cas-tests

diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py
index 594429469f31e58833cfa23035be70021cd3992e..79b1f5add051e65e60593e11f6e6e8f7b3ae4585 100644 (file)
--- a/src/Tools/blocFissure/CasTests/execution_Cas.py
+++ b/src/Tools/blocFissure/CasTests/execution_Cas.py
@@ -32,134 +32,137 @@ initLog.setVerbose()
 # ---tous les cas en sequence, ou les cas selectionnés ...
 runall = True
 if runall:
-  torun = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,]
-else: #prob 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27   
-  torun = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,]
+  torun = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+else: #prob 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29
+  torun = [ 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 # -----------------------------------------------------------------------------------------------
 
 from blocFissure.gmu import geomsmesh
 from blocFissure.gmu.casStandard import casStandard
 
-problemes = []
+problemes = list()
 
 cas=0
-from blocFissure.CasTests.fissure_Coude import fissure_Coude
-problemes.append(fissure_Coude(cas))
+from blocFissure.CasTests.cubeAngle import cubeAngle
+problemes.append(cubeAngle(cas))
 
-cas=1
-from blocFissure.CasTests.faceGauche import faceGauche
-problemes.append(faceGauche(cas))
+cas+=1
+from blocFissure.CasTests.cubeAngle2 import cubeAngle2
+problemes.append(cubeAngle2(cas))
 
-cas=2
-from blocFissure.CasTests.faceGauche_2 import faceGauche_2
-problemes.append(faceGauche_2(cas))
+cas+=1
+from blocFissure.CasTests import cubeCoin
+problemes.append(casStandard(cubeCoin.dicoParams, cubeCoin.referencesMaillageFissure, cas))
 
-cas=3
-from blocFissure.CasTests.ellipse_1 import ellipse_1
-problemes.append(ellipse_1(cas))
+cas+=1
+from blocFissure.CasTests import cubeMilieu
+problemes.append(casStandard(cubeMilieu.dicoParams, cubeMilieu.referencesMaillageFissure, cas))
 
-cas=4
-from blocFissure.CasTests.fissure_Coude_4 import fissure_Coude_4
-problemes.append(fissure_Coude_4(cas))
+cas+=1
+from blocFissure.CasTests import cubeTransverse
+problemes.append(casStandard(cubeTransverse.dicoParams, cubeTransverse.referencesMaillageFissure, cas))
 
-cas=5
+cas+=1
 from blocFissure.CasTests.cylindre import cylindre
 problemes.append(cylindre(cas))
 
-cas=6
+cas+=1
 from blocFissure.CasTests.cylindre_2 import cylindre_2
 problemes.append(cylindre_2(cas))
 
-cas=7
+cas+=1
+from blocFissure.CasTests import disquePerce
+problemes.append(casStandard(disquePerce.dicoParams, disquePerce.referencesMaillageFissure, cas))
+
+cas+=1
+from blocFissure.CasTests.ellipse_1 import ellipse_1
+problemes.append(ellipse_1(cas))
+
+cas+=1
+from blocFissure.CasTests.ellipse_2 import ellipse_2
+problemes.append(ellipse_2(cas))
+
+cas+=1
 from blocFissure.CasTests.eprouvetteCourbe import eprouvetteCourbe
 problemes.append(eprouvetteCourbe(cas))
 
-cas=8
+cas+=1
 from blocFissure.CasTests.eprouvetteDroite import eprouvetteDroite
 problemes.append(eprouvetteDroite(cas))
 
-cas=9
+cas+=1
 from blocFissure.CasTests.eprouvetteDroite_2 import eprouvetteDroite_2
 problemes.append(eprouvetteDroite_2(cas))
 
-cas=10
-from blocFissure.CasTests.cubeAngle import cubeAngle
-problemes.append(cubeAngle(cas))
+cas+=1
+from blocFissure.CasTests.faceGauche import faceGauche
+problemes.append(faceGauche(cas))
+
+cas+=1
+from blocFissure.CasTests.faceGauche_2 import faceGauche_2
+problemes.append(faceGauche_2(cas))
+
+cas+=1
+from blocFissure.CasTests.fissure_Coude import fissure_Coude
+problemes.append(fissure_Coude(cas))
+
+cas+=1
+from blocFissure.CasTests.fissure_Coude_4 import fissure_Coude_4
+problemes.append(fissure_Coude_4(cas))
 
-cas=11
+cas+=1
 from blocFissure.CasTests.fissureCoude_1 import fissureCoude_1
 problemes.append(fissureCoude_1(cas))
 
-cas=12
+cas+=1
 from blocFissure.CasTests.fissureCoude_2 import fissureCoude_2
 problemes.append(fissureCoude_2(cas))
 
-cas=13
+cas+=1
 from blocFissure.CasTests.fissureCoude_3 import fissureCoude_3
 problemes.append(fissureCoude_3(cas))
 
-cas=14
+cas+=1
+from blocFissure.CasTests.fissure_Coude_4 import fissure_Coude_4
+problemes.append(fissure_Coude_4(cas))
+
+cas+=1
 from blocFissure.CasTests.fissureCoude_4 import fissureCoude_4
 problemes.append(fissureCoude_4(cas))
 
-cas=15
+cas+=1
 from blocFissure.CasTests.fissureCoude_5 import fissureCoude_5
 problemes.append(fissureCoude_5(cas))
 
-cas=16
-from blocFissure.CasTests.ellipse_2 import ellipse_2
-problemes.append(ellipse_2(cas))
-
-cas=17
-from blocFissure.CasTests.cubeAngle2 import cubeAngle2
-problemes.append(cubeAngle2(cas))
-
-cas=18
-from blocFissure.CasTests import disquePerce
-problemes.append(casStandard(disquePerce.dicoParams, disquePerce.referencesMaillageFissure, cas))
-
-cas=19
+cas+=1
 from blocFissure.CasTests.fissureCoude_6 import fissureCoude_6
 problemes.append(fissureCoude_6(cas))
 
-cas=20
+cas+=1
 from blocFissure.CasTests.fissureCoude_7 import fissureCoude_7
 problemes.append(fissureCoude_7(cas))
 
-cas=21
+cas+=1
 from blocFissure.CasTests.fissureCoude_8 import fissureCoude_8
 problemes.append(fissureCoude_8(cas))
 
-cas=22
+cas+=1
 from blocFissure.CasTests.fissureCoude_9 import fissureCoude_9
 problemes.append(fissureCoude_9(cas))
 
-cas=23
+cas+=1
 from blocFissure.CasTests.fissureCoude_10 import fissureCoude_10
 problemes.append(fissureCoude_10(cas))
 
-cas=24
+cas+=1
 from blocFissure.CasTests.vis_1 import vis_1
 problemes.append(vis_1(cas))
 
-cas=25
-from blocFissure.CasTests import cubeCoin
-problemes.append(casStandard(cubeCoin.dicoParams, cubeCoin.referencesMaillageFissure, cas))
-
-cas=26
-from blocFissure.CasTests import cubeMilieu
-problemes.append(casStandard(cubeMilieu.dicoParams, cubeMilieu.referencesMaillageFissure, cas))
-
-cas=27
-from blocFissure.CasTests import cubeTransverse
-problemes.append(casStandard(cubeTransverse.dicoParams, cubeTransverse.referencesMaillageFissure, cas))
-
-  
-for i in range(len(problemes)):
-  if torun[i]:
-    logging.critical("=== Execution cas %s", i)
+for iaux, cas in enumerate(problemes):
+  if torun[iaux]:
+    logging.critical("=== Execution cas {}".format(iaux))
     try:
-      problemes[i].executeProbleme()
+      cas.executeProbleme()
     except:
       traceback.print_exc()
     print("---------------------------------------------------------------------")

diff --git a/src/Tools/blocFissure/doc/faq.rst b/src/Tools/blocFissure/doc/faq.rst
index 03e5ff06cfb1f0cef7f25442ac1cb20950e6efbc..96a8694f37397d783fcec8849bd0bffc982e51fc 100644 (file)
--- a/src/Tools/blocFissure/doc/faq.rst
+++ b/src/Tools/blocFissure/doc/faq.rst
@@ -4,16 +4,16 @@
 FAQ\r
 #######################\r
 \r
- - Does Bloc Fissure works on a 2D mesh ?\r
+ - Does Bloc Fissure works on a 2D mesh?\r
 \r
 No, Bloc Fissure works only for 3D meshes. However, the user can extrude the 2D mesh to a 3D mesh, insert a crack and then extract a surface containing the crack.\r
 \r
- - Can I insert a crack in a symmetry plan ?\r
+ - Can I insert a crack in a symmetry plan?\r
 \r
 No, the user must insert the crack without using the symmetry plan passing through the crack lips.\r
 \r
- - I can't have Bloc Fissure working, it raises a pure python error, what can I do ?\r
+ - I can't have Bloc Fissure working, it raises a pure python error, what can I do?\r
 \r
-Bloc Fissure has some error messages for the most commonly encountered misuses. If the program raises a pure python error, it means that this error is rare or has not been encountered by the programmers yet.\r
+Bloc Fissure has some error messages for the most commonly encountered misuses. If the program raises a pure python error, it means that this error is rare or has not been encountered by the programmers yet. Contact the bugtracker.\r
 \r
-Still, either the case can't be treated using Bloc Fissure or the insertion procedure was not fully respected. In the first case, use Zcracks (soon available). In the second case, see the :ref:`tutorial <tutorials>`.
\ No newline at end of file
+Still, either the case can't be treated using Bloc Fissure or the insertion procedure was not fully respected. In the first case, use Zcracks. In the second case, see the :ref:`tutorial <tutorials>`.\r

diff --git a/src/Tools/blocFissure/doc/testcases.rst b/src/Tools/blocFissure/doc/testcases.rst
index 7c102e4592f7c13af9ce8d3f89227fce0497810c..f468d669642483165537cf071049a2b2d647c897 100644 (file)
--- a/src/Tools/blocFissure/doc/testcases.rst
+++ b/src/Tools/blocFissure/doc/testcases.rst
@@ -4,7 +4,7 @@
 Test cases\r
 #######################\r
 \r
-A base of 25 test cases ensures the proper functioning of « Bloc Fissure ». 12 cases are dedicated to :ref:`cracked bended pipes <pipeTC>` and the others 13 are for other :ref:`generic geometries <genericTC>`. They are shown here in order to illustrate cases on which « Bloc Fissure » works.\r
+A base of 30 test cases guarantees the correct functioning of « Bloc Fissure ». 12 cases are dedicated to :ref:`cracked bended pipes <pipeTC>` and the others 13 are for other :ref:`generic geometries <genericTC>`. They are shown here in order to illustrate cases on which « Bloc Fissure » works.\r
 \r
 .. _genericTC:\r
 \r
@@ -152,31 +152,36 @@ modify the file ``execution_Cas.py`` and change::
 \r
 And change from 0 to 1 of the index of the test you want to launch::\r
 \r
-    torun = [ 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,]\r
+    torun = [ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\r
 \r
 then launch the test cases::\r
 \r
     from blocFissure.CasTests import execution_Cas\r
 \r
-3) **To execute only one test case**::\r
-\r
-    from blocFissure.CasTests.[TEST_CASE_NAME] import [TEST_CASE_NAME]\r
-\r
-    [TEST_CASE_NAME](0).executeProbleme()\r
-\r
-[TEST_CASE_NAME] is the name of the test case in the following list. Note that the test cases fissureCoude_4 and fissure_Coude_4 are very similar.\r
+The index of each test is the position of the test in the following table, from 0 for cubeAngle, 1 for cubeAngle2,\r
+2 for cubeCoin... from top to bottom, then from left to right.\r
 \r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
-| faceGauche         | cylindre_2         | disquePerce        | fissureCoude_3  | fissureCoude_6  |\r
+| cubeAngle          | cylindre_2         | eprouvetteDroite_2 | fissureCoude_3  | fissureCoude_8  |\r
++--------------------+--------------------+--------------------+-----------------+-----------------+\r
+| cubeAngle2         | disquePerce        | faceGauche         | fissureCoude_4  | fissureCoude_10 |\r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
-| faceGauche_2       | eprouvetteCourbe   | vis_1              | fissureCoude_4  | fissureCoude_7  |\r
+| cubeCoin           | ellipse_1          | faceGauche_2       | fissure_Coude_4 | fissureCoude_10 |\r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
-| ellipse_1          | eprouvetteDroite   | fissureCoude       | fissure_Coude_4 | fissureCoude_8  |\r
+| cubeMilieu         | ellipse_2          | fissure_Coude      | fissureCoude_5  | vis_1           |\r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
-| ellipse_2          | cubeAngle          | fissureCoude_1     | fissureCoude_5  | fissureCoude_9  |\r
+| cubeTransverse     | eprouvetteCourbe   | fissureCoude_1     | fissureCoude_6  |                 |\r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
-| cylindre           | cubeAngle2         | fissureCoude_2     | fissureCoude_5  | fissureCoude_10 |\r
+| cylindre           | eprouvetteDroite   | fissureCoude_2     | fissureCoude_7  |                 |\r
 +--------------------+--------------------+--------------------+-----------------+-----------------+\r
 \r
+3) **To execute only one test case**::\r
+\r
+    from blocFissure.CasTests.[TEST_CASE_NAME] import [TEST_CASE_NAME]\r
+\r
+    [TEST_CASE_NAME](0).executeProbleme()\r
+\r
+[TEST_CASE_NAME] is the name of the test case in the previous list. Note that the test cases fissureCoude_4 and fissure_Coude_4 are very similar.\r
+\r
 \r
 \r