X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FinsereFissureElliptique.py;h=3b7e363235d425405221dd2aa240a70684756a59;hp=c7cd0c5833153fd54654abdddc4ed79ab2acbd80;hb=b24a2d1b7692bdb21cf037b026e0273ba547cef4;hpb=93b3222f60b81f9440e991f5684bd65e282d2b0e diff --git a/src/Tools/blocFissure/gmu/insereFissureElliptique.py b/src/Tools/blocFissure/gmu/insereFissureElliptique.py index c7cd0c583..3b7e36323 100644 --- a/src/Tools/blocFissure/gmu/insereFissureElliptique.py +++ b/src/Tools/blocFissure/gmu/insereFissureElliptique.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 @@ -17,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +"""Insertion d'une fissure elliptique""" import os @@ -42,12 +43,12 @@ from .meshBlocPart import meshBlocPart from .enleveDefaut import enleveDefaut from .regroupeSainEtDefaut import RegroupeSainEtDefaut from .putName import putName - + # ----------------------------------------------------------------------------- # --- procedure complete fissure elliptique -def insereFissureElliptique(geometriesSaines, maillagesSains, - shapesFissure, shapeFissureParams, +def insereFissureElliptique(geometriesSaines, maillagesSains, \ + shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, step=-1): """ TODO: a completer @@ -132,11 +133,10 @@ def insereFissureElliptique(geometriesSaines, maillagesSains, if step == 7: return None - [blocPartition, blocp, tore, - faceFissure, facesExternes, facesExtBloc, facesExtElli, - aretesInternes, ellipsoidep, sharedFaces, sharedEdges, edgesBords] = \ - partitionBlocDefaut(extrusionDefaut, facesDefaut, gener1, pipe1, - facefis1, ellipsoide1) + [ blocPartition, blocp, tore, \ + faceFissure, facesExternes, facesExtBloc, facesExtElli, + aretesInternes, ellipsoidep, sharedFaces, sharedEdges, edgesBords] = \ + partitionBlocDefaut(extrusionDefaut, facesDefaut, gener1, pipe1, facefis1, ellipsoide1) if not isHexa: edgesBords = None # maillage sain hexa ==> filling, et maillage edges Bords imposés du maillage sain @@ -193,11 +193,11 @@ def insereFissureElliptique(geometriesSaines, maillagesSains, return None [bloc1, blocComplet] = \ - meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circles, faces, - gencnt, facefissoutore, edgeext, facesExternes, facesExtBloc, facesExtElli, - aretesInternes, internalBoundary, ellipsoidep, sharedFaces, sharedEdges, edgesBords, - nbsegExt, nbsegGen, nbsegRad, scaleRad, reverses, reverext, nbsegCercle, - nbsegFis, dmoyen, lensegEllipsoide) + meshBlocPart(blocPartition, faceFissure, tore, centres, edges, diams, circles, faces, \ + gencnt, facefissoutore, edgeext, facesExternes, facesExtBloc, facesExtElli, \ + aretesInternes, internalBoundary, ellipsoidep, sharedFaces, sharedEdges, edgesBords, \ + nbsegExt, nbsegGen, nbsegRad, scaleRad, reverses, reverext, nbsegCercle, + nbsegFis, dmoyen, lensegEllipsoide) \ if step == 16: return None