Copyright update 2022

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

diff --git a/src/Tools/blocFissure/CasTests/cylindre_2.py b/src/Tools/blocFissure/CasTests/cylindre_2.py
index 6b17ff383b7441ecbceaa516453995250bc548af..15e2f2fdf24c71d7d9cf173fc7bdcf395fb71f6e 100644 (file)
--- a/src/Tools/blocFissure/CasTests/cylindre_2.py
+++ b/src/Tools/blocFissure/CasTests/cylindre_2.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020  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
@@ -24,22 +24,20 @@ import os
 import logging
 
 from blocFissure import gmu
-from blocFissure.gmu.geomsmesh import geompy, smesh
-from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
+from blocFissure.gmu.geomsmesh import geompy
 
-import GEOM
-import SALOMEDS
-import SMESH
+from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 
 from .cylindre import cylindre
 
 class cylindre_2(cylindre):
   """problème de fissure plane sur cylindre hexa, fond de fissure complexe : polyline"""
 
-  nomProbleme = "cylindre2"
+  nomProbleme = "cylindre_2"
 
   # ---------------------------------------------------------------------------
-  def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams):
+  def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \
+                                mailleur="MeshGems"):
     logging.info("genereShapeFissure %s", self.nomCas)
 
     lgInfluence = shapeFissureParams['lgInfluence']
@@ -50,8 +48,8 @@ class cylindre_2(cylindre):
     geompy.addToStudy( shellFiss, 'shellFiss' )
     geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' )
 
-
-    coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,15)
+    mailleur = self.mailleur2d3d()
+    coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,15, mailleur, self.numeroCas)
 
     centre = None
     return [shellFiss, centre, lgInfluence, coordsNoeudsFissure, fondFiss]
@@ -61,10 +59,10 @@ class cylindre_2(cylindre):
     self.referencesMaillageFissure = dict( \
                                           Entity_Quad_Quadrangle = 7028, \
                                           Entity_Quad_Hexa = 18366, \
-                                          Entity_Node = 105035, \
+                                          Entity_Node = 102327, \
                                           Entity_Quad_Edge = 735, \
                                           Entity_Quad_Triangle = 1056, \
-                                          Entity_Quad_Tetra = 16305, \
+                                          Entity_Quad_Tetra = 14255, \
                                           Entity_Quad_Pyramid = 1158, \
                                           Entity_Quad_Penta = 384 \
                                           )