Merge branch 'V9_9_BR'

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

diff --git a/src/Tools/blocFissure/CasTests/cylindre.py b/src/Tools/blocFissure/CasTests/cylindre.py
index 6aacd332fe12f7226a855c7651a1823d89263450..d79924f39c28429bf2a8af245328fe3b796fa7e0 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cylindre.py
+++ b/src/Tools/blocFissure/CasTests/cylindre.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 cylindre(fissureGenerique):
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "CylindreSain.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
 
@@ -85,8 +85,8 @@ class cylindre(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 = 20)
@@ -114,10 +114,10 @@ class cylindre(fissureGenerique):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 6920, \
                                           Entity_Quad_Hexa = 18174, \
-                                          Entity_Node = 104349, \
+                                          Entity_Node = 100923, \
                                           Entity_Quad_Edge = 718, \
                                           Entity_Quad_Triangle = 952, \
-                                          Entity_Quad_Tetra = 16691, \
+                                          Entity_Quad_Tetra = 14111, \
                                           Entity_Quad_Pyramid = 1110, \
                                           Entity_Quad_Penta = 336 \
                                          )