SetCurrentStudy --> UpdateStudy

diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py
index 6131df6aa6fb42f889c9d406950b9e8406d0f106..11bd321092729458fdca68eb9b3c1c2fd7233ac6 100755 (executable)
--- a/doc/files/tutorial_1.py
+++ b/doc/files/tutorial_1.py
@@ -22,7 +22,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2010, 2018
 """
-__revision__ = "V3.1"
+__revision__ = "V3.2"
 #
 import os
 import sys

diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py
index 9a3513572b197ffc5439af10e7315f1a079272c6..adf5957573aabff4b17f22242a53a213015f9b3c 100755 (executable)
--- a/doc/files/tutorial_2.py
+++ b/doc/files/tutorial_2.py
@@ -24,7 +24,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2010, 2018
 """
-__revision__ = "V3.01"
+__revision__ = "V3.02"
 #
 import os
 import sys

diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py
index 22eba2b1f6d31d5c82961109548ab7281d2173ed..f3f1a558f45162a9ba577b7ec28a9a2ad2941c2f 100755 (executable)
--- a/doc/files/tutorial_3.py
+++ b/doc/files/tutorial_3.py
@@ -24,7 +24,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2010, 2018
 """
-__revision__ = "V3.1"
+__revision__ = "V3.2"
 #
 import os
 import sys

diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py
index 02b05e2aa00d752cd784f6e9761b2226e302d8f2..c3dfcb2967e569ebb8592060306d178845c18f97 100755 (executable)
--- a/doc/files/tutorial_4.py
+++ b/doc/files/tutorial_4.py
@@ -24,7 +24,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2011, 2018
 """
-__revision__ = "V4.2"
+__revision__ = "V4.3"
 #
 import os
 import sys

diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py
index fdb7ea5d70685115eb127780041e4b22a0442e26..cddc08d54377d617a865522d7686489be326620f 100755 (executable)
--- a/doc/files/tutorial_5.py
+++ b/doc/files/tutorial_5.py
@@ -24,7 +24,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2010, 2018
 """
-__revision__ = "V3.2"
+__revision__ = "V3.3"
 #
 import os
 import sys

diff --git a/doc/files/tutorial_6.py b/doc/files/tutorial_6.py
index c464402074f26c67ae848bc6c0e8fa4f5db1fe7f..3084ccd61100df857b0f7297bc18d854b8500587 100755 (executable)
--- a/doc/files/tutorial_6.py
+++ b/doc/files/tutorial_6.py
@@ -24,7 +24,7 @@
 Exemple de couplage HOMARD-Salome
 Copyright EDF 1996, 2011, 2018
 """
-__revision__ = "V4.4"
+__revision__ = "V4.5"
 #
 import os
 import sys
@@ -48,7 +48,7 @@ salome.salome_init()
 import HOMARD
 #
 homard = salome.lcc.FindOrLoadComponent("FactoryServer", "HOMARD")
-homard.SetCurrentStudy(salome.myStudy)
+homard.UpdateStudy()
 #
 #============================= Début des commandes =============================
 #
@@ -122,4 +122,4 @@ gzip_gunzip(DATA_TUTORIAL, 6, 1)
 # ==================================
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()

diff --git a/src/tests/Test/test_1.py b/src/tests/Test/test_1.py
index ca1a4c93bb92351cad2e72a35fff3de00edd90e3..f437e889182fb3770460703ad10d3b050d222d18 100755 (executable)
--- a/src/tests/Test/test_1.py
+++ b/src/tests/Test/test_1.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_1
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "test_1"
@@ -61,7 +61,7 @@ Python script for HOMARD
 #
   while not error :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
   #
   # Creation of the zones
   # =====================

diff --git a/src/tests/Test/test_2.py b/src/tests/Test/test_2.py
index ad6cff7f3e4a5ef1b7a3ce53666d37f1d69032a5..846f691f6ddc42627d73891bd6fcc84fd2427379 100755 (executable)
--- a/src/tests/Test/test_2.py
+++ b/src/tests/Test/test_2.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_2
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "test_2"
@@ -61,7 +61,7 @@ Python script for HOMARD
 #
   while not error :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
   #
   # Creation of the boundaries
   # ==========================

