X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfissureCoude_8.py;h=502b3b0b7099024e33c5d2fe3d079af7448e5971;hp=8f41951205bb9674de711634350b3ac3b2570f8e;hb=HEAD;hpb=591a1c9862203ee0d8358b33e2fa2c14459f185b

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_8.py b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
index 8f4195120..d0375e48b 100644
--- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020  EDF R&D
+# Copyright (C) 2014-2024  EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Fissure dans un coude - ASCOU16"""
 
 import os
 
@@ -26,6 +27,11 @@ class fissureCoude_8(fissureCoude):
   """cas test ASCOU16"""
 
   nomProbleme = "fissureCoude_8"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -83,7 +89,7 @@ class fissureCoude_8(fissureCoude):
                                    externe     = False)
 
   # ---------------------------------------------------------------------------
-                                   
+
   def setParamMaillageFissure(self):
     """
     Paramètres du maillage de la fissure pour le tuyau coudé
@@ -93,21 +99,34 @@ class fissureCoude_8(fissureCoude):
     areteFaceFissure = taille cible de l'arête des triangles en face de fissure.
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
-                                      nomFicSain    = self.nomCas,
-                                      nomFicFissure = 'fissure_' + self.nomCas,
+                                      nomFicSain    = self.nomProbleme,
+                                      nomFicFissure = self.nomProbleme + "_fissure",
                                       nbsegRad      = 4,
                                       nbsegCercle   = 16,
                                       areteFaceFissure = 5)
-    
+
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7758, \
-                                          Entity_Quad_Hexa = 10696, \
-                                          Entity_Node = 71535, \
-                                          Entity_Quad_Edge = 882, \
-                                          Entity_Quad_Triangle = 1378, \
-                                          Entity_Quad_Tetra = 10847, \
-                                          Entity_Quad_Pyramid = 668, \
-                                          Entity_Quad_Penta = 612 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4572, \
+                                             Entity_Quad_Hexa = 5128, \
+                                             Entity_Node = 43015, \
+                                             Entity_Quad_Edge = 648, \
+                                             Entity_Quad_Triangle = 1282, \
+                                             Entity_Quad_Tetra = 9146, \
+                                             Entity_Quad_Pyramid = 768, \
+                                             Entity_Quad_Penta = 752 \
+                                           )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4572, \
+                                             Entity_Quad_Hexa = 5128, \
+                                             Entity_Node = 43443, \
+                                             Entity_Quad_Edge = 648, \
+                                             Entity_Quad_Triangle = 1332, \
+                                             Entity_Quad_Tetra = 9431, \
+                                             Entity_Quad_Pyramid = 768, \
+                                             Entity_Quad_Penta = 752 \
+                                           )