bos #26515 [CEA 24622] Failing SMESH tests

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

diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_7.py b/src/Tools/blocFissure/CasTests/fissureCoude_7.py
index a01b7926120e50fba54762b8f3e783be3416e126..5601392a04101d18dc1764768be7d414f6f3b442 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py
+++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.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,15 +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_7(fissureCoude):
-  """fissureCoude_7"""
+  """fissure dans un coude"""
 
   nomProbleme = "fissureCoude_7"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -83,7 +89,7 @@ class fissureCoude_7(fissureCoude):
                                    externe     = True)
 
   # ---------------------------------------------------------------------------
-                                   
+
   def setParamMaillageFissure(self):
     """
     Paramètres du maillage de la fissure pour le tuyau coudé
@@ -93,22 +99,34 @@ class fissureCoude_7(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   = 12,
-                                      areteFaceFissure = 5)                                   
+                                      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 = 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 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 7758, \
+                                             Entity_Quad_Hexa = 10696, \
+                                             Entity_Node = 70936, \
+                                             Entity_Quad_Edge = 881, \
+                                             Entity_Quad_Triangle = 1300, \
+                                             Entity_Quad_Tetra = 10449, \
+                                             Entity_Quad_Pyramid = 668, \
+                                             Entity_Quad_Penta = 612 \
+                                           )