X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2FCasTests%2Fellipse_2.py;h=b1dd294903acc19189fd27eb9f55f84894b9c2c5;hp=9fbef92925341d0888fd438017efa85c10eb9e36;hb=ff873c8b10f4cc15316f4ee7e1331ec1b4e0c1ab;hpb=54d6af9301c07f47a988dc85864b24b7e3fb61d9 diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py index 9fbef9292..b1dd29490 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_2.py +++ b/src/Tools/blocFissure/CasTests/ellipse_2.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 @@ -24,15 +24,8 @@ import os import logging from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh -from blocFissure.gmu.fissureGenerique import fissureGenerique +from blocFissure.gmu.geomsmesh import geompy from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut -from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain -from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale - -import GEOM -import SALOMEDS -import SMESH from .ellipse_1 import ellipse_1 @@ -42,7 +35,8 @@ class ellipse_2(ellipse_1): nomProbleme = "ellipse2" # --------------------------------------------------------------------------- - def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): + def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams, \ + mailleur="MeshGems"): """Importe la géométrie de la fissure""" texte = "genereShapeFissure pour '{}'".format(self.nomCas) logging.info(texte) @@ -55,7 +49,8 @@ class ellipse_2(ellipse_1): geompy.addToStudy( shellFiss, 'shellFiss' ) geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25) + mailleur = self.mailleur2d3d() + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,25, mailleur, self.numeroCas) centre = None