Merge branch 'V9_9_BR'

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

diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
index 4db8c9c920a5d77cafcb40b650300f8c8186ab80..b9cc98fd05499c1a4ab1740a6606c8ba265910d6 100644 (file)
--- a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py
+++ b/src/Tools/blocFissure/CasTests/fissure_Coude_4.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 - ASCOU09A"""
 
 import os
 
@@ -29,6 +30,11 @@ class fissure_Coude_4(fissure_Coude):
   """
 
   nomProbleme = "fissure_Coude_4"
+  geomParams = dict()
+  meshParams = dict()
+  shapeFissureParams = dict()
+  maillageFissureParams = dict()
+  referencesMaillageFissure = dict()
 
 # ---------------------------------------------------------------------------
   def setParamGeometrieSaine(self):
@@ -68,10 +74,9 @@ class fissure_Coude_4(fissure_Coude):
     orientation : 0° : longitudinale, 90° : circonférentielle, autre : uniquement fissures elliptiques
     externe     : True : fissure face externe, False : fissure face interne
     """
-    print("setParamShapeFissure", self.nomCas)
     self.shapeFissureParams = dict(nomRep        = os.curdir,
                                    nomFicSain    = self.nomCas,
-                                   nomFicFissure = 'fissure_' + self.nomCas,
+                                   nomFicFissure = self.nomProbleme + "_fissure",
                                    profondeur  = 10,
                                    azimut      = 90,
                                    alpha       = 20,
@@ -84,12 +89,26 @@ class fissure_Coude_4(fissure_Coude):
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
-    self.referencesMaillageFissure = dict(Entity_Quad_Pyramid    = 948,
-                                          Entity_Quad_Triangle   = 1562,
-                                          Entity_Quad_Edge       = 1192,
-                                          Entity_Quad_Penta      = 732,
-                                          Entity_Quad_Hexa       = 22208,
-                                          Entity_Node            = 133418,
-                                          Entity_Quad_Tetra      = 18759,
-                                          Entity_Quad_Quadrangle = 11852)
-
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             Entity_Quad_Hexa = 22208, \
+                                             Entity_Node = 124711, \
+                                             Entity_Quad_Edge = 1192, \
+                                             Entity_Quad_Triangle = 1534, \
+                                             Entity_Quad_Tetra = 12204, \
+                                             Entity_Quad_Pyramid = 948, \
+                                             Entity_Quad_Penta = 732 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 11852, \
+                                             Entity_Quad_Hexa = 22208, \
+                                             Entity_Node = 124493, \
+                                             Entity_Quad_Edge = 1192, \
+                                             Entity_Quad_Triangle = 1616, \
+                                             Entity_Quad_Tetra = 11977, \
+                                             Entity_Quad_Pyramid = 948, \
+                                             Entity_Quad_Penta = 732 \
+      )