Correcion de programmation - fichiers en python

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

diff --git a/src/Tools/blocFissure/gmu/fissureGenerique.py b/src/Tools/blocFissure/gmu/fissureGenerique.py
index 3296c39cecbaf64bbe54c4b41615f3f113222562..ccae1a82c6657e63ed488401475379595fb71ebe 100644 (file)
--- a/src/Tools/blocFissure/gmu/fissureGenerique.py
+++ b/src/Tools/blocFissure/gmu/fissureGenerique.py
@@ -1,4 +1,23 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# Copyright (C) 2014-2020  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
+#
+"""fissureGenerique"""

 
 import logging
 
 
 import logging
 


@@ -6,15 +25,15 @@ from blocFissure import gmu
 from blocFissure.gmu.initEtude import initEtude
 from blocFissure.gmu.getStatsMaillageFissure import getStatsMaillageFissure
 
 from blocFissure.gmu.initEtude import initEtude
 from blocFissure.gmu.getStatsMaillageFissure import getStatsMaillageFissure
 

-class fissureGenerique():
-  """
-  classe générique problème fissure:
+class fissureGenerique(object):
+  """classe générique problème fissure:
+

   génération géométrie et maillage sain
   définition et positionnement d'une fissure
   génération d'un bloc défaut inséré dans le maillage sain
   """
 
   génération géométrie et maillage sain
   définition et positionnement d'une fissure
   génération d'un bloc défaut inséré dans le maillage sain
   """
 

-  nomProbleme = "generique"
+  nomProbleme = "fissureGenerique"

 
   def __init__(self, numeroCas):
     initEtude()
 
   def __init__(self, numeroCas):
     initEtude()


@@ -23,46 +42,58 @@ class fissureGenerique():
     self.fissureLongue = False
 
   def setParamGeometrieSaine(self):
     self.fissureLongue = False
 
   def setParamGeometrieSaine(self):

-    self.geomParams = {}
+    """setParamGeometrieSaine"""
+    self.geomParams = dict()

 
   def genereGeometrieSaine(self, geomParams):
 
   def genereGeometrieSaine(self, geomParams):

+    """genereGeometrieSaine"""

     geometriesSaines = [None]
     return geometriesSaines
 
   def setParamMaillageSain(self):
     geometriesSaines = [None]
     return geometriesSaines
 
   def setParamMaillageSain(self):

-    self.meshParams = {}
+    """setParamMaillageSain"""
+    self.meshParams = dict()

 
   def genereMaillageSain(self, geometriesSaines, meshParams):
 
   def genereMaillageSain(self, geometriesSaines, meshParams):

+    """genereMaillageSain"""

     maillagesSains = [None]
     return maillagesSains
 
   def setParamShapeFissure(self):
     maillagesSains = [None]
     return maillagesSains
 
   def setParamShapeFissure(self):

-    self.shapeFissureParams = {}
+    """setParamShapeFissure"""
+    self.shapeFissureParams = dict()

 
   def genereShapeFissure(self, geometriesSaines, geomParams, shapeFissureParams):
 
   def genereShapeFissure(self, geometriesSaines, geomParams, shapeFissureParams):

+    """genereShapeFissure"""

     shapesFissure = [None]
     return shapesFissure
 
   def setParamMaillageFissure(self):
     shapesFissure = [None]
     return shapesFissure
 
   def setParamMaillageFissure(self):

-    self.maillageFissureParams = {}
+    """setParamMaillageFissure"""
+    self.maillageFissureParams = dict()

 
   def genereZoneDefaut(self, geometriesSaines, maillagesSains, shapesFissure, maillageFissureParams):
 
   def genereZoneDefaut(self, geometriesSaines, maillagesSains, shapesFissure, maillageFissureParams):

+    """genereZoneDefaut"""

     elementsDefaut = [None]
     return elementsDefaut
 
   def genereMaillageFissure(self, geometriesSaines, maillagesSains, shapesFissure,
     elementsDefaut = [None]
     return elementsDefaut
 
   def genereMaillageFissure(self, geometriesSaines, maillagesSains, shapesFissure,

-                            maillageFissureParams, elementsDefaut, step):
+                            maillageFissureParams, elementsDefaut):
+    """genereMaillageFissure"""

     maillageFissure = None
     return maillageFissure
 
   def setReferencesMaillageFissure(self):
     maillageFissure = None
     return maillageFissure
 
   def setReferencesMaillageFissure(self):

-    referencesMaillageFissure = {}
+    """setReferencesMaillageFissure"""
+    referencesMaillageFissure = dict()

     return referencesMaillageFissure
 
 # ---------------------------------------------------------------------------
 
   def executeProbleme(self, step=-1):
     return referencesMaillageFissure
 
 # ---------------------------------------------------------------------------
 
   def executeProbleme(self, step=-1):

-    logging.info(" --- executeProbleme %s", self.nomCas)
+    """executeProbleme"""
+    texte = " --- fissureGenerique.executeProbleme pour '{}', step = {}".format(self.nomCas,step)
+    logging.info(texte)

     if step == 0:
       return
 
     if step == 0:
       return
 


@@ -91,10 +122,5 @@ class fissureGenerique():
                                                  self.maillageFissureParams, elementsDefaut, step)
 
     self.setReferencesMaillageFissure()
                                                  self.maillageFissureParams, elementsDefaut, step)
 
     self.setReferencesMaillageFissure()

-    mesures = getStatsMaillageFissure(maillageFissure, self.referencesMaillageFissure, self.maillageFissureParams)
-
-
-
-
-
-
+    ok_maillage = getStatsMaillageFissure(maillageFissure, self.referencesMaillageFissure, self.maillageFissureParams)
+    return ok_maillage