X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fvis_1.py;h=6de374e8815212b28787be728b8dd5755af2864c;hp=164fc752d0e3ad1debdcdcfbb1ab9cc2f7344448;hb=ff873c8b10f4cc15316f4ee7e1331ec1b4e0c1ab;hpb=34ab0eb4e96eaf71e934f90f78ebd5b45a216889 diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py index 164fc752d..6de374e88 100644 --- a/src/Tools/blocFissure/CasTests/vis_1.py +++ b/src/Tools/blocFissure/CasTests/vis_1.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,19 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +"""problème de fissure non plane, débouchante non normale""" +import logging import os + from blocFissure import gmu +from blocFissure.gmu import initLog from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.geomsmesh import geomPublish +from blocFissure.gmu.geomsmesh import geomPublishInFather -import math -import GEOM -import SALOMEDS -import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin -import logging - +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,6 +41,9 @@ class vis_1(fissureGenerique): """problème de fissure non plane, débouchante non normale""" nomProbleme = "vis_1" + shapeFissureParams = dict() + maillageFissureParams = dict() + referencesMaillageFissure = dict() # --------------------------------------------------------------------------- def genereMaillageSain(self, geometriesSaines, meshParams): @@ -51,7 +51,7 @@ class vis_1(fissureGenerique): logging.info(texte) ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "visSain.med")) - smesh.SetName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme)) + putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -70,7 +70,8 @@ class vis_1(fissureGenerique): rayonPipe = 0.1) # --------------------------------------------------------------------------- - def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): + def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \ + mailleur="MeshGems"): """Importe la géométrie de la fissure et crée le groupe du fond de la fissure""" texte = "genereShapeFissure pour '{}'".format(self.nomCas) logging.info(texte) @@ -79,11 +80,12 @@ class vis_1(fissureGenerique): shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep")) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) - geompy.UnionIDs(fondFiss, [6, 8, 3]) - geompy.addToStudy( shellFiss, 'shellFiss' ) - geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) + geompy.UnionIDs(fondFiss, [6, 8]) + geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas) + geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas) - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.1 ,0.2) + mailleur = self.mailleur2d3d() + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 0.1 ,0.2, mailleur, self.numeroCas) centre = None @@ -95,37 +97,41 @@ class vis_1(fissureGenerique): logging.info(texte) self.maillageFissureParams = dict(nomRep = os.curdir, nomFicSain = self.nomCas, - nomFicFissure = 'fissure_' + self.nomCas, + nomFicFissure = self.nomCas + "_fissure", nbsegRad = 5, nbsegCercle = 32, areteFaceFissure = 0.1) # --------------------------------------------------------------------------- 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): + def genereMaillageFissure(self, geometriesSaines, maillagesSains, \ + shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, step, \ + mailleur="MeshGems"): + texte = "genereMaillageFissure pour '{}'".format(self.nomCas) logging.info(texte) - maillageFissure = construitFissureGenerale(maillagesSains, - shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step) + + mailleur = self.mailleur2d3d() + maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, \ + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 4285 ,\ - Entity_Quad_Hexa = 6416, \ - Entity_Node = 85673, \ - Entity_Quad_Edge = 758, \ - Entity_Quad_Triangle = 2336, \ - Entity_Quad_Tetra = 35990, \ - Entity_Quad_Pyramid = 1284, \ - Entity_Quad_Penta = 984 \ + Entity_Quad_Quadrangle = 11596, \ + Entity_Quad_Hexa = 37008, \ + Entity_Node = 250929, \ + Entity_Quad_Edge = 30356, \ + Entity_Quad_Triangle = 8088, \ + Entity_Quad_Tetra = 49055, \ + Entity_Quad_Pyramid = 3026, \ + Entity_Quad_Penta = 4392 \ ) -