bos #26515 [CEA 24622] Failing SMESH tests

  Reference quantities depend on NETGEN version

diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py
index aaf78dc8aa40746ce54d7ea1f9f573594faf9447..2180003f0e81c7bcbc06c02e790706a537bfbdbb 100644 (file)
--- a/src/Tools/blocFissure/CasTests/ellipse_2.py
+++ b/src/Tools/blocFissure/CasTests/ellipse_2.py
@@ -58,13 +58,27 @@ class ellipse_2(ellipse_1):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    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 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      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 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 1748, \
+                                             Entity_Quad_Hexa = 3795, \
+                                             Entity_Node = 22022, \
+                                             Entity_Quad_Edge = 258, \
+                                             Entity_Quad_Triangle = 412, \
+                                             Entity_Quad_Tetra = 2442, \
+                                             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 b04c9a5513e457df56ac9cd431870388cec795d4..d1bf2f6448e2b2657e4dc5e13abc79c1e721b408 100644 (file)
--- a/src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche.py
@@ -113,13 +113,26 @@ class faceGauche(fissureGenerique):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    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_Quad_Pyramid = 1236, \
-                                          Entity_Quad_Penta = 936 \
-                                         )
+    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_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4177, \
+                                             Entity_Quad_Hexa = 6224, \
+                                             Entity_Node = 83887, \
+                                             Entity_Quad_Edge = 750, \
+                                             Entity_Quad_Triangle = 2434, \
+                                             Entity_Quad_Tetra = 35375, \
+                                             Entity_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_10.py b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
index e9a83799d987961830be3fbf587ad0f025e2f30a..51160ffffe386e0549c1366032479072c07576ad 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_10.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
@@ -107,13 +107,26 @@ class fissureCoude_10(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict ( \
-                                            Entity_Quad_Quadrangle = 6160, \
-                                            Entity_Quad_Hexa = 5864, \
-                                            Entity_Node = 78012, \
-                                            Entity_Quad_Edge = 1346, \
-                                            Entity_Quad_Triangle = 9022, \
-                                            Entity_Quad_Tetra = 24341, \
-                                            Entity_Quad_Pyramid = 1232, \
-                                            Entity_Quad_Penta = 1136 \
-                                          )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict ( \
+                                              Entity_Quad_Quadrangle = 6160, \
+                                              Entity_Quad_Hexa = 5864, \
+                                              Entity_Node = 78012, \
+                                              Entity_Quad_Edge = 1346, \
+                                              Entity_Quad_Triangle = 9022, \
+                                              Entity_Quad_Tetra = 24341, \
+                                              Entity_Quad_Pyramid = 1232, \
+                                              Entity_Quad_Penta = 1136 \
+      )
+    else:
+      self.referencesMaillageFissure = dict ( \
+                                              Entity_Quad_Quadrangle = 6160, \
+                                              Entity_Quad_Hexa = 5864, \
+                                              Entity_Node = 80605, \
+                                              Entity_Quad_Edge = 1345, \
+                                              Entity_Quad_Triangle = 9726, \
+                                              Entity_Quad_Tetra = 25690, \
+                                              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 8b981329b1c1ec915391cb6dc61ca1f452bf4a2e..24bd03b2e52e8c2d44a49bb1fca61b1a9ed8e752 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_2.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_2.py
@@ -105,13 +105,26 @@ class fissureCoude_2(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7828, \
-                                          Entity_Quad_Hexa = 10437, \
-                                          Entity_Node = 101695, \
-                                          Entity_Quad_Edge = 1199, \
-                                          Entity_Quad_Triangle = 4230, \
-                                          Entity_Quad_Tetra = 30013, \
-                                          Entity_Quad_Pyramid = 1428, \
-                                          Entity_Quad_Penta = 1344 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7828, \
+                                             Entity_Quad_Hexa = 10437, \
+                                             Entity_Node = 101695, \
+                                             Entity_Quad_Edge = 1199, \
+                                             Entity_Quad_Triangle = 4230, \
+                                             Entity_Quad_Tetra = 30013, \
+                                             Entity_Quad_Pyramid = 1428, \
+                                             Entity_Quad_Penta = 1344 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7828, \
+                                             Entity_Quad_Hexa = 10437, \
+                                             Entity_Node = 106391, \
+                                             Entity_Quad_Edge = 1199, \
+                                             Entity_Quad_Triangle = 4702, \
+                                             Entity_Quad_Tetra = 33175, \
+                                             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 5874a54dd62491aeabc31a676e3efde6ae539cc8..5d53ee6e924b4067cf1de403d8875621f90201e0 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_5.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
@@ -105,13 +105,26 @@ class fissureCoude_5(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 5366, \
-                                          Entity_Quad_Hexa = 7120, \
-                                          Entity_Node = 54832, \
-                                          Entity_Quad_Edge = 722, \
-                                          Entity_Quad_Triangle = 1570, \
-                                          Entity_Quad_Tetra = 11747, \
-                                          Entity_Quad_Pyramid = 532, \
-                                          Entity_Quad_Penta = 496 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 5366, \
+                                             Entity_Quad_Hexa = 7120, \
+                                             Entity_Node = 54832, \
+                                             Entity_Quad_Edge = 722, \
+                                             Entity_Quad_Triangle = 1570, \
+                                             Entity_Quad_Tetra = 11747, \
+                                             Entity_Quad_Pyramid = 532, \
+                                             Entity_Quad_Penta = 496 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 5366, \
+                                             Entity_Quad_Hexa = 7120, \
+                                             Entity_Node = 54175, \
+                                             Entity_Quad_Edge = 721, \
+                                             Entity_Quad_Triangle = 1482, \
+                                             Entity_Quad_Tetra = 11324, \
+                                             Entity_Quad_Pyramid = 532, \
+                                             Entity_Quad_Penta = 496 \
+      )

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_9.py b/src/Tools/blocFissure/CasTests/fissureCoude_9.py
index 79485fcbfecc14919a80e8fe189258a161a7fa26..cfd205ecee801bad43c596ebcadfe564e0125e60 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_9.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_9.py
@@ -105,13 +105,26 @@ class fissureCoude_9(fissureCoude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 14864, \
-                                          Entity_Quad_Hexa = 26772, \
-                                          Entity_Node = 156163, \
-                                          Entity_Quad_Edge = 1237, \
-                                          Entity_Quad_Triangle = 3178, \
-                                          Entity_Quad_Tetra = 16952, \
-                                          Entity_Quad_Pyramid = 916, \
-                                          Entity_Quad_Penta = 780 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 14864, \
+                                             Entity_Quad_Hexa = 26772, \
+                                             Entity_Node = 156163, \
+                                             Entity_Quad_Edge = 1237, \
+                                             Entity_Quad_Triangle = 3178, \
+                                             Entity_Quad_Tetra = 16952, \
+                                             Entity_Quad_Pyramid = 916, \
+                                             Entity_Quad_Penta = 780 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 14864, \
+                                             Entity_Quad_Hexa = 26772, \
+                                             Entity_Node = 157045, \
+                                             Entity_Quad_Edge = 1237, \
+                                             Entity_Quad_Triangle = 3338, \
+                                             Entity_Quad_Tetra = 17484, \
+                                             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 71dadf336781862560d8a0e634756a834baaf4c4..afd31061d7ffc62f16718baf15c481377e3cdbfc 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py
@@ -517,13 +517,26 @@ class fissure_Coude(fissureGenerique):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 6710, \
-                                          Entity_Quad_Hexa = 8656, \
-                                          Entity_Node = 76807, \
-                                          Entity_Quad_Edge = 1006, \
-                                          Entity_Quad_Triangle = 2342, \
-                                          Entity_Quad_Tetra = 20392, \
-                                          Entity_Quad_Pyramid = 1232, \
-                                          Entity_Quad_Penta = 1176 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 6710, \
+                                             Entity_Quad_Hexa = 8656, \
+                                             Entity_Node = 76807, \
+                                             Entity_Quad_Edge = 1006, \
+                                             Entity_Quad_Triangle = 2342, \
+                                             Entity_Quad_Tetra = 20392, \
+                                             Entity_Quad_Pyramid = 1232, \
+                                             Entity_Quad_Penta = 1176 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 6710, \
+                                             Entity_Quad_Hexa = 8656, \
+                                             Entity_Node = 77391, \
+                                             Entity_Quad_Edge = 1006, \
+                                             Entity_Quad_Triangle = 2496, \
+                                             Entity_Quad_Tetra = 20711, \
+                                             Entity_Quad_Pyramid = 1232, \
+                                             Entity_Quad_Penta = 1176 \
+      )