X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FgenereElemsFissureElliptique.py;h=d4d06b13a3d07c12dcb3f7d5d091d91f6f5ec3f3;hb=b24a2d1b7692bdb21cf037b026e0273ba547cef4;hp=a20704f5172d7794eb561a479a2cb9438e63f2e4;hpb=385d4cede5f752d0eec26c306f3b5e14511e2a3d;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py index a20704f51..d4d06b13a 100644 --- a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py +++ b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2019 CEA/DEN, 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 @@ -32,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'] @@ -49,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 @@ -70,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