bos #29764 EDF - SMESH_blocfissure* fail

Fix reference numbers for NETGEN-6

diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py
index b9f9ff48068b8c662e11a3b44b1cd6e9394857d4..55b4a9a4865459c8cc7ed86df188167c9b274f32 100644 (file)
--- a/src/Tools/blocFissure/CasTests/ellipse_2.py
+++ b/src/Tools/blocFissure/CasTests/ellipse_2.py
@@ -74,10 +74,10 @@ class ellipse_2(ellipse_1):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 1748, \
                                              Entity_Quad_Hexa = 3795, \
-                                             Entity_Node = 22022, \
+                                             Entity_Node = 21579, \
                                              Entity_Quad_Edge = 258, \
                                              Entity_Quad_Triangle = 412, \
-                                             Entity_Quad_Tetra = 2442, \
+                                             Entity_Quad_Tetra = 2113, \
                                              Entity_Quad_Pyramid = 199, \
                                              Entity_Quad_Penta = 120 \
       )

diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py
index dfec8b776b709d7e918c915724ae11d038e9e44d..ac7881eb258a0ca348740b19f6b8ccf3159b257d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche.py
@@ -129,10 +129,10 @@ class faceGauche(fissureGenerique):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 4177, \
                                              Entity_Quad_Hexa = 6224, \
-                                             Entity_Node = 83887, \
+                                             Entity_Node = 76374, \
                                              Entity_Quad_Edge = 750, \
                                              Entity_Quad_Triangle = 2434, \
-                                             Entity_Quad_Tetra = 35375, \
+                                             Entity_Quad_Tetra = 29698, \
                                              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 24f5b907f4bd20eca2f55756f2531b75899172c2..f53df20279f3d9015276c0ff357042369d37dfa8 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_1.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_1.py
