Merge branch 'V9_9_BR'

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

diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py
index a63053ae72a5fa00b2d1c3ec6302144ebde1ec43..db25c57ea0b5f51bfefbc965c7185c73731f20a9 100644 (file)
--- a/src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2021  EDF R&D
+# Copyright (C) 2014-2022  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
@@ -48,7 +48,7 @@ class faceGauche(fissureGenerique):
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheSain.med"))
-    putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas)
+    putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas)
 
     return [objetSain, True] # True : maillage hexa
 
@@ -87,8 +87,8 @@ class faceGauche(fissureGenerique):
   # ---------------------------------------------------------------------------
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
-                                      nomFicSain       = self.nomCas,
-                                      nomFicFissure    = self.nomCas + "_fissure",
+                                      nomFicSain       = self.nomProbleme,
+                                      nomFicFissure    = self.nomProbleme + "_fissure",
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
@@ -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_Quadrangle = 4177, \
+                                             Entity_Quad_Hexa = 6224, \
+                                             Entity_Node = 74848, \
+                                             Entity_Quad_Edge = 749, \
+                                             Entity_Quad_Triangle = 2338, \
+                                             Entity_Quad_Tetra = 28628, \
+                                             Entity_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4177, \
+                                             Entity_Quad_Hexa = 6224, \
+                                             Entity_Node = 76374, \
+                                             Entity_Quad_Edge = 750, \
+                                             Entity_Quad_Triangle = 2434, \
+                                             Entity_Quad_Tetra = 29698, \
+                                             Entity_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )