X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfissureCoude_1.py;h=479a365f24c084869e16b8f1ae01563bf33796ef;hb=499f29d24922cec66e41b41a0039a954993bc6df;hp=f26031bafb1590b2cb35b0a05457124ca9ab770d;hpb=b24a2d1b7692bdb21cf037b026e0273ba547cef4;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_1.py b/src/Tools/blocFissure/CasTests/fissureCoude_1.py index f26031baf..479a365f2 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_1.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_1.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2021 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 @@ -97,21 +97,34 @@ class fissureCoude_1(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 = 5, nbsegCercle = 6, areteFaceFissure = 5) # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): - self.referencesMaillageFissure = dict( \ + from salome.smesh import smeshBuilder + if smeshBuilder.NETGEN_VERSION_MAJOR < 6: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 6042, \ + Entity_Quad_Hexa = 7794, \ + Entity_Node = 63900, \ + Entity_Quad_Edge = 874, \ + Entity_Quad_Triangle = 2058, \ + Entity_Quad_Tetra = 14900, \ + Entity_Quad_Pyramid = 738, \ + Entity_Quad_Penta = 672 \ + ) + else: + self.referencesMaillageFissure = dict( \ Entity_Quad_Quadrangle = 6042, \ Entity_Quad_Hexa = 7794, \ - Entity_Node = 65337, \ + Entity_Node = 65091, \ Entity_Quad_Edge = 874, \ - Entity_Quad_Triangle = 2058, \ - Entity_Quad_Tetra = 16037, \ + Entity_Quad_Triangle = 2116, \ + Entity_Quad_Tetra = 15734, \ Entity_Quad_Pyramid = 738, \ Entity_Quad_Penta = 672 \ - ) + )