X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfissureCoude_2.py;h=24bd03b2e52e8c2d44a49bb1fca61b1a9ed8e752;hp=1fbcf8972657d3adbbac18dc88b1e64d7cb4a59a;hb=HEAD;hpb=93b3222f60b81f9440e991f5684bd65e282d2b0e

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_2.py b/src/Tools/blocFissure/CasTests/fissureCoude_2.py
index 1fbcf8972..4cc25dddb 100644
--- a/src/Tools/blocFissure/CasTests/fissureCoude_2.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_2.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,16 +17,21 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Fissure dans un coude"""
 
 import os
 
 from blocFissure.gmu.fissureCoude  import fissureCoude
 
 class fissureCoude_2(fissureCoude):
-  """problème de fissure du Coude : adaptation maillage
-  """
+  """problème de fissure du Coude : adaptation maillage"""
 
   nomProbleme = "fissureCoude_2"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -92,23 +97,34 @@ class fissureCoude_2(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      = 5,
                                       nbsegCercle   = 6,
                                       areteFaceFissure = 5)
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7828, \
-                                          Entity_Quad_Hexa = 10437, \
-                                          Entity_Node = 101695, \
-                                          Entity_Quad_Edge = 1199, \
-                                          Entity_Quad_Triangle = 4230, \
-                                          Entity_Quad_Tetra = 30013, \
-                                          Entity_Quad_Pyramid = 1428, \
-                                          Entity_Quad_Penta = 1344 \
-                                         )
-
-
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7828, \
+                                             Entity_Quad_Hexa = 10437, \
+                                             Entity_Node = 101695, \
+                                             Entity_Quad_Edge = 1199, \
+                                             Entity_Quad_Triangle = 4230, \
+                                             Entity_Quad_Tetra = 30013, \
+                                             Entity_Quad_Pyramid = 1428, \
+                                             Entity_Quad_Penta = 1344 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7828, \
+                                             Entity_Quad_Hexa = 10437, \
+                                             Entity_Node = 109737, \
+                                             Entity_Quad_Edge = 1199, \
+                                             Entity_Quad_Triangle = 4702, \
+                                             Entity_Quad_Tetra = 35559, \
+                                             Entity_Quad_Pyramid = 1428, \
+                                             Entity_Quad_Penta = 1344 \
+      )