diff --git a/src/tests/Test/test_3.py b/src/tests/Test/test_3.py
index 87175a93f21e046b9d3a8474ef7fc6f1a7784468..9b1b9790b1df119d3628b5037d1dd573cbdf483d 100755 (executable)
--- a/src/tests/Test/test_3.py
+++ b/src/tests/Test/test_3.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_3
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 TEST_NAME = "test_3"
@@ -62,7 +62,7 @@ Python script for HOMARD
 #
   while not error :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
   #
   # Creation of the boundaries
   # ==========================

diff --git a/src/tests/Test/test_4.py b/src/tests/Test/test_4.py
index ddb7d7d1d83fdf9f2e0c80583d5d30f9cf9ac572..242dfb659520e4c7716e9a3888827a16f2d0261d 100755 (executable)
--- a/src/tests/Test/test_4.py
+++ b/src/tests/Test/test_4.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_4
 """
-__revision__ = "V3.03"
+__revision__ = "V3.04"
 
 #========================================================================
 TEST_NAME = "test_4"
@@ -184,7 +184,7 @@ Python script for HOMARD
 #
   while not error :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
   #
   # Creation of the zones
   # =====================

diff --git a/src/tests/Test/test_5.py b/src/tests/Test/test_5.py
index 125a9626a95ef280df7272fe4e2cf79fb501f853..180325067a964df766eced636caf3da5f5a096f6 100755 (executable)
--- a/src/tests/Test/test_5.py
+++ b/src/tests/Test/test_5.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Specific conditions for Code_Saturne
 Test test_5
 """
-__revision__ = "V2.03"
+__revision__ = "V2.04"
 
 #========================================================================
 TEST_NAME = "test_5"
@@ -232,7 +232,7 @@ Python script for HOMARD
 #
   while not error :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
   #
   # Creation of the hypothese DISTANCE INVERSE
   # ==========================================

diff --git a/src/tests/Test/test_6.py b/src/tests/Test/test_6.py
index 9f062dbff0c74b2cf2afd5da33322b785febd49d..e11917d7a4543335786fb10d8db6917d91bcb159 100755 (executable)
--- a/src/tests/Test/test_6.py
+++ b/src/tests/Test/test_6.py
@@ -22,7 +22,7 @@
 Python script for HOMARD
 Test test_6
 """
-__revision__ = "V1.05"
+__revision__ = "V1.06"
 
 #========================================================================
 TEST_NAME = "test_6"
@@ -217,7 +217,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+    #HOMARD.UpdateStudy()
     #
     # Frontière
     # =========

diff --git a/src/tests/Test/tutorial_1.py b/src/tests/Test/tutorial_1.py
index e8105bcef3868f2bc70806eaa75f08c8b43ee3cd..54ccc615ddd9137f9fa94d3a8211b661a4d805b4 100755 (executable)
--- a/src/tests/Test/tutorial_1.py
+++ b/src/tests/Test/tutorial_1.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_1 associe au tutorial 1
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 TEST_NAME = "tutorial_1"
@@ -30,11 +30,9 @@ N_ITER_TEST_FILE = 3
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
-PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
+PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR")
 # Repertoire des scripts utilitaires
 REP_PYTHON = os.path.join(PATH_HOMARD, "bin", "salome", "test", "HOMARD")
 REP_PYTHON = os.path.normpath(REP_PYTHON)
@@ -52,8 +50,10 @@ from tutorial_util import gzip_gunzip
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 1, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +70,7 @@ Python script for HOMARD
   #
   while not erreur :
   #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Hypotheses
     # ==========

diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py
index 7f89207c0d2091f30180175e516f44b1534a2bb3..9be1fd8c077222e05884c225af2a51f34bf30f46 100755 (executable)
--- a/src/tests/Test/tutorial_2.py
+++ b/src/tests/Test/tutorial_2.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_2 associe au tutorial 2
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 TEST_NAME = "tutorial_2"
@@ -30,8 +30,6 @@ N_ITER_TEST_FILE = 2
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -52,8 +50,11 @@ from tutorial_util import gzip_gunzip
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 2, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +71,7 @@ Python script for HOMARD
   #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Creation des zones
     # ==================

diff --git a/src/tests/Test/tutorial_3.py b/src/tests/Test/tutorial_3.py
index ae8e15354f89d32cfb7b187aa6d286ff12e2d7bb..d51a5492156efb54ae36a35481fceaf8e6bf0931 100755 (executable)
--- a/src/tests/Test/tutorial_3.py
+++ b/src/tests/Test/tutorial_3.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_3 associe au tutorial 3
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 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')
@@ -52,8 +50,11 @@ from tutorial_util import gzip_gunzip
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 3, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +71,7 @@ Python script for HOMARD
   #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Hypotheses
     # ==========
@@ -209,7 +210,7 @@ if ERREUR:
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 3, 1)
 # ==================================
-#
+
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)

diff --git a/src/tests/Test/tutorial_4.py b/src/tests/Test/tutorial_4.py
index 61ee052c91f9afd33cd78ec705470d2487fc0724..ef052ea6aca916acdecb19df33dd8489a4efaaf4 100755 (executable)
--- a/src/tests/Test/tutorial_4.py
+++ b/src/tests/Test/tutorial_4.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 # Copyright (C) 2011-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
@@ -17,11 +18,12 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 Python script for HOMARD
 Test tutorial_4 associe au tutorial 4
 """
