bos #26515 [CEA 24622] Failing SMESH tests

   for failure at EDF

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
index 394e29aee188eae01339c29f4e0f05460e3faf79..646e647c0727fb8fb22cccf6462a65ce7504c510 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
@@ -106,13 +106,26 @@ class fissureCoude_6(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7392, \
-                                          Entity_Quad_Hexa = 9888, \
-                                          Entity_Node = 62571, \
-                                          Entity_Quad_Edge = 833, \
-                                          Entity_Quad_Triangle = 1048, \
-                                          Entity_Quad_Tetra = 7723, \
-                                          Entity_Quad_Pyramid = 452, \
-                                          Entity_Quad_Penta = 408 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7392, \
+                                             Entity_Quad_Hexa = 9888, \
+                                             Entity_Node = 62571, \
+                                             Entity_Quad_Edge = 833, \
+                                             Entity_Quad_Triangle = 1048, \
+                                             Entity_Quad_Tetra = 7723, \
+                                             Entity_Quad_Pyramid = 452, \
+                                             Entity_Quad_Penta = 408 \
+                                           )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7392, \
+                                             Entity_Quad_Hexa = 9888, \
+                                             Entity_Node = 62361, \
+                                             Entity_Quad_Edge = 833, \
+                                             Entity_Quad_Triangle = 983, \
+                                             Entity_Quad_Tetra = 7642, \
+                                             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 f9e261752add33c0adc9fd22d8f5e1ee98da57c0..5601392a04101d18dc1764768be7d414f6f3b442 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.py
@@ -107,13 +107,26 @@ class fissureCoude_7(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7758, \
-                                          Entity_Quad_Hexa = 10696, \
-                                          Entity_Node = 71535, \
-                                          Entity_Quad_Edge = 882, \
-                                          Entity_Quad_Triangle = 1378, \
-                                          Entity_Quad_Tetra = 10847, \
-                                          Entity_Quad_Pyramid = 668, \
-                                          Entity_Quad_Penta = 612 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7758, \
+                                             Entity_Quad_Hexa = 10696, \
+                                             Entity_Node = 71535, \
+                                             Entity_Quad_Edge = 882, \
+                                             Entity_Quad_Triangle = 1378, \
+                                             Entity_Quad_Tetra = 10847, \
+                                             Entity_Quad_Pyramid = 668, \
+                                             Entity_Quad_Penta = 612 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7758, \
+                                             Entity_Quad_Hexa = 10696, \
+                                             Entity_Node = 70936, \
+                                             Entity_Quad_Edge = 881, \
+                                             Entity_Quad_Triangle = 1300, \
+                                             Entity_Quad_Tetra = 10449, \
+                                             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 4907620220af07b32cab0d600da23fdd3a89d32a..502b3b0b7099024e33c5d2fe3d079af7448e5971 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
@@ -107,13 +107,26 @@ class fissureCoude_8(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 4572, \
-                                          Entity_Quad_Hexa = 5128, \
-                                          Entity_Node = 45641, \
-                                          Entity_Quad_Edge = 648, \
-                                          Entity_Quad_Triangle = 1282, \
-                                          Entity_Quad_Tetra = 11122, \
-                                          Entity_Quad_Pyramid = 768, \
-                                          Entity_Quad_Penta = 752 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4572, \
+                                             Entity_Quad_Hexa = 5128, \
+                                             Entity_Node = 45641, \
+                                             Entity_Quad_Edge = 648, \
+                                             Entity_Quad_Triangle = 1282, \
+                                             Entity_Quad_Tetra = 11122, \
+                                             Entity_Quad_Pyramid = 768, \
+                                             Entity_Quad_Penta = 752 \
+                                           )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4572, \
+                                             Entity_Quad_Hexa = 5128, \
+                                             Entity_Node = 46393, \
+                                             Entity_Quad_Edge = 648, \
+                                             Entity_Quad_Triangle = 1286, \
+                                             Entity_Quad_Tetra = 11686, \
+                                             Entity_Quad_Pyramid = 768, \
+                                             Entity_Quad_Penta = 752 \
+                                           )