X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2FfaceGauche.py;h=d1bf2f6448e2b2657e4dc5e13abc79c1e721b408;hp=1be9de5c4eed1692a25380558fb25fca25308c31;hb=300e5f1bc562d4d8f9dcc66721dfe0d9a3b873cb;hpb=b66ee19eeaa375d4cde342644be81e8ce29fa14b diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py index 1be9de5c4..d1bf2f644 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche.py +++ b/src/Tools/blocFissure/CasTests/faceGauche.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,22 +17,17 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +"""problème de fissure non plane, débouchante non normale""" import os -from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh - -import math -import GEOM -import SALOMEDS -import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin import logging -from blocFissure.gmu.fissureGenerique import fissureGenerique +from blocFissure import gmu +from blocFissure.gmu.geomsmesh import geompy +from blocFissure.gmu.geomsmesh import smesh +from blocFissure.gmu.putName import putName +from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.triedreBase import triedreBase from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain @@ -44,13 +39,16 @@ class faceGauche(fissureGenerique): """problème de fissure non plane, débouchante non normale""" nomProbleme = "faceGauche" + shapeFissureParams = dict() + maillageFissureParams = dict() + referencesMaillageFissure = dict() # --------------------------------------------------------------------------- def genereMaillageSain(self, geometriesSaines, meshParams): logging.info("genereMaillageSain %s", self.nomCas) - ([objetSain], status) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests/faceGaucheSain.med")) - smesh.SetName(objetSain.GetMesh(), 'objetSain') + ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheSain.med")) + putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -68,56 +66,73 @@ class faceGauche(fissureGenerique): rayonPipe = 20) # --------------------------------------------------------------------------- - def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): + def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \ + mailleur="MeshGems"): logging.info("genereShapeFissure %s", self.nomCas) lgInfluence = shapeFissureParams['lgInfluence'] - shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests/faceGaucheFiss.brep")) + shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheFiss.brep")) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) geompy.UnionIDs(fondFiss, [6]) geompy.addToStudy( shellFiss, 'shellFiss' ) geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) - - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,50) + mailleur = self.mailleur2d3d() + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,50, mailleur, self.numeroCas) centre = None return [shellFiss, centre, lgInfluence, coordsNoeudsFissure, fondFiss] # --------------------------------------------------------------------------- def setParamMaillageFissure(self): - self.maillageFissureParams = dict(nomRep = '.', - nomFicSain = self.nomCas, - nomFicFissure = 'fissure_' + self.nomCas, + self.maillageFissureParams = dict(nomRep = os.curdir, + nomFicSain = self.nomProbleme, + nomFicFissure = self.nomProbleme + "_fissure", nbsegRad = 5, nbsegCercle = 8, areteFaceFissure = 1000) # --------------------------------------------------------------------------- def genereZoneDefaut(self, geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams): - elementsDefaut = creeZoneDefautDansObjetSain(geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams) + elementsDefaut = creeZoneDefautDansObjetSain(geometriesSaines, maillagesSains, shapesFissure, shapeFissureParams, maillageFissureParams, \ + self.numeroCas) return elementsDefaut # --------------------------------------------------------------------------- - def genereMaillageFissure(self, geometriesSaines, maillagesSains, - shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step): - maillageFissure = construitFissureGenerale(maillagesSains, - shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step) + def genereMaillageFissure(self, geometriesSaines, maillagesSains, \ + shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, step, \ + mailleur="MeshGems"): + + mailleur = self.mailleur2d3d() + maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, \ + mailleur, self.numeroCas) 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_Edge = 750, \ + Entity_Quad_Quadrangle = 4177, \ + Entity_Quad_Hexa = 6224, \ + Entity_Node = 81588, \ + Entity_Quad_Triangle = 2298, \ + Entity_Quad_Tetra = 33764, \ + Entity_Quad_Pyramid = 1236, \ + Entity_Quad_Penta = 936 \ + ) + else: + self.referencesMaillageFissure = dict( \ + Entity_Quad_Quadrangle = 4177, \ + Entity_Quad_Hexa = 6224, \ + Entity_Node = 83887, \ + Entity_Quad_Edge = 750, \ + Entity_Quad_Triangle = 2434, \ + Entity_Quad_Tetra = 35375, \ + Entity_Quad_Pyramid = 1236, \ + Entity_Quad_Penta = 936 \ + )