X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfissureCoude_6.py;h=f5e9338f93e1a77a58ca3a1f4fdc51a203c32599;hp=43c9ebf2e101ddcb390c42fe2fd8b4f3033d67fb;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=c905727828a33af44c02dce80987b3ba57ab3300

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py
index 43c9ebf2e..f5e9338f9 100644
--- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.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
@@ -17,6 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Fissure dans un coude - ASCOU08"""
 
 import os
 
@@ -26,6 +27,11 @@ class fissureCoude_6(fissureCoude):
   """ASCOU08"""
 
   nomProbleme = "fissureCoude_6"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -92,22 +98,34 @@ class fissureCoude_6(fissureCoude):
     areteFaceFissure = taille cible de l'arête des triangles en face de fissure.
     """
     self.maillageFissureParams = dict(nomRep        = os.curdir,
-                                      nomFicSain    = self.nomCas,
-                                      nomFicFissure = self.nomCas + "_fissure",
+                                      nomFicSain    = self.nomProbleme,
+                                      nomFicFissure = self.nomProbleme + "_fissure",
                                       nbsegRad      = 5,
                                       nbsegCercle   = 12,
                                       areteFaceFissure = 5)
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 7392, \
-                                          Entity_Quad_Hexa = 9888, \
-                                          Entity_Node = 62571, \
-                                          Entity_Quad_Edge = 833, \
-                                          Entity_Quad_Triangle = 1048, \
-                                          Entity_Quad_Tetra = 7723, \
-                                          Entity_Quad_Pyramid = 452, \
-                                          Entity_Quad_Penta = 408 \
-                                         )
-
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7392, \
+                                             Entity_Quad_Hexa = 9888, \
+                                             Entity_Node = 61217, \
+                                             Entity_Quad_Edge = 833, \
+                                             Entity_Quad_Triangle = 1024, \
+                                             Entity_Quad_Tetra = 6725, \
+                                             Entity_Quad_Pyramid = 452, \
+                                             Entity_Quad_Penta = 408 \
+                                           )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7392, \
+                                             Entity_Quad_Hexa = 9888, \
+                                             Entity_Node = 61307, \
+                                             Entity_Quad_Edge = 833, \
+                                             Entity_Quad_Triangle = 1014, \
+                                             Entity_Quad_Tetra = 6800, \
+                                             Entity_Quad_Pyramid = 452, \
+                                             Entity_Quad_Penta = 408 \
+      )