bos #29764 EDF - SMESH_blocfissure* fail

[modules/smesh.git] / src / Tools / blocFissure / CasTests / fissureCoude_8.py

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_8.py b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
index 7ca8505d8a9a4c84acf5464e69cc2ecef55fc1a3..21dc591bf231322f3e4d253a927ff149ccb883b1 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
@@ -99,21 +99,34 @@ class fissureCoude_8(fissureCoude):
     areteFaceFissure = taille cible de l'arête des triangles en face de fissure.
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
-                                      nomFicSain    = self.nomCas,
-                                      nomFicFissure = self.nomCas + "_fissure",
+                                      nomFicSain    = self.nomProbleme,
+                                      nomFicFissure = self.nomProbleme + "_fissure",
                                       nbsegRad      = 4,
                                       nbsegCercle   = 16,
                                       areteFaceFissure = 5)
 
   # ---------------------------------------------------------------------------
   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 = 43015, \
+                                             Entity_Quad_Edge = 648, \
+                                             Entity_Quad_Triangle = 1282, \
+                                             Entity_Quad_Tetra = 9146, \
+                                             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 \
+                                           )