X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfissureCoude_9.py;h=cfd205ecee801bad43c596ebcadfe564e0125e60;hp=bfc6b64aca0d4145a7346d6062af1d9f6e60dbdb;hb=300e5f1bc562d4d8f9dcc66721dfe0d9a3b873cb;hpb=f79e964b7592c63818f892516f3b4936d7704397 diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_9.py b/src/Tools/blocFissure/CasTests/fissureCoude_9.py index bfc6b64ac..cfd205ece 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_9.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_9.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 @@ -97,21 +97,34 @@ class fissureCoude_9(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 = 6, nbsegCercle = 20, areteFaceFissure = 2.5) # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 14864, \ - Entity_Quad_Hexa = 26772, \ - Entity_Node = 156163, \ - Entity_Quad_Edge = 1237, \ - Entity_Quad_Triangle = 3178, \ - Entity_Quad_Tetra = 16952, \ - Entity_Quad_Pyramid = 916, \ - Entity_Quad_Penta = 780 \ - ) + from salome.smesh import smeshBuilder + if smeshBuilder.NETGEN_VERSION_MAJOR < 6: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 14864, \ + Entity_Quad_Hexa = 26772, \ + Entity_Node = 156163, \ + Entity_Quad_Edge = 1237, \ + Entity_Quad_Triangle = 3178, \ + Entity_Quad_Tetra = 16952, \ + Entity_Quad_Pyramid = 916, \ + Entity_Quad_Penta = 780 \ + ) + else: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 14864, \ + Entity_Quad_Hexa = 26772, \ + Entity_Node = 157045, \ + Entity_Quad_Edge = 1237, \ + Entity_Quad_Triangle = 3338, \ + Entity_Quad_Tetra = 17484, \ + Entity_Quad_Pyramid = 916, \ + Entity_Quad_Penta = 780 \ + )