Salome HOME
projects
/
modules
/
homard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated copyright comment
[modules/homard.git]
/
src
/
tests
/
Test
/
tutorial_2.py
diff --git
a/src/tests/Test/tutorial_2.py
b/src/tests/Test/tutorial_2.py
index 9be1fd8c077222e05884c225af2a51f34bf30f46..8a8c2c3e8304eebc9d342c26fd6056758db538a3 100755
(executable)
--- a/
src/tests/Test/tutorial_2.py
+++ b/
src/tests/Test/tutorial_2.py
@@
-1,5
+1,5
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-# Copyright (C) 2011-20
16 CEA/DEN, EDF R&D
+# Copyright (C) 2011-20
24 CEA, EDF
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# 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_2 associe au tutorial 2
"""
Python script for HOMARD
Test tutorial_2 associe au tutorial 2
"""
-__revision__ = "V4.0
5
"
+__revision__ = "V4.0
7
"
#========================================================================
TEST_NAME = "tutorial_2"
#========================================================================
TEST_NAME = "tutorial_2"
@@
-38,21
+38,14
@@
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
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)
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, 2, -1)
# ==================================
#
import salome
# ==================================
#
import salome
-salome.salome_init()
+salome.salome_init
_without_session
()
import HOMARD
#
import iparameters
import HOMARD
#
import iparameters
@@
-157,7
+150,7
@@
while not ERREUR :
assert HOMARD is not None, "Impossible to load homard engine"
HOMARD.SetLanguageShort("fr")
#
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("MZERO", FICMED, DEBUG)
except RuntimeError as eee:
try:
ERREUR, MESSAGE = homard_exec("MZERO", FICMED, DEBUG)
except RuntimeError as eee:
@@
-179,10
+172,6
@@
while not ERREUR :
if ERREUR:
raise Exception(MESSAGE)
#
if ERREUR:
raise Exception(MESSAGE)
#
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 2, 1)
-# ==================================
-#
if salome.sg.hasDesktop():
salome.sg.updateObjBrowser()
iparameters.getSession().restoreVisualState(1)
if salome.sg.hasDesktop():
salome.sg.updateObjBrowser()
iparameters.getSession().restoreVisualState(1)