[COTECH] Fix copyright to be CEA, EDF

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

diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py
index 939c90a5d58ec8f98d603ca2d27f5d76d1b79446..640c037161ad3090afe18df81ec07556172d6455 100644 (file)
--- a/src/Tools/blocFissure/CasTests/faceGauche.py
+++ b/src/Tools/blocFissure/CasTests/faceGauche.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-# Copyright (C) 2014-2021  EDF R&D
+# Copyright (C) 2014-2024  CEA, EDF

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public


@@ -20,19 +20,14 @@
 """problème de fissure non plane, débouchante non normale"""
 
 import os
 """problème de fissure non plane, débouchante non normale"""
 
 import os

+import logging
+

 from blocFissure import gmu
 from blocFissure import gmu

-from blocFissure.gmu.geomsmesh import geompy, smesh
+from blocFissure.gmu.geomsmesh import geompy
+from blocFissure.gmu.geomsmesh import smesh

 from blocFissure.gmu.putName import putName
 
 from blocFissure.gmu.putName import putName
 

-import math
-import GEOM
-import SALOMEDS
-import SMESH
-
-import logging
-

 from blocFissure.gmu.fissureGenerique import fissureGenerique
 from blocFissure.gmu.fissureGenerique import fissureGenerique

-

 from blocFissure.gmu.triedreBase import triedreBase
 from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain
 from blocFissure.gmu.triedreBase import triedreBase
 from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain


@@ -53,7 +48,7 @@ class faceGauche(fissureGenerique):
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheSain.med"))
     logging.info("genereMaillageSain %s", self.nomCas)
 
     ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheSain.med"))

-    putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas)
+    putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas)

 
     return [objetSain, True] # True : maillage hexa
 
 
     return [objetSain, True] # True : maillage hexa
 


@@ -92,8 +87,8 @@ class faceGauche(fissureGenerique):
   # ---------------------------------------------------------------------------
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,
   # ---------------------------------------------------------------------------
   def setParamMaillageFissure(self):
     self.maillageFissureParams = dict(nomRep           = os.curdir,

-                                      nomFicSain       = self.nomCas,
-                                      nomFicFissure    = self.nomCas + "_fissure",
+                                      nomFicSain       = self.nomProbleme,
+                                      nomFicFissure    = self.nomProbleme + "_fissure",

                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)
                                       nbsegRad         = 5,
                                       nbsegCercle      = 8,
                                       areteFaceFissure = 1000)


@@ -113,18 +108,31 @@ class faceGauche(fissureGenerique):
     mailleur = self.mailleur2d3d()
     maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
                                                maillageFissureParams, elementsDefaut, \
     mailleur = self.mailleur2d3d()
     maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \
                                                maillageFissureParams, elementsDefaut, \

-                                               step, mailleur, self.numeroCas)
+                                               mailleur, self.numeroCas)

     return maillageFissure
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):
     return maillageFissure
 
   # ---------------------------------------------------------------------------
   def setReferencesMaillageFissure(self):

-    self.referencesMaillageFissure = dict( \
-                                          Entity_Quad_Quadrangle = 3997, \
-                                          Entity_Quad_Hexa = 5904, \
-                                          Entity_Node = 77735, \
-                                          Entity_Quad_Edge = 725, \
-                                          Entity_Quad_Triangle = 2176, \
-                                          Entity_Quad_Tetra = 32320, \
-                                          Entity_Quad_Pyramid = 1156, \
-                                          Entity_Quad_Penta = 856 \
-                                         )
+    from salome.smesh import smeshBuilder
+    if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4177, \
+                                             Entity_Quad_Hexa = 6224, \
+                                             Entity_Node = 74848, \
+                                             Entity_Quad_Edge = 749, \
+                                             Entity_Quad_Triangle = 2338, \
+                                             Entity_Quad_Tetra = 28628, \
+                                             Entity_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )
+    else:
+      self.referencesMaillageFissure = dict( \
+                                             Entity_Quad_Quadrangle = 4177, \
+                                             Entity_Quad_Hexa = 6224, \
+                                             Entity_Node = 76374, \
+                                             Entity_Quad_Edge = 750, \
+                                             Entity_Quad_Triangle = 2434, \
+                                             Entity_Quad_Tetra = 29698, \
+                                             Entity_Quad_Pyramid = 1236, \
+                                             Entity_Quad_Penta = 936 \
+      )