X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Ftests%2FTest%2Ftutorial_3.py;h=976560bdb17466fdb3b3d2a34365c6d4eb32842f;hb=6689e7dd2f2883516d5f57833bc94dfeb1ccaa44;hp=7b7dfaa3b12940e14ebacd5a0282f2474d990e42;hpb=ab9148c3def757953c304a66b10c78be2b90736c;p=modules%2Fhomard.git

diff --git a/src/tests/Test/tutorial_3.py b/src/tests/Test/tutorial_3.py
index 7b7dfaa3..976560bd 100755
--- a/src/tests/Test/tutorial_3.py
+++ b/src/tests/Test/tutorial_3.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011-2016  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
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_3 associe au tutorial 3
 """
-__revision__ = "V4.04"
+__revision__ = "V4.07"
 
 #========================================================================
 TEST_NAME = "tutorial_3"
@@ -30,8 +30,6 @@ N_ITER_TEST_FILE = 2
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -40,20 +38,16 @@ REP_PYTHON = os.path.join(PATH_HOMARD, "bin", "salome", "test", "HOMARD")
 REP_PYTHON = os.path.normpath(REP_PYTHON)
 sys.path.append(REP_PYTHON)
 from test_util import get_dir
-from test_util import get_dir_tutorial
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
 REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
-DATA_TUTORIAL = get_dir_tutorial(PATH_HOMARD)
-# ==================================
-sys.path.append(DATA_TUTORIAL)
-from tutorial_util import gzip_gunzip
 # ==================================
-gzip_gunzip(DATA_TUTORIAL, 3, -1)
-# ==================================
-
-salome.salome_init()
+#
+import salome
+salome.salome_init_without_session()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +64,7 @@ Python script for HOMARD
   #
   while not erreur :
     #
-    HOMARD.SetCurrentStudy(salome.myStudy)
+  #  HOMARD.UpdateStudy()
     #
     # Hypotheses
     # ==========
@@ -134,7 +128,7 @@ Python script for HOMARD
     iter_3_1 = le_cas.NextIteration('iter_3_1')
     iter_3_1.SetMeshName('H_1')
     iter_3_1.SetMeshFile(os.path.join(DIRCASE, "maill.01.med"))
-    iter_3_1.SetFieldFile(os.path.join(DATA_TUTORIAL, "tutorial_3.00.med"))
+    iter_3_1.SetFieldFile(os.path.join(REP_DATA, "tutorial_3.00.med"))
     iter_3_1.SetTimeStepRank( 1, 1)
     iter_3_1.AssociateHypo('hypo_0vers1')
     erreur = iter_3_1.Compute(1, option)
@@ -146,7 +140,7 @@ Python script for HOMARD
     iter_3_2 = iter_3_1.NextIteration('iter_3_2')
     iter_3_2.SetMeshName('H_2')
     iter_3_2.SetMeshFile(os.path.join(DIRCASE, "maill.02.med"))
-    iter_3_2.SetFieldFile(os.path.join(DATA_TUTORIAL, "tutorial_3.01.med"))
+    iter_3_2.SetFieldFile(os.path.join(REP_DATA, "tutorial_3.01.med"))
     iter_3_2.SetTimeStepRank(1, 1)
     iter_3_2.AssociateHypo('hypo_1vers2')
     erreur = iter_3_2.Compute(1, option)
@@ -158,7 +152,7 @@ Python script for HOMARD
     iter_3_2_bis = iter_3_1.NextIteration('iter_3_2_bis')
     iter_3_2_bis.SetMeshName('H_2_bis')
     iter_3_2_bis.SetMeshFile(os.path.join(DIRCASE, "maill.02.bis.med"))
-    iter_3_2_bis.SetFieldFile(os.path.join(DATA_TUTORIAL, "tutorial_3.01.med"))
+    iter_3_2_bis.SetFieldFile(os.path.join(REP_DATA, "tutorial_3.01.med"))
     iter_3_2_bis.SetTimeStepRank(1, 1)
     iter_3_2_bis.AssociateHypo('hypo_1vers2_bis')
     erreur = iter_3_2_bis.Compute(1, option)
@@ -184,7 +178,7 @@ while not ERREUR :
   assert HOMARD is not None, "Impossible to load homard engine"
   HOMARD.SetLanguageShort("fr")
 #
-  FICMED = os.path.join(DATA_TUTORIAL, TEST_NAME+".00.med")
+  FICMED = os.path.join(REP_DATA, TEST_NAME+".00.med")
   try:
     ERREUR, MESSAGE = homard_exec("G_0", FICMED, DEBUG)
   except RuntimeError as eee:
@@ -206,11 +200,7 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 3, 1)
-# ==================================
-#
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)