bos #29764 EDF - SMESH_blocfissure* fail

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

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_10.py b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
index 65adc7565d3161232be6a1ac93f7e7086885aefb..d15a4da2c235462e94517b8f6e51b4568f99feb7 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_10.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_10.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020  EDF R&D
+# Copyright (C) 2014-2021  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -99,21 +99,34 @@ class fissureCoude_10(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      = 3,
                                       nbsegCercle   = 8,
                                       areteFaceFissure = 2.5)
 
   # ---------------------------------------------------------------------------
   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 = 73615, \
+                                              Entity_Quad_Edge = 1346, \
+                                              Entity_Quad_Triangle = 9022, \
+                                              Entity_Quad_Tetra = 20920, \
+                                              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 \
+      )