Merge branch 'V9_11_BR'

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

diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
index c697198bb53d7ff52ebb2769a6f9d5c230bb5cc4..12a709ad01bc0411d3c45af67b36c1928c54a59c 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021  EDF R&D
+# Copyright (C) 2014-2023  EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -76,7 +76,7 @@ class fissure_Coude_4(fissure_Coude):
     """
     self.shapeFissureParams = dict(nomRep        = os.curdir,
                                    nomFicSain    = self.nomCas,
-                                   nomFicFissure = self.nomCas + "_fissure",
+                                   nomFicFissure = self.nomProbleme + "_fissure",
                                    profondeur  = 10,
                                    azimut      = 90,
                                    alpha       = 20,
@@ -89,13 +89,26 @@ class fissure_Coude_4(fissure_Coude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 11852, \
-                                          Entity_Quad_Hexa       = 22208, \
-                                          Entity_Node            = 133418, \
-                                          Entity_Quad_Edge       = 1192, \
-                                          Entity_Quad_Triangle   = 1562, \
-                                          Entity_Quad_Tetra      = 18759, \
-                                          Entity_Quad_Pyramid    = 948, \
-                                          Entity_Quad_Penta      = 732, \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             Entity_Quad_Hexa = 22208, \
+                                             Entity_Node = 124711, \
+                                             Entity_Quad_Edge = 1192, \
+                                             Entity_Quad_Triangle = 1534, \
+                                             Entity_Quad_Tetra = 12204, \
+                                             Entity_Quad_Pyramid = 948, \
+                                             Entity_Quad_Penta = 732 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             Entity_Quad_Hexa = 22208, \
+                                             Entity_Node = 124493, \
+                                             Entity_Quad_Edge = 1192, \
+                                             Entity_Quad_Triangle = 1616, \
+                                             Entity_Quad_Tetra = 11977, \
+                                             Entity_Quad_Pyramid = 948, \
+                                             Entity_Quad_Penta = 732 \
+      )