X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fcylindre.py;h=d79924f39c28429bf2a8af245328fe3b796fa7e0;hp=5b72caa36da72da00988bf4fa5bdb1efcc372d14;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=cd96b6d3d47e89f57ba4a83784a5843cd4fb9e18 diff --git a/src/Tools/blocFissure/CasTests/cylindre.py b/src/Tools/blocFissure/CasTests/cylindre.py index 5b72caa36..d79924f39 100644 --- a/src/Tools/blocFissure/CasTests/cylindre.py +++ b/src/Tools/blocFissure/CasTests/cylindre.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 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 @@ -18,32 +18,26 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import os -from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh +"""problème de fissure plane sur cylindre, grand fond de fissure en arc de cercle""" -import math -import GEOM -import SALOMEDS -import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin +import os import logging +from blocFissure import gmu +from blocFissure.gmu.geomsmesh import geompy, smesh 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.construitFissureGenerale import construitFissureGenerale - -O, OX, OY, OZ = triedreBase() +from blocFissure.gmu.putName import putName class cylindre(fissureGenerique): """problème de fissure plane sur cylindre, grand fond de fissure en arc de cercle""" nomProbleme = "cylindre" + shapeFissureParams = dict() + maillageFissureParams = dict() + referencesMaillageFissure = dict() # --------------------------------------------------------------------------- def genereMaillageSain(self, geometriesSaines, meshParams): @@ -53,8 +47,8 @@ class cylindre(fissureGenerique): """ logging.info("genereMaillageSain %s", self.nomCas) - ([objetSain], status) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "CylindreSain.med")) - smesh.SetName(objetSain.GetMesh(), 'objetSain') + ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "CylindreSain.med")) + putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -70,7 +64,8 @@ class cylindre(fissureGenerique): rayonPipe = 5) # --------------------------------------------------------------------------- - def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): + def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \ + mailleur="MeshGems"): logging.info("genereShapeFissure %s", self.nomCas) lgInfluence = shapeFissureParams['lgInfluence'] @@ -81,33 +76,37 @@ class cylindre(fissureGenerique): geompy.addToStudy( shellFiss, 'shellFiss' ) geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) - - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,15) + mailleur = self.mailleur2d3d() + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,15, 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 = 20) # --------------------------------------------------------------------------- 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 # --------------------------------------------------------------------------- @@ -115,11 +114,10 @@ class cylindre(fissureGenerique): self.referencesMaillageFissure = dict( \ Entity_Quad_Quadrangle = 6920, \ Entity_Quad_Hexa = 18174, \ - Entity_Node = 104349, \ + Entity_Node = 100923, \ Entity_Quad_Edge = 718, \ Entity_Quad_Triangle = 952, \ - Entity_Quad_Tetra = 16691, \ + Entity_Quad_Tetra = 14111, \ Entity_Quad_Pyramid = 1110, \ Entity_Quad_Penta = 336 \ ) -