From 5d57f4e2579153dda00e691664c27292bc0e3832 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 9 Nov 2021 15:22:19 +0300 Subject: [PATCH] bos #26515 [CEA 24622] Failing SMESH tests for failure at EDF --- .../blocFissure/CasTests/fissureCoude_6.py | 33 +++++++++++++------ .../blocFissure/CasTests/fissureCoude_7.py | 33 +++++++++++++------ .../blocFissure/CasTests/fissureCoude_8.py | 33 +++++++++++++------ 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py index 394e29aee..646e647c0 100644 --- 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 f9e261752..5601392a0 100644 --- 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 490762022..502b3b0b7 100644 --- 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 \ + ) -- 2.30.2