X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Ftube.py;h=3b2e724d189ec6ef27d90a77c704708f56d6ccdd;hp=81088ec5412985612e9e91e3590d3b0071535274;hb=HEAD;hpb=c90594b6581f77b2cdf558ea3ff17748b1bb4571 diff --git a/src/Tools/blocFissure/CasTests/tube.py b/src/Tools/blocFissure/CasTests/tube.py index 81088ec54..bb3801796 100644 --- a/src/Tools/blocFissure/CasTests/tube.py +++ b/src/Tools/blocFissure/CasTests/tube.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 EDF R&D +# Copyright (C) 2014-2024 EDF # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,19 +24,17 @@ import os import logging 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 + from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class tube(fissureGenerique): """problème de fissure plane dans un tube""" @@ -51,7 +49,7 @@ class tube(fissureGenerique): logging.info(texte) ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "Tube.med")) - putName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme), i_pref=self.numeroCas) + putName(objetSain.GetMesh(), self.nomProbleme, i_pref=self.numeroCas) return [objetSain, True] # True : maillage hexa @@ -98,8 +96,8 @@ class tube(fissureGenerique): texte = "setParamMaillageFissure pour '{}'".format(self.nomCas) logging.info(texte) self.maillageFissureParams = dict(nomRep = os.curdir, - nomFicSain = self.nomCas, - nomFicFissure = self.nomCas + "_fissure", + nomFicSain = self.nomProbleme, + nomFicFissure = self.nomProbleme + "_fissure", nbsegRad = 5, nbsegCercle = 8, areteFaceFissure = 0.5) @@ -122,7 +120,7 @@ class tube(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # ---------------------------------------------------------------------------