Merge branch 'V9_9_BR'

[modules/smesh.git] / src / Tools / blocFissure / gmu / genereElemsFissureElliptique.py

diff --git a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py
index 6374be9fc9daa63ee1ba4c1b6ce8117f9742c659..149b38f44c4767208f7ac0ec3a239644569b86d3 100644 (file)
--- a/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py
+++ b/src/Tools/blocFissure/gmu/genereElemsFissureElliptique.py
@@ -1,25 +1,41 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# Copyright (C) 2014-2022  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
+#
+"""Création élements géométriques fissure elliptique"""

 
 import logging
 
 import logging

+from . import initLog
+

 from .geomsmesh import geompy
 from .geomsmesh import geomPublish
 from .geomsmesh import geompy
 from .geomsmesh import geomPublish

-from .geomsmesh import geomPublishInFather
-from . import initLog

 
 from .toreFissure import toreFissure
 from .ellipsoideDefaut import ellipsoideDefaut
 from .rotTrans import rotTrans
 from .genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 
 
 from .toreFissure import toreFissure
 from .ellipsoideDefaut import ellipsoideDefaut
 from .rotTrans import rotTrans
 from .genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut
 

-# -----------------------------------------------------------------------------
-# --- création élements géométriques fissure elliptique
+def genereElemsFissureElliptique(shapeFissureParams, \
+                                 mailleur="MeshGems", nro_cas=None):
+  """Création élements géométriques fissure elliptique"""

 
 

-def genereElemsFissureElliptique(shapeFissureParams):
-  """
-  TODO: a completer
-  """

   logging.info('start')
   logging.info('start')

-  
+

   centreDefaut  = shapeFissureParams['centreDefaut']
   vecteurDefaut = shapeFissureParams['vecteurDefaut']
   demiGrandAxe  = shapeFissureParams['demiGrandAxe']
   centreDefaut  = shapeFissureParams['centreDefaut']
   vecteurDefaut = shapeFissureParams['vecteurDefaut']
   demiGrandAxe  = shapeFissureParams['demiGrandAxe']


@@ -31,8 +47,8 @@ def genereElemsFissureElliptique(shapeFissureParams):
 
   allonge = demiGrandAxe/demiPetitAxe
   rayonTore = demiPetitAxe/5.0
 
   allonge = demiGrandAxe/demiPetitAxe
   rayonTore = demiPetitAxe/5.0

-  generatrice, FaceGenFiss, Pipe_1, FaceFissure, Plane_1, Pipe1Part = toreFissure(demiPetitAxe, allonge, rayonTore)
-  ellipsoide = ellipsoideDefaut(demiPetitAxe, allonge, rayonTore)
+  generatrice, _, Pipe_1, FaceFissure, Plane_1, Pipe1Part = toreFissure(demiPetitAxe, allonge, rayonTore)
+  ellipsoide = ellipsoideDefaut(demiPetitAxe, allonge)

 
   # --- positionnement sur le bloc defaut de generatrice, tore et plan fissure
 
 
   # --- positionnement sur le bloc defaut de generatrice, tore et plan fissure
 


@@ -52,6 +68,7 @@ def genereElemsFissureElliptique(shapeFissureParams):
 
   shapeDefaut = facefis1
   xyz_defaut = geompy.PointCoordinates(centreDefaut)
 
   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, nro_cas)

 
   return shapeDefaut, xyz_defaut, tailleDefaut, coordsNoeudsFissure, pipe0, gener1, pipe1, facefis1, plane1, ellipsoide1
 
   return shapeDefaut, xyz_defaut, tailleDefaut, coordsNoeudsFissure, pipe0, gener1, pipe1, facefis1, plane1, ellipsoide1