X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FgenereElemsFissureElliptique.py;h=d4d06b13a3d07c12dcb3f7d5d091d91f6f5ec3f3;hp=6374be9fc9daa63ee1ba4c1b6ce8117f9742c659;hb=b24a2d1b7692bdb21cf037b026e0273ba547cef4;hpb=7a3ecab720cc517ace17c5c4677fd3c20c0051ee diff --git a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py index 6374be9fc..d4d06b13a 100644 --- a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py +++ b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py @@ -1,4 +1,22 @@ # -*- coding: utf-8 -*- +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# import logging from .geomsmesh import geompy @@ -14,12 +32,13 @@ from .genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut # ----------------------------------------------------------------------------- # --- création élements géométriques fissure elliptique -def genereElemsFissureElliptique(shapeFissureParams): +def genereElemsFissureElliptique(shapeFissureParams, \ + mailleur="MeshGems"): """ TODO: a completer """ logging.info('start') - + centreDefaut = shapeFissureParams['centreDefaut'] vecteurDefaut = shapeFissureParams['vecteurDefaut'] demiGrandAxe = shapeFissureParams['demiGrandAxe'] @@ -31,7 +50,7 @@ def genereElemsFissureElliptique(shapeFissureParams): allonge = demiGrandAxe/demiPetitAxe rayonTore = demiPetitAxe/5.0 - generatrice, FaceGenFiss, Pipe_1, FaceFissure, Plane_1, Pipe1Part = toreFissure(demiPetitAxe, allonge, rayonTore) + generatrice, _, Pipe_1, FaceFissure, Plane_1, Pipe1Part = toreFissure(demiPetitAxe, allonge, rayonTore) ellipsoide = ellipsoideDefaut(demiPetitAxe, allonge, rayonTore) # --- positionnement sur le bloc defaut de generatrice, tore et plan fissure @@ -52,6 +71,7 @@ def genereElemsFissureElliptique(shapeFissureParams): shapeDefaut = facefis1 xyz_defaut = geompy.PointCoordinates(centreDefaut) - coordsNoeudsFissure = genereMeshCalculZoneDefaut(facefis1, demiPetitAxe/10.0, demiPetitAxe/5.0) + coordsNoeudsFissure = genereMeshCalculZoneDefaut(facefis1, demiPetitAxe/10.0, demiPetitAxe/5.0, \ + mailleur) return shapeDefaut, xyz_defaut, tailleDefaut, coordsNoeudsFissure, pipe0, gener1, pipe1, facefis1, plane1, ellipsoide1