-__revision__ = "V5.03"
+__revision__ = "V5.04"
 
 #========================================================================
 TEST_NAME = "tutorial_4"
@@ -30,8 +32,6 @@ N_ITER_TEST_FILE = 3
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -52,8 +52,11 @@ from tutorial_util import gzip_gunzip
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 4, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +73,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Frontières
     # ==========
@@ -192,7 +195,7 @@ if ERREUR:
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 4, 1)
 # ==================================
-#
+
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)

diff --git a/src/tests/Test/tutorial_5.py b/src/tests/Test/tutorial_5.py
index 499a195f6113a66afd4ba91cd2d6223d7b03b5a8..daa8931b33d7da9b117c1629a24d5182b3080435 100755 (executable)
--- a/src/tests/Test/tutorial_5.py
+++ b/src/tests/Test/tutorial_5.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 # Copyright (C) 2011-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
@@ -17,11 +18,12 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 Python script for HOMARD
 Test tutorial_5 associe au tutorial 5
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 TEST_NAME = "tutorial_5"
@@ -30,8 +32,6 @@ N_ITER_TEST_FILE = 2
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -52,8 +52,11 @@ from tutorial_util import gzip_gunzip
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 5, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -70,7 +73,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Frontiere
     # =========
@@ -182,7 +185,7 @@ if ERREUR:
 # ==================================
 gzip_gunzip(DATA_TUTORIAL, 5, 1)
 # ==================================
-#
+
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)

diff --git a/src/tests/Test/tutorial_6.py b/src/tests/Test/tutorial_6.py
index 433a7c8457deaf3c61e6513def1a8cd44da38ece..3f8c36c3c08351872219baa2ee914ffe81237794 100755 (executable)
--- a/src/tests/Test/tutorial_6.py
+++ b/src/tests/Test/tutorial_6.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 # Copyright (C) 2011-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
@@ -17,11 +18,12 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 Python script for HOMARD
 Test tutorial_6 associe au tutorial 6
 """
-__revision__ = "V4.04"
+__revision__ = "V4.05"
 
 #========================================================================
 TEST_NAME = "tutorial_6"
@@ -53,8 +55,11 @@ from tutorial_util import gzip_gunzip
 gzip_gunzip(DATA_TUTORIAL, 4, -1)
 gzip_gunzip(DATA_TUTORIAL, 6, -1)
 # ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -71,7 +76,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Frontières
     # ==========
@@ -207,7 +212,7 @@ if ERREUR:
 gzip_gunzip(DATA_TUTORIAL, 4, 1)
 gzip_gunzip(DATA_TUTORIAL, 6, 1)
 # ==================================
-#
+
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)