From: GERALD NICOLAS Date: Mon, 22 Jul 2019 13:01:31 +0000 (+0200) Subject: gunzip of med files for SciMotors tests X-Git-Tag: V9_4_0a1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=afa0d970065cbd280be831266db4155adf4d00d8;p=modules%2Fhomard.git gunzip of med files for SciMotors tests --- diff --git a/doc/en/tutorials.rst b/doc/en/tutorials.rst index a299ad80..c29bb150 100644 --- a/doc/en/tutorials.rst +++ b/doc/en/tutorials.rst @@ -44,9 +44,9 @@ One will make here three successive uniform refinements of the mesh contained in .. note:: Download the files - * :download:`initial mesh<../files/tutorial_1.00.med.gz>` + * :download:`initial mesh<../files/tutorial_1.00.med>` * :download:`python script<../files/tutorial_1.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` @@ -64,9 +64,9 @@ One proceeds here to refinement according to zones. To pass from the initial mes .. note:: Download the files - * :download:`initial mesh<../files/tutorial_2.00.med.gz>` + * :download:`initial mesh<../files/tutorial_2.00.med>` * :download:`python script<../files/tutorial_2.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` Refinement driven by a field @@ -84,10 +84,10 @@ To adapt the H_1 mesh resulting from the Iter_1 iteration, two alternatives are .. note:: Download the files - * :download:`mesh and field stage 0<../files/tutorial_3.00.med.gz>` - * :download:`mesh and field stage 1<../files/tutorial_3.01.med.gz>` + * :download:`mesh and field stage 0<../files/tutorial_3.00.med>` + * :download:`mesh and field stage 1<../files/tutorial_3.01.med>` * :download:`python script<../files/tutorial_3.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` Non plane boundaries @@ -108,10 +108,10 @@ Scheme YACS carrying out this adaptation is downloadable. .. note:: Téléchargement des fichiers - * :download:`initial mesh<../files/tutorial_4.00.med.gz>` - * :download:`CAO<../files/tutorial_4.xao.gz>` + * :download:`initial mesh<../files/tutorial_4.00.med>` + * :download:`CAO<../files/tutorial_4.xao>` * :download:`python scrip<../files/tutorial_4.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` * :download:`YACS scheme<../files/tutorial_4.xml>` If the CAO is not available, the boundaries can be approximated: analytical borders to describe various surfaces of the pipes and a discrete border to describe the intersecting lines of the two pipes. Only the definition of the boundaries has to be modified. @@ -123,10 +123,10 @@ If the CAO is not available, the boundaries can be approximated: analytical bord .. note:: Download the files - * :download:`initial mesh<../files/tutorial_4.00.med.gz>` - * :download:`mesh of the discrete boundary<../files/tutorial_6.fr.med.gz>` + * :download:`initial mesh<../files/tutorial_4.00.med>` + * :download:`mesh of the discrete boundary<../files/tutorial_6.fr.med>` * :download:`python script<../files/tutorial_6.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` * :download:`YACS scheme<../files/tutorial_6.xml>` @@ -145,10 +145,10 @@ In the case presented here, one for the first time refines all the elements cont .. note:: Download the files - * :download:`initial mesh<../files/tutorial_5.00.med.gz>` - * :download:`mesh of the discrete boundary<../files/tutorial_5.fr.med.gz>` + * :download:`initial mesh<../files/tutorial_5.00.med>` + * :download:`mesh of the discrete boundary<../files/tutorial_5.fr.med>` * :download:`python script<../files/tutorial_5.py>` - * :download:`python script for the compression<../files/tutorial_util.py>` + * :download:`python script for the creation of the test directory<../files/tutorial_util.py>` .. toctree:: diff --git a/doc/files/tutorial_1.00.med b/doc/files/tutorial_1.00.med new file mode 100644 index 00000000..a0b62c6d Binary files /dev/null and b/doc/files/tutorial_1.00.med differ diff --git a/doc/files/tutorial_1.00.med.gz b/doc/files/tutorial_1.00.med.gz deleted file mode 100644 index fd09700b..00000000 Binary files a/doc/files/tutorial_1.00.med.gz and /dev/null differ diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py index 8ea052d7..0434808f 100755 --- a/doc/files/tutorial_1.py +++ b/doc/files/tutorial_1.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -20,9 +20,9 @@ # """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2010, 2018 +Copyright EDF 1996, 2010, 2019 """ -__revision__ = "V3.2" +__revision__ = "V3.03" # import os import sys @@ -33,11 +33,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(1) -gzip_gunzip(DATA_TUTORIAL, 1, -1) # ================================== # import salome @@ -84,9 +82,5 @@ erreur = iter_1_3.Compute(1, 2) # #============================== Fin des commandes ============================== # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 1, 1) -# ================================== -# if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/files/tutorial_2.00.med b/doc/files/tutorial_2.00.med new file mode 100644 index 00000000..0cdab23a Binary files /dev/null and b/doc/files/tutorial_2.00.med differ diff --git a/doc/files/tutorial_2.00.med.gz b/doc/files/tutorial_2.00.med.gz deleted file mode 100644 index a090234c..00000000 Binary files a/doc/files/tutorial_2.00.med.gz and /dev/null differ diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py index e1d09925..7ff22125 100755 --- a/doc/files/tutorial_2.py +++ b/doc/files/tutorial_2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -22,9 +22,9 @@ """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2010, 2018 +Copyright EDF 1996, 2010, 2019 """ -__revision__ = "V3.02" +__revision__ = "V3.03" # import os import sys @@ -35,11 +35,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(2) -gzip_gunzip(DATA_TUTORIAL, 2, -1) # ================================== # import salome @@ -96,10 +94,6 @@ iter_2_2.AssociateHypo('hypo_2_bis') erreur = iter_2_2.Compute(1, 2) # #============================== Fin des commandes ============================== -# -# ================================== -gzip_gunzip(DATA_TUTORIAL, 2, 1) -# ================================== if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/files/tutorial_3.00.med b/doc/files/tutorial_3.00.med new file mode 100644 index 00000000..7b67c2cf Binary files /dev/null and b/doc/files/tutorial_3.00.med differ diff --git a/doc/files/tutorial_3.00.med.gz b/doc/files/tutorial_3.00.med.gz deleted file mode 100644 index d99332b7..00000000 Binary files a/doc/files/tutorial_3.00.med.gz and /dev/null differ diff --git a/doc/files/tutorial_3.01.med b/doc/files/tutorial_3.01.med new file mode 100644 index 00000000..58c76d71 Binary files /dev/null and b/doc/files/tutorial_3.01.med differ diff --git a/doc/files/tutorial_3.01.med.gz b/doc/files/tutorial_3.01.med.gz deleted file mode 100644 index 4ea6788d..00000000 Binary files a/doc/files/tutorial_3.01.med.gz and /dev/null differ diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py index d8f97f2d..4fe13827 100755 --- a/doc/files/tutorial_3.py +++ b/doc/files/tutorial_3.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -22,9 +22,9 @@ """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2010, 2018 +Copyright EDF 1996, 2010, 2019 """ -__revision__ = "V3.2" +__revision__ = "V3.03" # import os import sys @@ -35,11 +35,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(3) -gzip_gunzip(DATA_TUTORIAL, 3, -1) # ================================== # import salome @@ -126,9 +124,5 @@ erreur = iter_3_2_bis.Compute(1, 2) # #============================== Fin des commandes ============================== # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 3, 1) -# ================================== - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/files/tutorial_4.00.med b/doc/files/tutorial_4.00.med new file mode 100644 index 00000000..9a70e0c8 Binary files /dev/null and b/doc/files/tutorial_4.00.med differ diff --git a/doc/files/tutorial_4.00.med.gz b/doc/files/tutorial_4.00.med.gz deleted file mode 100644 index d023424b..00000000 Binary files a/doc/files/tutorial_4.00.med.gz and /dev/null differ diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py index 4e23bcae..173afad5 100755 --- a/doc/files/tutorial_4.py +++ b/doc/files/tutorial_4.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -22,9 +22,9 @@ """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2011, 2018 +Copyright EDF 1996, 2011, 2019 """ -__revision__ = "V4.3" +__revision__ = "V4.04" # import os import sys @@ -35,11 +35,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(4) -gzip_gunzip(DATA_TUTORIAL, 4, -1) # ================================== # import salome @@ -99,9 +97,5 @@ erreur = iter_4_3.Compute(1, 2) # #============================== Fin des commandes ============================== # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 4, 1) -# ================================== - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/files/tutorial_4.xao b/doc/files/tutorial_4.xao new file mode 100644 index 00000000..415904a6 --- /dev/null +++ b/doc/files/tutorial_4.xao @@ -0,0 +1,652 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/files/tutorial_4.xao.gz b/doc/files/tutorial_4.xao.gz deleted file mode 100644 index ecb87d33..00000000 Binary files a/doc/files/tutorial_4.xao.gz and /dev/null differ diff --git a/doc/files/tutorial_5.00.med b/doc/files/tutorial_5.00.med new file mode 100644 index 00000000..9c1893a7 Binary files /dev/null and b/doc/files/tutorial_5.00.med differ diff --git a/doc/files/tutorial_5.00.med.gz b/doc/files/tutorial_5.00.med.gz deleted file mode 100644 index 3fa867a9..00000000 Binary files a/doc/files/tutorial_5.00.med.gz and /dev/null differ diff --git a/doc/files/tutorial_5.fr.med b/doc/files/tutorial_5.fr.med new file mode 100644 index 00000000..d4faa4c7 Binary files /dev/null and b/doc/files/tutorial_5.fr.med differ diff --git a/doc/files/tutorial_5.fr.med.gz b/doc/files/tutorial_5.fr.med.gz deleted file mode 100644 index aa586d05..00000000 Binary files a/doc/files/tutorial_5.fr.med.gz and /dev/null differ diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py index 31cc7543..b9d3241a 100755 --- a/doc/files/tutorial_5.py +++ b/doc/files/tutorial_5.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -22,9 +22,9 @@ """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2010, 2018 +Copyright EDF 1996, 2010, 2019 """ -__revision__ = "V3.3" +__revision__ = "V3.04" # import os import sys @@ -35,11 +35,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(5) -gzip_gunzip(DATA_TUTORIAL, 5, -1) # ================================== # import salome @@ -97,9 +95,5 @@ erreur = iter_5_2.Compute(1, 2) # #============================== Fin des commandes ============================== # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 5, 1) -# ================================== - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/files/tutorial_6.fr.med b/doc/files/tutorial_6.fr.med new file mode 100644 index 00000000..fc27fbc3 Binary files /dev/null and b/doc/files/tutorial_6.fr.med differ diff --git a/doc/files/tutorial_6.fr.med.gz b/doc/files/tutorial_6.fr.med.gz deleted file mode 100644 index e2808105..00000000 Binary files a/doc/files/tutorial_6.fr.med.gz and /dev/null differ diff --git a/doc/files/tutorial_6.py b/doc/files/tutorial_6.py index bd235f38..9e7f67d6 100755 --- a/doc/files/tutorial_6.py +++ b/doc/files/tutorial_6.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2011-2019 CEA/DEN, EDF R&D +# Copyright (C) 2011-2016 CEA/DEN, 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 @@ -22,9 +22,9 @@ """ Exemple de couplage HOMARD-Salome -Copyright EDF 1996, 2011, 2018 +Copyright EDF 1996, 2011, 2019 """ -__revision__ = "V4.5" +__revision__ = "V4.06" # import os import sys @@ -35,12 +35,9 @@ PATH_HOMARD = os.getenv("HOMARD_ROOT_DIR") 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 gzip_gunzip from tutorial_util import creation_dircase # ================================== DIRCASE = creation_dircase(6) -gzip_gunzip(DATA_TUTORIAL, 4, -1) -gzip_gunzip(DATA_TUTORIAL, 6, -1) # ================================== # import salome @@ -116,10 +113,5 @@ iter_6_3.SetMeshFile(os.path.join(DIRCASE, "maill.03.med")) iter_6_3.AssociateHypo('hypo_6_bis') erreur = iter_6_3.Compute(1, 2) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 4, 1) -gzip_gunzip(DATA_TUTORIAL, 6, 1) -# ================================== - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/doc/fr/tutorials.rst b/doc/fr/tutorials.rst index 49caa551..c8980eb5 100644 --- a/doc/fr/tutorials.rst +++ b/doc/fr/tutorials.rst @@ -43,9 +43,9 @@ On fera ici trois raffinements uniformes successifs du maillage contenu dans le .. note:: Téléchargement des fichiers - * :download:`maillage initial<../files/tutorial_1.00.med.gz>` + * :download:`maillage initial<../files/tutorial_1.00.med>` * :download:`commandes python<../files/tutorial_1.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` Raffinement par des zones @@ -62,9 +62,9 @@ On procède ici au raffinement selon des zones. Pour passer du maillage initial .. note:: Téléchargement des fichiers - * :download:`maillage initial<../files/tutorial_2.00.med.gz>` + * :download:`maillage initial<../files/tutorial_2.00.med>` * :download:`commandes python<../files/tutorial_2.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` Raffinement selon un champ @@ -82,10 +82,10 @@ Pour adapter le maillage H_1 issu de l'itération Iter_1, deux variantes sont ap .. note:: Téléchargement des fichiers - * :download:`maillage et champ étape 0<../files/tutorial_3.00.med.gz>` - * :download:`maillage et champ étape 1<../files/tutorial_3.01.med.gz>` + * :download:`maillage et champ étape 0<../files/tutorial_3.00.med>` + * :download:`maillage et champ étape 1<../files/tutorial_3.01.med>` * :download:`commandes python<../files/tutorial_3.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` Suivi de frontières courbes @@ -106,10 +106,10 @@ Le schéma YACS réalisant cette adaptation est téléchargeable. .. note:: Téléchargement des fichiers - * :download:`maillage initial<../files/tutorial_4.00.med.gz>` - * :download:`la frontière en CAO<../files/tutorial_4.xao.gz>` + * :download:`maillage initial<../files/tutorial_4.00.med>` + * :download:`la frontière en CAO<../files/tutorial_4.xao>` * :download:`commandes python<../files/tutorial_4.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` * :download:`schéma YACS<../files/tutorial_4.xml>` Si la géométrie sous forme de CAO n'est pas disponible, on peut l'approcher ainsi : @@ -123,10 +123,10 @@ des frontières analytiques pour décrire les différentes surfaces des tuyaux e .. note:: Téléchargement des fichiers - * :download:`maillage initial<../files/tutorial_4.00.med.gz>` - * :download:`maillage de la frontière discrète<../files/tutorial_6.fr.med.gz>` + * :download:`maillage initial<../files/tutorial_4.00.med>` + * :download:`maillage de la frontière discrète<../files/tutorial_6.fr.med>` * :download:`commandes python<../files/tutorial_6.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` * :download:`schéma YACS<../files/tutorial_6.xml>` @@ -145,10 +145,10 @@ Dans le cas présenté ici, on raffine une première fois toutes les mailles con .. note:: Téléchargement des fichiers - * :download:`maillage initial<../files/tutorial_5.00.med.gz>` - * :download:`maillage de la frontière discrète<../files/tutorial_5.fr.med.gz>` + * :download:`maillage initial<../files/tutorial_5.00.med>` + * :download:`maillage de la frontière discrète<../files/tutorial_5.fr.med>` * :download:`commandes python<../files/tutorial_5.py>` - * :download:`commandes python de l'utilitaire de compression<../files/tutorial_util.py>` + * :download:`commandes python de l'utilitaire de création du répertoire de test<../files/tutorial_util.py>` .. toctree:: diff --git a/src/tests/Test/tutorial_1.py b/src/tests/Test/tutorial_1.py index bc3656d9..25d677e9 100755 --- 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.05" +__revision__ = "V4.06" #======================================================================== TEST_NAME = "tutorial_1" @@ -45,11 +45,6 @@ from test_util import test_results 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, 1, -1) -# ================================== # import salome salome.salome_init() @@ -162,9 +157,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 1, 1) -# ================================== # if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py index fec9d28b..5f3b5af2 100755 --- 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.05" +__revision__ = "V4.06" #======================================================================== TEST_NAME = "tutorial_2" @@ -45,11 +45,6 @@ from test_util import test_results 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, 2, -1) -# ================================== # import salome salome.salome_init() @@ -179,10 +174,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 2, 1) -# ================================== -# if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() iparameters.getSession().restoreVisualState(1) diff --git a/src/tests/Test/tutorial_3.py b/src/tests/Test/tutorial_3.py index 229a7516..2576433d 100755 --- 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.05" +__revision__ = "V4.06" #======================================================================== TEST_NAME = "tutorial_3" @@ -45,11 +45,6 @@ from test_util import test_results 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) -# ================================== # import salome salome.salome_init() @@ -207,10 +202,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -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 9b9b7152..a3f97bad 100755 --- a/src/tests/Test/tutorial_4.py +++ b/src/tests/Test/tutorial_4.py @@ -23,7 +23,7 @@ Python script for HOMARD Test tutorial_4 associe au tutorial 4 """ -__revision__ = "V5.04" +__revision__ = "V5.05" #======================================================================== TEST_NAME = "tutorial_4" @@ -47,11 +47,6 @@ from test_util import test_results 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, 4, -1) -# ================================== # import salome salome.salome_init() @@ -192,9 +187,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 4, 1) -# ================================== if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/src/tests/Test/tutorial_5.py b/src/tests/Test/tutorial_5.py index a21f669c..eea3e141 100755 --- a/src/tests/Test/tutorial_5.py +++ b/src/tests/Test/tutorial_5.py @@ -23,7 +23,7 @@ Python script for HOMARD Test tutorial_5 associe au tutorial 5 """ -__revision__ = "V4.05" +__revision__ = "V4.06" #======================================================================== TEST_NAME = "tutorial_5" @@ -47,11 +47,6 @@ from test_util import test_results 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, 5, -1) -# ================================== # import salome salome.salome_init() @@ -182,9 +177,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 5, 1) -# ================================== if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() diff --git a/src/tests/Test/tutorial_6.py b/src/tests/Test/tutorial_6.py index 898bd667..5667041b 100755 --- a/src/tests/Test/tutorial_6.py +++ b/src/tests/Test/tutorial_6.py @@ -23,7 +23,7 @@ Python script for HOMARD Test tutorial_6 associe au tutorial 6 """ -__revision__ = "V4.05" +__revision__ = "V4.06" #======================================================================== TEST_NAME = "tutorial_6" @@ -49,12 +49,6 @@ from test_util import test_results 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, 4, -1) -gzip_gunzip(DATA_TUTORIAL, 6, -1) -# ================================== # import salome salome.salome_init() @@ -208,11 +202,6 @@ while not ERREUR : if ERREUR: raise Exception(MESSAGE) # -# ================================== -gzip_gunzip(DATA_TUTORIAL, 4, 1) -gzip_gunzip(DATA_TUTORIAL, 6, 1) -# ================================== - if salome.sg.hasDesktop(): salome.sg.updateObjBrowser() iparameters.getSession().restoreVisualState(1)