@@ -105,13 +105,26 @@ class fissureCoude_1(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 6042, \
+                                             Entity_Quad_Hexa = 7794, \
+                                             Entity_Node = 63900, \
+                                             Entity_Quad_Edge = 874, \
+                                             Entity_Quad_Triangle = 2058, \
+                                             Entity_Quad_Tetra = 14900, \
+                                             Entity_Quad_Pyramid = 738, \
+                                             Entity_Quad_Penta = 672 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 6042, \
                                           Entity_Quad_Hexa = 7794, \
-                                          Entity_Node = 63900, \
+                                          Entity_Node = 65091, \
                                           Entity_Quad_Edge = 874, \
-                                          Entity_Quad_Triangle = 2058, \
-                                          Entity_Quad_Tetra = 14900, \
+                                          Entity_Quad_Triangle = 2116, \
+                                          Entity_Quad_Tetra = 15734, \
                                           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 d15a4da2c235462e94517b8f6e51b4568f99feb7..7e5bc9daeacf584cef50f2642c4c86594427046e 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_10.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
@@ -123,10 +123,10 @@ class fissureCoude_10(fissureCoude):
       self.referencesMaillageFissure = dict ( \
                                               Entity_Quad_Quadrangle = 6160, \
                                               Entity_Quad_Hexa = 5864, \
-                                              Entity_Node = 80605, \
+                                              Entity_Node = 75969, \
                                               Entity_Quad_Edge = 1345, \
                                               Entity_Quad_Triangle = 9726, \
-                                              Entity_Quad_Tetra = 25690, \
+                                              Entity_Quad_Tetra = 22110, \
                                               Entity_Quad_Pyramid = 1232, \
                                               Entity_Quad_Penta = 1136 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_2.py b/src/Tools/blocFissure/CasTests/fissureCoude_2.py
index 24bd03b2e52e8c2d44a49bb1fca61b1a9ed8e752..4d0761ac3a79de7cebf6320a6b4b3c99a9345e0d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_2.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_2.py
@@ -121,10 +121,10 @@ class fissureCoude_2(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 7828, \
                                              Entity_Quad_Hexa = 10437, \
-                                             Entity_Node = 106391, \
+                                             Entity_Node = 109737, \
                                              Entity_Quad_Edge = 1199, \
                                              Entity_Quad_Triangle = 4702, \
-                                             Entity_Quad_Tetra = 33175, \
+                                             Entity_Quad_Tetra = 35559, \
                                              Entity_Quad_Pyramid = 1428, \
                                              Entity_Quad_Penta = 1344 \
       )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_5.py b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
index 84fc8f17c1f60a439cce7913fcdef74a6ee59eb3..0ae804a28ce593b14db1265805faf5db5146ccf8 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_5.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
@@ -121,10 +121,10 @@ class fissureCoude_5(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 5366, \
                                              Entity_Quad_Hexa = 7120, \
-                                             Entity_Node = 54175, \
+                                             Entity_Node = 53105, \
                                              Entity_Quad_Edge = 721, \
                                              Entity_Quad_Triangle = 1482, \
-                                             Entity_Quad_Tetra = 11324, \
+                                             Entity_Quad_Tetra = 10526, \
                                              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 3af60f65c3f11b39c846ac8c0c4eee91d30fc9ce..64bd7607a9ac4faaeee6fdbfc5c0e26e91b0559d 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
@@ -122,10 +122,10 @@ class fissureCoude_6(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 7392, \
                                              Entity_Quad_Hexa = 9888, \
-                                             Entity_Node = 62361, \
+                                             Entity_Node = 61307, \
                                              Entity_Quad_Edge = 833, \
-                                             Entity_Quad_Triangle = 983, \
-                                             Entity_Quad_Tetra = 7642, \
+                                             Entity_Quad_Triangle = 1014, \
+                                             Entity_Quad_Tetra = 6800, \
                                              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 5f9841df60f332a82a5075c6b496f53f52148e5d..dad8e95307c852f40b2598e90af8d7d58957bb7e 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.py
@@ -123,10 +123,10 @@ class fissureCoude_7(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 7758, \
                                              Entity_Quad_Hexa = 10696, \
-                                             Entity_Node = 70936, \
+                                             Entity_Node = 69423, \
                                              Entity_Quad_Edge = 881, \
-                                             Entity_Quad_Triangle = 1300, \
-                                             Entity_Quad_Tetra = 10449, \
+                                             Entity_Quad_Triangle = 1350, \
+                                             Entity_Quad_Tetra = 9271, \
                                              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 21dc591bf231322f3e4d253a927ff149ccb883b1..1187f29f8936dc5bb199e4d51fb5623a69e67d8e 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
@@ -123,10 +123,10 @@ class fissureCoude_8(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 4572, \
                                              Entity_Quad_Hexa = 5128, \
-                                             Entity_Node = 46393, \
+                                             Entity_Node = 43443, \
                                              Entity_Quad_Edge = 648, \
-                                             Entity_Quad_Triangle = 1286, \
-                                             Entity_Quad_Tetra = 11686, \
+                                             Entity_Quad_Triangle = 1332, \
+                                             Entity_Quad_Tetra = 9431, \
                                              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 34729ce4d67c1531d9e10ade974ba2f832c08b1a..98cfaa9f08693de0a7e755d5815ee4bd88f0b1db 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_9.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_9.py
@@ -121,10 +121,10 @@ class fissureCoude_9(fissureCoude):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 14864, \
                                              Entity_Quad_Hexa = 26772, \
-                                             Entity_Node = 157045, \
+                                             Entity_Node = 153298, \
                                              Entity_Quad_Edge = 1237, \
                                              Entity_Quad_Triangle = 3338, \
-                                             Entity_Quad_Tetra = 17484, \
+                                             Entity_Quad_Tetra = 14643, \
                                              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 492122da852455f98dc2cb668e11c93a293c4840..3699ce0b085e8950ff7fd6e69490e3251ef59680 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py
@@ -533,10 +533,10 @@ class fissure_Coude(fissureGenerique):
       self.referencesMaillageFissure = dict( \
                                              Entity_Quad_Quadrangle = 6710, \
                                              Entity_Quad_Hexa = 8656, \
-                                             Entity_Node = 77391, \
+                                             Entity_Node = 71784, \
                                              Entity_Quad_Edge = 1006, \
                                              Entity_Quad_Triangle = 2496, \
-                                             Entity_Quad_Tetra = 20711, \
+                                             Entity_Quad_Tetra = 16504, \
                                              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 83d2b3d68b974581f86b9148fcc625429d35743a..47e87e7102885cc2a6103366a8f458af8120aff8 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
@@ -89,13 +89,26 @@ class fissure_Coude_4(fissure_Coude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 11852, \
-                                          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 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             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 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             Entity_Quad_Hexa = 22208, \
+                                             Entity_Node = 124493, \
+                                             Entity_Quad_Edge = 1192, \
+                                             Entity_Quad_Triangle = 1616, \
+                                             Entity_Quad_Tetra = 11977, \
+                                             Entity_Quad_Pyramid = 948, \
+                                             Entity_Quad_Penta = 732 \
+      )