bos #26515 [CEA 24622] Failing SMESH tests

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

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_5.py b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
index 792778bf08f54926a459341b3b2315778a52162a..5d53ee6e924b4067cf1de403d8875621f90201e0 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_5.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_5.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020  EDF R&D
+# Copyright (C) 2014-2021  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"""
 
 import os
 
@@ -26,6 +27,11 @@ class fissureCoude_5(fissureCoude):
   """problème de fissure du Coude : - adaptation maillage"""
 
   nomProbleme = "fissureCoude_5"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -91,22 +97,34 @@ class fissureCoude_5(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   = 8,
                                       areteFaceFissure = 5)
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 5366, \
-                                          Entity_Quad_Hexa = 7120, \
-                                          Entity_Node = 54832, \
-                                          Entity_Quad_Edge = 722, \
-                                          Entity_Quad_Triangle = 1570, \
-                                          Entity_Quad_Tetra = 11747, \
-                                          Entity_Quad_Pyramid = 532, \
-                                          Entity_Quad_Penta = 496 \
-                                         )
-
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 5366, \
+                                             Entity_Quad_Hexa = 7120, \
+                                             Entity_Node = 54832, \
+                                             Entity_Quad_Edge = 722, \
+                                             Entity_Quad_Triangle = 1570, \
+                                             Entity_Quad_Tetra = 11747, \
+                                             Entity_Quad_Pyramid = 532, \
+                                             Entity_Quad_Penta = 496 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 5366, \
+                                             Entity_Quad_Hexa = 7120, \
+                                             Entity_Node = 54175, \
+                                             Entity_Quad_Edge = 721, \
+                                             Entity_Quad_Triangle = 1482, \
+                                             Entity_Quad_Tetra = 11324, \
+                                             Entity_Quad_Pyramid = 532, \
+                                             Entity_Quad_Penta = 496 \
+      )