From bc7bb7e1993edce7216bec1edf60304db387bab6 Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Wed, 20 Jan 2021 19:15:58 +0100 Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20de=20r=C3=A9f=C3=A9rences?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/Tools/blocFissure/CasTests/cubeAngle.py | 2 +- src/Tools/blocFissure/CasTests/cubeAngle2.py | 2 +- .../blocFissure/CasTests/cubeTransverse.py | 18 ++++++++++-------- src/Tools/blocFissure/CasTests/cylindre.py | 18 ++++++++++-------- src/Tools/blocFissure/CasTests/ellipse_1.py | 18 ++++++++++-------- src/Tools/blocFissure/CasTests/ellipse_2.py | 18 ++++++++++-------- .../blocFissure/CasTests/eprouvetteCourbe.py | 18 ++++++++++-------- .../blocFissure/CasTests/eprouvetteDroite.py | 18 ++++++++++-------- .../blocFissure/CasTests/eprouvetteDroite_2.py | 18 ++++++++++-------- src/Tools/blocFissure/CasTests/faceGauche.py | 18 ++++++++++-------- src/Tools/blocFissure/CasTests/faceGauche_2.py | 6 ++++-- .../blocFissure/CasTests/fissure_Coude.py | 18 ++++++++++-------- 12 files changed, 96 insertions(+), 76 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/cubeAngle.py b/src/Tools/blocFissure/CasTests/cubeAngle.py index 9fb109722..eb7b73222 100644 --- a/src/Tools/blocFissure/CasTests/cubeAngle.py +++ b/src/Tools/blocFissure/CasTests/cubeAngle.py @@ -119,5 +119,5 @@ class cubeAngle(fissureGenerique): Entity_Quad_Tetra = 1322, \ Entity_Quad_Pyramid = 172, \ Entity_Quad_Penta = 64 \ - ) + ) diff --git a/src/Tools/blocFissure/CasTests/cubeAngle2.py b/src/Tools/blocFissure/CasTests/cubeAngle2.py index a3d526980..3f379333e 100644 --- a/src/Tools/blocFissure/CasTests/cubeAngle2.py +++ b/src/Tools/blocFissure/CasTests/cubeAngle2.py @@ -57,6 +57,6 @@ class cubeAngle2(cubeAngle): Entity_Quad_Triangle = 1214, \ Entity_Quad_Tetra = 7772, \ Entity_Quad_Pyramid = 620, \ - Entity_Quad_Penta = 512 + Entity_Quad_Penta = 512 \ ) diff --git a/src/Tools/blocFissure/CasTests/cubeTransverse.py b/src/Tools/blocFissure/CasTests/cubeTransverse.py index 268cc505f..c3b45860d 100644 --- a/src/Tools/blocFissure/CasTests/cubeTransverse.py +++ b/src/Tools/blocFissure/CasTests/cubeTransverse.py @@ -35,12 +35,14 @@ dicoParams = dict(nomCas = 'cubeTransverse', # --------------------------------------------------------------------------- -referencesMaillageFissure = dict(Entity_Quad_Pyramid = 0, - Entity_Quad_Triangle = 0, - Entity_Quad_Edge = 0, - Entity_Quad_Penta = 0, - Entity_Quad_Hexa = 0, - Entity_Node = 0, - Entity_Quad_Tetra = 0, - Entity_Quad_Quadrangle = 0) +referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 2900, \ + Entity_Quad_Hexa = 7000, \ + Entity_Node = 58430, \ + Entity_Quad_Edge = 390, \ + Entity_Quad_Triangle = 1228, \ + Entity_Quad_Tetra = 17567, \ + Entity_Quad_Pyramid = 780, \ + Entity_Quad_Penta = 200 \ + ) diff --git a/src/Tools/blocFissure/CasTests/cylindre.py b/src/Tools/blocFissure/CasTests/cylindre.py index 90b45fdda..fea83e8fa 100644 --- a/src/Tools/blocFissure/CasTests/cylindre.py +++ b/src/Tools/blocFissure/CasTests/cylindre.py @@ -114,12 +114,14 @@ class cylindre(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 1270, - Entity_Quad_Triangle = 1260, - Entity_Quad_Edge = 758, - Entity_Quad_Penta = 496, - Entity_Quad_Hexa = 18814, - Entity_Node = 113313, - Entity_Quad_Tetra = 20469, - Entity_Quad_Quadrangle = 7280) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 6920, \ + Entity_Quad_Hexa = 18174, \ + Entity_Node = 104349, \ + Entity_Quad_Edge = 718, \ + Entity_Quad_Triangle = 952, \ + Entity_Quad_Tetra = 16691, \ + Entity_Quad_Pyramid = 1110, \ + Entity_Quad_Penta = 336 \ + ) diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py index 94e8f0bd3..26465ab71 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_1.py +++ b/src/Tools/blocFissure/CasTests/ellipse_1.py @@ -118,12 +118,14 @@ class ellipse_1(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 175, - Entity_Quad_Triangle = 298, - Entity_Quad_Edge = 248, - Entity_Quad_Penta = 96, - Entity_Quad_Hexa = 3699, - Entity_Node = 20741, - Entity_Quad_Tetra = 1979, - Entity_Quad_Quadrangle = 1694) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 1748, \ + Entity_Quad_Hexa = 3795, \ + Entity_Node = 21939, \ + Entity_Quad_Edge = 256, \ + Entity_Quad_Triangle = 360, \ + Entity_Quad_Tetra = 2425, \ + Entity_Quad_Pyramid = 199, \ + Entity_Quad_Penta = 120 \ + ) diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py index 4947fbbd2..1596e27d0 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_2.py +++ b/src/Tools/blocFissure/CasTests/ellipse_2.py @@ -67,11 +67,13 @@ class ellipse_2(ellipse_1): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 159, - Entity_Quad_Triangle = 438, - Entity_Quad_Edge = 249, - Entity_Quad_Penta = 80, - Entity_Quad_Hexa = 3635, - Entity_Node = 20519, - Entity_Quad_Tetra = 1973, - Entity_Quad_Quadrangle = 1658) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 1748, \ + Entity_Quad_Hexa = 3795, \ + Entity_Node = 22219, \ + Entity_Quad_Edge = 258, \ + Entity_Quad_Triangle = 434, \ + Entity_Quad_Tetra = 2574, \ + Entity_Quad_Pyramid = 199, \ + Entity_Quad_Penta = 120 \ + ) diff --git a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py index 5ed364725..e7530c23d 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py @@ -112,12 +112,14 @@ class eprouvetteCourbe(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 618, - Entity_Quad_Triangle = 1224, - Entity_Quad_Edge = 578, - Entity_Quad_Penta = 168, - Entity_Quad_Hexa = 18342, - Entity_Node = 98170, - Entity_Quad_Tetra = 10809, - Entity_Quad_Quadrangle = 5408) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 5318, \ + Entity_Quad_Hexa = 18182, \ + Entity_Node = 94472, \ + Entity_Quad_Edge = 539, \ + Entity_Quad_Triangle = 828, \ + Entity_Quad_Tetra = 9024, \ + Entity_Quad_Pyramid = 578, \ + Entity_Quad_Penta = 128 \ + ) diff --git a/src/Tools/blocFissure/CasTests/eprouvetteDroite.py b/src/Tools/blocFissure/CasTests/eprouvetteDroite.py index b33da9ee8..1ecb81162 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteDroite.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteDroite.py @@ -114,12 +114,14 @@ class eprouvetteDroite(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 368, - Entity_Quad_Triangle = 798, - Entity_Quad_Edge = 491, - Entity_Quad_Penta = 88, - Entity_Quad_Hexa = 9692, - Entity_Node = 52652, - Entity_Quad_Tetra = 5093, - Entity_Quad_Quadrangle = 3750) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 3768, \ + Entity_Quad_Hexa = 9724, \ + Entity_Node = 52337, \ + Entity_Quad_Edge = 457, \ + Entity_Quad_Triangle = 570, \ + Entity_Quad_Tetra = 4919, \ + Entity_Quad_Pyramid = 376, \ + Entity_Quad_Penta = 96 \ + ) diff --git a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py index 3ab9196f5..c89908216 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py @@ -67,12 +67,14 @@ class eprouvetteDroite_2(eprouvetteDroite): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 396, - Entity_Quad_Triangle = 1084, - Entity_Quad_Edge = 510, - Entity_Quad_Penta = 96, - Entity_Quad_Hexa = 9504, - Entity_Node = 55482, - Entity_Quad_Tetra = 7545, - Entity_Quad_Quadrangle = 3724) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 3724, \ + Entity_Quad_Hexa = 9504, \ + Entity_Node = 54049, \ + Entity_Quad_Edge = 478, \ + Entity_Quad_Triangle = 724, \ + Entity_Quad_Tetra = 6766, \ + Entity_Quad_Pyramid = 396, \ + Entity_Quad_Penta = 96 \ + ) diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py index c3fecb94b..f6678951f 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche.py +++ b/src/Tools/blocFissure/CasTests/faceGauche.py @@ -112,12 +112,14 @@ class faceGauche(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 1284, - Entity_Quad_Triangle = 2336, - Entity_Quad_Edge = 758, - Entity_Quad_Penta = 984, - Entity_Quad_Hexa = 6416, - Entity_Node = 85673, - Entity_Quad_Tetra = 35990, - Entity_Quad_Quadrangle = 4285) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 3997, \ + Entity_Quad_Hexa = 5904, \ + Entity_Node = 77735, \ + Entity_Quad_Edge = 725, \ + Entity_Quad_Triangle = 2176, \ + Entity_Quad_Tetra = 32320, \ + Entity_Quad_Pyramid = 1156, \ + Entity_Quad_Penta = 856 \ + ) diff --git a/src/Tools/blocFissure/CasTests/faceGauche_2.py b/src/Tools/blocFissure/CasTests/faceGauche_2.py index f12066e9d..e134c4cd0 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche_2.py +++ b/src/Tools/blocFissure/CasTests/faceGauche_2.py @@ -113,12 +113,14 @@ class faceGauche_2(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Quad_Pyramid = 859, + self.referencesMaillageFissure = dict( \ + Entity_Quad_Pyramid = 859, Entity_Quad_Triangle = 634, Entity_Quad_Edge = 323, Entity_Quad_Penta = 288, Entity_Quad_Hexa = 3435, Entity_Node = 44095, Entity_Quad_Tetra = 18400, - Entity_Quad_Quadrangle = 2542) + Entity_Quad_Quadrangle = 2542 + ) diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude.py b/src/Tools/blocFissure/CasTests/fissure_Coude.py index f510d2a73..898372e11 100644 --- a/src/Tools/blocFissure/CasTests/fissure_Coude.py +++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py @@ -504,12 +504,14 @@ class fissure_Coude(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict(Entity_Node = 77491, - Entity_Quad_Edge = 1006, - Entity_Quad_Triangle = 2412, - Entity_Quad_Quadrangle = 6710, - Entity_Quad_Tetra = 20853, - Entity_Quad_Hexa = 8656, - Entity_Quad_Penta = 1176, - Entity_Quad_Pyramid = 1232) + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 6710, \ + Entity_Quad_Hexa = 8656, \ + Entity_Node = 56957, \ + Entity_Quad_Edge = 1006, \ + Entity_Quad_Triangle = 2344, \ + Entity_Quad_Tetra = 0, \ + Entity_Quad_Pyramid = 1232, \ + Entity_Quad_Penta = 1176 \ + ) -- 2.30.2