X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=doc%2Ffiles%2Ftutorial_5.py;h=90f80775e70c0079c618a628c9845df40c968ce6;hb=refs%2Fheads%2Fmaster;hp=a9069877ddf8b5fcf0af9052a1945e619d28cc71;hpb=97e4e858387f05b6260ff7ed68c9b73f99aecb22;p=modules%2Fhomard.git

diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py
old mode 100644
new mode 100755
index a9069877..90f80775
--- a/doc/files/tutorial_5.py
+++ b/doc/files/tutorial_5.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python
-# -*- coding: iso-8859-1 -*-
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2011-2024  CEA, EDF
 #
 # 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.
+# 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
@@ -22,42 +22,37 @@
 
 """
 Exemple de couplage HOMARD-Salome
-Copyright EDF-R&D 1996, 2010, 2013
+Copyright EDF 1996, 2010, 2019
 """
-__revision__ = "V1.6"
+__revision__ = "V3.04"
 #
 import os
+import sys
 #
 # ==================================
-# Repertoire a personnaliser
-# Ce repertoire contiendra les fichiers de resultats : maill.01.med, maill.02.med
-if os.environ.has_key("LOGNAME") :
-  user = os.environ ["LOGNAME"]
-else :
-  user = "anonymous"
-dircase = os.path.join( os.sep, "tmp", "HOMARD_"+user)
-if not os.path.isdir(dircase) :
-  os.mkdir (dircase)
-dircase = os.path.join( dircase, "tutorial_5" )
-if not os.path.isdir(dircase) :
-  os.mkdir (dircase)
+PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR")
+# Repertoire des donnees du tutorial
+DATA_TUTORIAL = os.path.join(PATH_HOMARD, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
+DATA_TUTORIAL = os.path.normpath(DATA_TUTORIAL)
+sys.path.append(DATA_TUTORIAL)
+from tutorial_util import creation_dircase
+# ==================================
+DIRCASE = creation_dircase(5)
 # ==================================
-# Ce repertoire contient les fichiers de donnees : tutorial_5.00.med, tutorial_5.fr.med
-pathHomard = os.getenv('HOMARD_ROOT_DIR')
-data_dir = os.path.join(pathHomard, "share/doc/salome/gui/HOMARD/fr/_downloads")
 #
 import salome
 salome.salome_init()
 import HOMARD
 #
 homard = salome.lcc.FindOrLoadComponent("FactoryServer", "HOMARD")
-study_main = salome.myStudyManager.NewStudy("HOMARD")
-homard.SetCurrentStudy(salome.myStudy)
+homard.UpdateStudy()
+#
+#============================= Début des commandes =============================
 #
-# Frontiere
+# Frontière
 # =========
-# Creation of the discrete boundary Boun_5_1
-Boun_5_1 = homard.CreateBoundaryDi('Boun_5_1', 'MAIL_EXT', data_dir+'/tutorial_5.fr.med')
+# Creation of the discrete boundary boun_5_1
+boun_5_1 = homard.CreateBoundaryDi('boun_5_1', 'MAIL_EXT', os.path.join(DATA_TUTORIAL, "tutorial_5.fr.med"))
 #
 # Creation des zones
 # ==================
@@ -68,38 +63,37 @@ quart_sup = homard.CreateZoneBox2D( 'quart_sup', 0., 250., 0., 250., 1 )
 #
 # Hypotheses
 # ==========
-# Creation of the hypothesis Hypo_5
-Hypo_5 = homard.CreateHypothesis('Hypo_5')
-Hypo_5.SetAdapRefinUnRef(0, 1, 0)
-Hypo_5.AddZone('enveloppe', 1)
-# Creation of the hypothesis Hypo_5_bis
-Hypo_5_bis = homard.CreateHypothesis('Hypo_5_bis')
-Hypo_5_bis.SetAdapRefinUnRef(0, 1, 0)
-Hypo_5_bis.AddZone('quart_sup', 1)
+# Creation of the hypothesis hypo_5
+l_hypothese = homard.CreateHypothesis('hypo_5')
+l_hypothese.AddZone('enveloppe', 1)
+# Creation of the hypothesis l_hypothese_bis
+l_hypothese_bis = homard.CreateHypothesis('hypo_5_bis')
+l_hypothese_bis.AddZone('quart_sup', 1)
 #
 # Cas
 # ===
-Case_5 = homard.CreateCase('Case_5', 'COEUR_2D', data_dir+'/tutorial_5.00.med')
-Case_5.SetDirName(dircase)
-Case_5.SetConfType(3)
-Case_5.AddBoundaryGroup('Boun_5_1', '')
+le_cas = homard.CreateCase('Case_5', 'COEUR_2D', os.path.join(DATA_TUTORIAL, "tutorial_5.00.med"))
+le_cas.SetDirName(DIRCASE)
+le_cas.SetConfType(1)
+le_cas.AddBoundary('boun_5_1')
 #
-# Iteration "Iter_5_1"
+# Iteration "iter_5_1"
 # ====================
-Iter_5_1 = Case_5.NextIteration('Iter_5_1')
-Iter_5_1.SetMeshName('COEUR_2D_01')
-Iter_5_1.SetMeshFile(dircase+'/maill.01.med')
-Iter_5_1.AssociateHypo('Hypo_5')
-codret = Iter_5_1.Compute(1, 2)
+iter_5_1 = le_cas.NextIteration('iter_5_1')
+iter_5_1.SetMeshName('COEUR_2D_01')
+iter_5_1.SetMeshFile(os.path.join(DIRCASE, "maill.01.med"))
+iter_5_1.AssociateHypo('hypo_5')
+erreur = iter_5_1.Compute(1, 2)
 #
-# Iteration "Iter_5_2"
+# Iteration "iter_5_2"
 # ====================
-Iter_5_2 = Iter_5_1.NextIteration('Iter_5_2')
-Iter_5_2.SetMeshName('COEUR_2D_02')
-Iter_5_2.SetMeshFile(dircase+'/maill.02.med')
-Iter_5_2.AssociateHypo('Hypo_5_bis')
-codret = Iter_5_2.Compute(1, 2)
-
-
+iter_5_2 = iter_5_1.NextIteration('iter_5_2')
+iter_5_2.SetMeshName('COEUR_2D_02')
+iter_5_2.SetMeshFile(os.path.join(DIRCASE, "maill.02.med"))
+iter_5_2.AssociateHypo('hypo_5_bis')
+erreur = iter_5_2.Compute(1, 2)
+#
+#============================== Fin des commandes ==============================
+#
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()