From eaea42a89a2503ac0dc172ef593c0f83837ddae1 Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Fri, 15 Jan 2021 15:02:40 +0100 Subject: [PATCH] =?UTF-8?q?Pr=C3=A9cisions=20sur=20le=20lancement=20indivi?= =?UTF-8?q?dualis=C3=A9=20des=20cas-tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blocFissure/CasTests/execution_Cas.py | 213 +++++++++--------- src/Tools/blocFissure/doc/faq.rst | 10 +- src/Tools/blocFissure/doc/testcases.rst | 35 +-- 3 files changed, 133 insertions(+), 125 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py index 594429469..79b1f5add 100644 --- 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)) - -cas=1 -from blocFissure.CasTests.faceGauche import faceGauche -problemes.append(faceGauche(cas)) - -cas=2 -from blocFissure.CasTests.faceGauche_2 import faceGauche_2 -problemes.append(faceGauche_2(cas)) - -cas=3 -from blocFissure.CasTests.ellipse_1 import ellipse_1 -problemes.append(ellipse_1(cas)) - -cas=4 -from blocFissure.CasTests.fissure_Coude_4 import fissure_Coude_4 -problemes.append(fissure_Coude_4(cas)) - -cas=5 -from blocFissure.CasTests.cylindre import cylindre -problemes.append(cylindre(cas)) - -cas=6 -from blocFissure.CasTests.cylindre_2 import cylindre_2 -problemes.append(cylindre_2(cas)) - -cas=7 -from blocFissure.CasTests.eprouvetteCourbe import eprouvetteCourbe -problemes.append(eprouvetteCourbe(cas)) - -cas=8 -from blocFissure.CasTests.eprouvetteDroite import eprouvetteDroite -problemes.append(eprouvetteDroite(cas)) - -cas=9 -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=11 -from blocFissure.CasTests.fissureCoude_1 import fissureCoude_1 -problemes.append(fissureCoude_1(cas)) - -cas=12 -from blocFissure.CasTests.fissureCoude_2 import fissureCoude_2 -problemes.append(fissureCoude_2(cas)) - -cas=13 -from blocFissure.CasTests.fissureCoude_3 import fissureCoude_3 -problemes.append(fissureCoude_3(cas)) - -cas=14 -from blocFissure.CasTests.fissureCoude_4 import fissureCoude_4 -problemes.append(fissureCoude_4(cas)) - -cas=15 -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 +cas+=1 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 -from blocFissure.CasTests.fissureCoude_6 import fissureCoude_6 -problemes.append(fissureCoude_6(cas)) - -cas=20 -from blocFissure.CasTests.fissureCoude_7 import fissureCoude_7 -problemes.append(fissureCoude_7(cas)) - -cas=21 -from blocFissure.CasTests.fissureCoude_8 import fissureCoude_8 -problemes.append(fissureCoude_8(cas)) - -cas=22 -from blocFissure.CasTests.fissureCoude_9 import fissureCoude_9 -problemes.append(fissureCoude_9(cas)) - -cas=23 -from blocFissure.CasTests.fissureCoude_10 import fissureCoude_10 -problemes.append(fissureCoude_10(cas)) - -cas=24 -from blocFissure.CasTests.vis_1 import vis_1 -problemes.append(vis_1(cas)) - -cas=25 +cas+=1 from blocFissure.CasTests import cubeCoin problemes.append(casStandard(cubeCoin.dicoParams, cubeCoin.referencesMaillageFissure, cas)) -cas=26 +cas+=1 from blocFissure.CasTests import cubeMilieu problemes.append(casStandard(cubeMilieu.dicoParams, cubeMilieu.referencesMaillageFissure, cas)) -cas=27 +cas+=1 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) +cas+=1 +from blocFissure.CasTests.cylindre import cylindre +problemes.append(cylindre(cas)) + +cas+=1 +from blocFissure.CasTests.cylindre_2 import cylindre_2 +problemes.append(cylindre_2(cas)) + +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+=1 +from blocFissure.CasTests.eprouvetteDroite import eprouvetteDroite +problemes.append(eprouvetteDroite(cas)) + +cas+=1 +from blocFissure.CasTests.eprouvetteDroite_2 import eprouvetteDroite_2 +problemes.append(eprouvetteDroite_2(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+=1 +from blocFissure.CasTests.fissureCoude_1 import fissureCoude_1 +problemes.append(fissureCoude_1(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_2 import fissureCoude_2 +problemes.append(fissureCoude_2(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_3 import fissureCoude_3 +problemes.append(fissureCoude_3(cas)) + +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+=1 +from blocFissure.CasTests.fissureCoude_5 import fissureCoude_5 +problemes.append(fissureCoude_5(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_6 import fissureCoude_6 +problemes.append(fissureCoude_6(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_7 import fissureCoude_7 +problemes.append(fissureCoude_7(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_8 import fissureCoude_8 +problemes.append(fissureCoude_8(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_9 import fissureCoude_9 +problemes.append(fissureCoude_9(cas)) + +cas+=1 +from blocFissure.CasTests.fissureCoude_10 import fissureCoude_10 +problemes.append(fissureCoude_10(cas)) + +cas+=1 +from blocFissure.CasTests.vis_1 import vis_1 +problemes.append(vis_1(cas)) + +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 03e5ff06c..96a8694f3 100644 --- a/src/Tools/blocFissure/doc/faq.rst +++ b/src/Tools/blocFissure/doc/faq.rst @@ -4,16 +4,16 @@ FAQ ####################### - - Does Bloc Fissure works on a 2D mesh ? + - Does Bloc Fissure works on a 2D mesh? 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. - - Can I insert a crack in a symmetry plan ? + - Can I insert a crack in a symmetry plan? No, the user must insert the crack without using the symmetry plan passing through the crack lips. - - I can't have Bloc Fissure working, it raises a pure python error, what can I do ? + - I can't have Bloc Fissure working, it raises a pure python error, what can I do? -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. +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. -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 `. \ 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 `. diff --git a/src/Tools/blocFissure/doc/testcases.rst b/src/Tools/blocFissure/doc/testcases.rst index 7c102e459..f468d6696 100644 --- a/src/Tools/blocFissure/doc/testcases.rst +++ b/src/Tools/blocFissure/doc/testcases.rst @@ -4,7 +4,7 @@ Test cases ####################### -A base of 25 test cases ensures the proper functioning of « Bloc Fissure ». 12 cases are dedicated to :ref:`cracked bended pipes ` and the others 13 are for other :ref:`generic geometries `. They are shown here in order to illustrate cases on which « Bloc Fissure » works. +A base of 30 test cases guarantees the correct functioning of « Bloc Fissure ». 12 cases are dedicated to :ref:`cracked bended pipes ` and the others 13 are for other :ref:`generic geometries `. They are shown here in order to illustrate cases on which « Bloc Fissure » works. .. _genericTC: @@ -152,31 +152,36 @@ modify the file ``execution_Cas.py`` and change:: And change from 0 to 1 of the index of the test you want to launch:: - 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,] + 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] then launch the test cases:: from blocFissure.CasTests import execution_Cas +The index of each test is the position of the test in the following table, from 0 for cubeAngle, 1 for cubeAngle2, +2 for cubeCoin... from top to bottom, then from left to right. + ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cubeAngle | cylindre_2 | eprouvetteDroite_2 | fissureCoude_3 | fissureCoude_8 | ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cubeAngle2 | disquePerce | faceGauche | fissureCoude_4 | fissureCoude_10 | ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cubeCoin | ellipse_1 | faceGauche_2 | fissure_Coude_4 | fissureCoude_10 | ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cubeMilieu | ellipse_2 | fissure_Coude | fissureCoude_5 | vis_1 | ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cubeTransverse | eprouvetteCourbe | fissureCoude_1 | fissureCoude_6 | | ++--------------------+--------------------+--------------------+-----------------+-----------------+ +| cylindre | eprouvetteDroite | fissureCoude_2 | fissureCoude_7 | | ++--------------------+--------------------+--------------------+-----------------+-----------------+ + 3) **To execute only one test case**:: from blocFissure.CasTests.[TEST_CASE_NAME] import [TEST_CASE_NAME] [TEST_CASE_NAME](0).executeProbleme() -[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. - -+--------------------+--------------------+--------------------+-----------------+-----------------+ -| faceGauche | cylindre_2 | disquePerce | fissureCoude_3 | fissureCoude_6 | -+--------------------+--------------------+--------------------+-----------------+-----------------+ -| faceGauche_2 | eprouvetteCourbe | vis_1 | fissureCoude_4 | fissureCoude_7 | -+--------------------+--------------------+--------------------+-----------------+-----------------+ -| ellipse_1 | eprouvetteDroite | fissureCoude | fissure_Coude_4 | fissureCoude_8 | -+--------------------+--------------------+--------------------+-----------------+-----------------+ -| ellipse_2 | cubeAngle | fissureCoude_1 | fissureCoude_5 | fissureCoude_9 | -+--------------------+--------------------+--------------------+-----------------+-----------------+ -| cylindre | cubeAngle2 | fissureCoude_2 | fissureCoude_5 | fissureCoude_10 | -+--------------------+--------------------+--------------------+-----------------+-----------------+ +[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.