bos #29764 EDF - SMESH_blocfissure* fail

Fix reference numbers for NETGEN-5

diff --git a/src/Tools/blocFissure/CasTests/cubeAngle_2.py b/src/Tools/blocFissure/CasTests/cubeAngle_2.py
index 24f2d01e15ff545a4b6fd6bf9f4ce0c00358d93e..52a5640fe8a89643040e7d274249a74627095062 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cubeAngle_2.py
+++ b/src/Tools/blocFissure/CasTests/cubeAngle_2.py
@@ -55,10 +55,10 @@ class cubeAngle_2(cubeAngle):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 2350, \
                                           Entity_Quad_Hexa = 5315, \
-                                          Entity_Node = 38196, \
+                                          Entity_Node = 36418, \
                                           Entity_Quad_Edge = 345, \
                                           Entity_Quad_Triangle = 1214, \
-                                          Entity_Quad_Tetra = 7772, \
+                                          Entity_Quad_Tetra = 6430, \
                                           Entity_Quad_Pyramid = 620, \
                                           Entity_Quad_Penta = 512 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/cubeCoin.py b/src/Tools/blocFissure/CasTests/cubeCoin.py
index f068a96eff8830e09fa8b5af0a43ca531d2031fc..792ce2cda05f445960c7c72eb6ce61061d8fd203 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cubeCoin.py
+++ b/src/Tools/blocFissure/CasTests/cubeCoin.py
@@ -39,12 +39,12 @@ dicoParams = dict(nomCas            = "cubeCoin",
   # ---------------------------------------------------------------------------
 
 referencesMaillageFissure = dict( \
-                                Entity_Quad_Quadrangle = 2740, \
-                                Entity_Quad_Hexa = 7420, \
-                                Entity_Node = 46394, \
-                                Entity_Quad_Edge = 323, \
-                                Entity_Quad_Triangle = 486, \
-                                Entity_Quad_Tetra = 8512, \
-                                Entity_Quad_Pyramid = 460, \
-                                Entity_Quad_Penta = 80 \
+                                          Entity_Quad_Quadrangle = 2740, \
+                                          Entity_Quad_Hexa = 7420, \
+                                          Entity_Node = 45191, \
+                                          Entity_Quad_Edge = 323, \
+                                          Entity_Quad_Triangle = 486, \
+                                          Entity_Quad_Tetra = 7601, \
+                                          Entity_Quad_Pyramid = 460, \
+                                          Entity_Quad_Penta = 80 \
                                 )

diff --git a/src/Tools/blocFissure/CasTests/cubeTransverse.py b/src/Tools/blocFissure/CasTests/cubeTransverse.py
index 161805e8121497cf9b80372585143c7138795920..0c5b527e085f4139a06f807cdd8d9045bd523806 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cubeTransverse.py
+++ b/src/Tools/blocFissure/CasTests/cubeTransverse.py
@@ -41,10 +41,10 @@ dicoParams = dict(nomCas            = "cubeTransverse",
 referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 2900, \
                                           Entity_Quad_Hexa = 7000, \
-                                          Entity_Node = 58430, \
+                                          Entity_Node = 61612, \
                                           Entity_Quad_Edge = 390, \
                                           Entity_Quad_Triangle = 1228, \
-                                          Entity_Quad_Tetra = 17567, \
+                                          Entity_Quad_Tetra = 19925, \
                                           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 8960188d734f52b026f089cfe7fb6d973da278af..1dc85458094a95f8ba68559f96fe4280b52b63a8 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cylindre.py
+++ b/src/Tools/blocFissure/CasTests/cylindre.py
@@ -114,10 +114,10 @@ class cylindre(fissureGenerique):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 6920, \
                                           Entity_Quad_Hexa = 18174, \
-                                          Entity_Node = 104349, \
+                                          Entity_Node = 100923, \
                                           Entity_Quad_Edge = 718, \
                                           Entity_Quad_Triangle = 952, \
-                                          Entity_Quad_Tetra = 16691, \
+                                          Entity_Quad_Tetra = 14111, \
                                           Entity_Quad_Pyramid = 1110, \
                                           Entity_Quad_Penta = 336 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/cylindre_2.py b/src/Tools/blocFissure/CasTests/cylindre_2.py
index 4d0a93d4f4f623f2534734564ed1be982b36fa55..f3199e35e881f269fa8fa643c3be380e19aab12a 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cylindre_2.py
+++ b/src/Tools/blocFissure/CasTests/cylindre_2.py
@@ -59,10 +59,10 @@ class cylindre_2(cylindre):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 7028, \
                                           Entity_Quad_Hexa = 18366, \
-                                          Entity_Node = 105035, \
+                                          Entity_Node = 102327, \
                                           Entity_Quad_Edge = 735, \
                                           Entity_Quad_Triangle = 1056, \
-                                          Entity_Quad_Tetra = 16305, \
+                                          Entity_Quad_Tetra = 14255, \
                                           Entity_Quad_Pyramid = 1158, \
                                           Entity_Quad_Penta = 384 \
                                           )

diff --git a/src/Tools/blocFissure/CasTests/disquePerce.py b/src/Tools/blocFissure/CasTests/disquePerce.py
index 8412b52d11fd1083bb5a5e136d4460de7b10ccb7..7da6db66351d21f5877c4581bc634bc94fbaee3d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/disquePerce.py
+++ b/src/Tools/blocFissure/CasTests/disquePerce.py
@@ -39,12 +39,12 @@ dicoParams = dict(nomCas            = 'disquePerce',
   # ---------------------------------------------------------------------------
 
 referencesMaillageFissure = dict ( \
-                                  Entity_Quad_Edge = 376, \
                                   Entity_Quad_Quadrangle = 2748, \
                                   Entity_Quad_Hexa = 6232, \
-                                  Entity_Node = 43479, \
-                                  Entity_Quad_Triangle = 1340, \
-                                  Entity_Quad_Tetra = 8821, \
+                                  Entity_Node = 41251, \
+                                  Entity_Quad_Edge = 376, \
+                                  Entity_Quad_Triangle = 1354, \
+                                  Entity_Quad_Tetra = 7146, \
                                   Entity_Quad_Pyramid = 466, \
                                   Entity_Quad_Penta = 448 \
                                  )

diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py
index d29eddc25d95ef141a4f9bb3ae54b3e9ff53aba7..ce4cfa1e27a7b01c0c7ba963dde3e16f20baada4 100644 (file)
--- a/src/Tools/blocFissure/CasTests/ellipse_1.py
+++ b/src/Tools/blocFissure/CasTests/ellipse_1.py
@@ -128,10 +128,10 @@ class ellipse_1(fissureGenerique):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 1748, \
                                           Entity_Quad_Hexa = 3795, \
-                                          Entity_Node = 21939, \
+                                          Entity_Node = 21531, \
                                           Entity_Quad_Edge = 256, \
                                           Entity_Quad_Triangle = 360, \
-                                          Entity_Quad_Tetra = 2425, \
+                                          Entity_Quad_Tetra = 2121, \
                                           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 2180003f0e81c7bcbc06c02e790706a537bfbdbb..b9f9ff48068b8c662e11a3b44b1cd6e9394857d4 100644 (file)
--- a/src/Tools/blocFissure/CasTests/ellipse_2.py
+++ b/src/Tools/blocFissure/CasTests/ellipse_2.py
@@ -63,10 +63,10 @@ class ellipse_2(ellipse_1):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 1748, \
                                              Entity_Quad_Hexa = 3795, \
-                                             Entity_Node = 22219, \
+                                             Entity_Node = 21772, \
                                              Entity_Quad_Edge = 258, \
                                              Entity_Quad_Triangle = 434, \
-                                             Entity_Quad_Tetra = 2574, \
+                                             Entity_Quad_Tetra = 2239, \
                                              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 d214d6c0ee85bcc8eb885c121d1d657b3d31f932..f24ea636246e95cace70010299e8ddd5964e7e4c 100644 (file)
--- a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
+++ b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py
@@ -122,10 +122,10 @@ class eprouvetteCourbe(fissureGenerique):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 5318, \
                                           Entity_Quad_Hexa = 18182, \
-                                          Entity_Node = 94472, \
+                                          Entity_Node = 92417, \
                                           Entity_Quad_Edge = 539, \
                                           Entity_Quad_Triangle = 828, \
-                                          Entity_Quad_Tetra = 9024, \
+                                          Entity_Quad_Tetra = 7471, \
                                           Entity_Quad_Pyramid = 578, \
                                           Entity_Quad_Penta = 128 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py
index d1bf2f6448e2b2657e4dc5e13abc79c1e721b408..dfec8b776b709d7e918c915724ae11d038e9e44d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche.py
@@ -116,12 +116,12 @@ class faceGauche(fissureGenerique):
     from salome.smesh import smeshBuilder
     if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
       self.referencesMaillageFissure = dict( \
-                                             Entity_Quad_Edge = 750, \
                                              Entity_Quad_Quadrangle = 4177, \
                                              Entity_Quad_Hexa = 6224, \
-                                             Entity_Node = 81588, \
-                                             Entity_Quad_Triangle = 2298, \
-                                             Entity_Quad_Tetra = 33764, \
+                                             Entity_Node = 74848, \
+                                             Entity_Quad_Edge = 749, \
+                                             Entity_Quad_Triangle = 2338, \
+                                             Entity_Quad_Tetra = 28628, \
                                              Entity_Quad_Pyramid = 1236, \
                                              Entity_Quad_Penta = 936 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_1.py b/src/Tools/blocFissure/CasTests/fissureCoude_1.py
index 225f7a88b1ed0ed11d1a6d477fb19888c8006acf..24f5b907f4bd20eca2f55756f2531b75899172c2 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_1.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_1.py
@@ -108,10 +108,10 @@ class fissureCoude_1(fissureCoude):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 6042, \
                                           Entity_Quad_Hexa = 7794, \
-                                          Entity_Node = 65337, \
+                                          Entity_Node = 63900, \
                                           Entity_Quad_Edge = 874, \
                                           Entity_Quad_Triangle = 2058, \
-                                          Entity_Quad_Tetra = 16037, \
+                                          Entity_Quad_Tetra = 14900, \
                                           Entity_Quad_Pyramid = 738, \
                                           Entity_Quad_Penta = 672 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_10.py b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
index 51160ffffe386e0549c1366032479072c07576ad..d15a4da2c235462e94517b8f6e51b4568f99feb7 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_10.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
@@ -112,10 +112,10 @@ class fissureCoude_10(fissureCoude):
       self.referencesMaillageFissure = dict ( \
                                               Entity_Quad_Quadrangle = 6160, \
                                               Entity_Quad_Hexa = 5864, \
-                                              Entity_Node = 78012, \
+                                              Entity_Node = 73615, \
                                               Entity_Quad_Edge = 1346, \
                                               Entity_Quad_Triangle = 9022, \
-                                              Entity_Quad_Tetra = 24341, \
+                                              Entity_Quad_Tetra = 20920, \
                                               Entity_Quad_Pyramid = 1232, \
                                               Entity_Quad_Penta = 1136 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_3.py b/src/Tools/blocFissure/CasTests/fissureCoude_3.py
index b9f5b44b1b4caab493b9d18b1460472ed4ea8f4b..ad2d3a3635f8e68bea0ba26dd1daed385988b445 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_3.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_3.py
@@ -108,10 +108,10 @@ class fissureCoude_3(fissureCoude):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 10604, \
                                           Entity_Quad_Hexa = 13764, \
-                                          Entity_Node = 89087, \
+                                          Entity_Node = 91208, \
                                           Entity_Quad_Edge = 1065, \
                                           Entity_Quad_Triangle = 1326, \
-                                          Entity_Quad_Tetra = 12185, \
+                                          Entity_Quad_Tetra = 13764, \
                                           Entity_Quad_Pyramid = 602, \
                                           Entity_Quad_Penta = 438 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_4.py b/src/Tools/blocFissure/CasTests/fissureCoude_4.py
index 57496ebf9d01bfa018cde4963861f9ad2a965ccb..7adadb2cabfdc6dfc675d1361581aac5dfe3e69d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_4.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_4.py
@@ -108,10 +108,10 @@ class fissureCoude_4(fissureCoude):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 11428, \
                                           Entity_Quad_Hexa = 21716, \
-                                          Entity_Node = 124663, \
+                                          Entity_Node = 120899, \
                                           Entity_Quad_Edge = 1073, \
                                           Entity_Quad_Triangle = 1330, \
-                                          Entity_Quad_Tetra = 14665, \
+                                          Entity_Quad_Tetra = 11799, \
                                           Entity_Quad_Pyramid = 642, \
                                           Entity_Quad_Penta = 426 \
                                          )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_5.py b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
index 5d53ee6e924b4067cf1de403d8875621f90201e0..84fc8f17c1f60a439cce7913fcdef74a6ee59eb3 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_5.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
@@ -110,10 +110,10 @@ class fissureCoude_5(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 5366, \
                                              Entity_Quad_Hexa = 7120, \
-                                             Entity_Node = 54832, \
+                                             Entity_Node = 53544, \
                                              Entity_Quad_Edge = 722, \
                                              Entity_Quad_Triangle = 1570, \
-                                             Entity_Quad_Tetra = 11747, \
+                                             Entity_Quad_Tetra = 10782, \
                                              Entity_Quad_Pyramid = 532, \
                                              Entity_Quad_Penta = 496 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
index 646e647c0727fb8fb22cccf6462a65ce7504c510..3af60f65c3f11b39c846ac8c0c4eee91d30fc9ce 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
@@ -111,10 +111,10 @@ class fissureCoude_6(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 7392, \
                                              Entity_Quad_Hexa = 9888, \
-                                             Entity_Node = 62571, \
+                                             Entity_Node = 61217, \
                                              Entity_Quad_Edge = 833, \
-                                             Entity_Quad_Triangle = 1048, \
-                                             Entity_Quad_Tetra = 7723, \
+                                             Entity_Quad_Triangle = 1024, \
+                                             Entity_Quad_Tetra = 6725, \
                                              Entity_Quad_Pyramid = 452, \
                                              Entity_Quad_Penta = 408 \
                                            )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_7.py b/src/Tools/blocFissure/CasTests/fissureCoude_7.py
index 5601392a04101d18dc1764768be7d414f6f3b442..5f9841df60f332a82a5075c6b496f53f52148e5d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.py
@@ -112,10 +112,10 @@ class fissureCoude_7(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 7758, \
                                              Entity_Quad_Hexa = 10696, \
-                                             Entity_Node = 71535, \
+                                             Entity_Node = 69782, \
                                              Entity_Quad_Edge = 882, \
                                              Entity_Quad_Triangle = 1378, \
-                                             Entity_Quad_Tetra = 10847, \
+                                             Entity_Quad_Tetra = 9518, \
                                              Entity_Quad_Pyramid = 668, \
                                              Entity_Quad_Penta = 612 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_8.py b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
index 502b3b0b7099024e33c5d2fe3d079af7448e5971..21dc591bf231322f3e4d253a927ff149ccb883b1 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
@@ -112,10 +112,10 @@ class fissureCoude_8(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 4572, \
                                              Entity_Quad_Hexa = 5128, \
-                                             Entity_Node = 45641, \
+                                             Entity_Node = 43015, \
                                              Entity_Quad_Edge = 648, \
                                              Entity_Quad_Triangle = 1282, \
-                                             Entity_Quad_Tetra = 11122, \
+                                             Entity_Quad_Tetra = 9146, \
                                              Entity_Quad_Pyramid = 768, \
                                              Entity_Quad_Penta = 752 \
                                            )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_9.py b/src/Tools/blocFissure/CasTests/fissureCoude_9.py
index cfd205ecee801bad43c596ebcadfe564e0125e60..34729ce4d67c1531d9e10ade974ba2f832c08b1a 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_9.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_9.py
@@ -110,10 +110,10 @@ class fissureCoude_9(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 14864, \
                                              Entity_Quad_Hexa = 26772, \
-                                             Entity_Node = 156163, \
+                                             Entity_Node = 152136, \
                                              Entity_Quad_Edge = 1237, \
                                              Entity_Quad_Triangle = 3178, \
-                                             Entity_Quad_Tetra = 16952, \
+                                             Entity_Quad_Tetra = 13915, \
                                              Entity_Quad_Pyramid = 916, \
                                              Entity_Quad_Penta = 780 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude.py b/src/Tools/blocFissure/CasTests/fissure_Coude.py
index afd31061d7ffc62f16718baf15c481377e3cdbfc..492122da852455f98dc2cb668e11c93a293c4840 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py
@@ -522,10 +522,10 @@ class fissure_Coude(fissureGenerique):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 6710, \
                                              Entity_Quad_Hexa = 8656, \
-                                             Entity_Node = 76807, \
+                                             Entity_Node = 70896, \
                                              Entity_Quad_Edge = 1006, \
                                              Entity_Quad_Triangle = 2342, \
-                                             Entity_Quad_Tetra = 20392, \
+                                             Entity_Quad_Tetra = 15963, \
                                              Entity_Quad_Pyramid = 1232, \
                                              Entity_Quad_Penta = 1176 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
index 89817efe3280bca2f626df122f4cd040dc32bead..83d2b3d68b974581f86b9148fcc625429d35743a 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
@@ -91,11 +91,11 @@ class fissure_Coude_4(fissure_Coude):
   def setReferencesMaillageFissure(self):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 11852, \
-                                          Entity_Quad_Hexa       = 22208, \
-                                          Entity_Node            = 133418, \
-                                          Entity_Quad_Edge       = 1192, \
-                                          Entity_Quad_Triangle   = 1562, \
-                                          Entity_Quad_Tetra      = 18759, \
-                                          Entity_Quad_Pyramid    = 948, \
-                                          Entity_Quad_Penta      = 732, \
+                                          Entity_Quad_Hexa = 22208, \
+                                          Entity_Node = 124711, \
+                                          Entity_Quad_Edge = 1192, \
+                                          Entity_Quad_Triangle = 1534, \
+                                          Entity_Quad_Tetra = 12204, \
+                                          Entity_Quad_Pyramid = 948, \
+                                          Entity_Quad_Penta = 732 \
                                          )