Merge branch 'V8_0_BR'

diff --git a/src/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
old mode 100644 (file)
new mode 100755 (executable)
index 22332fa..2db10cf
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.py
@@ -41,8 +41,10 @@ orb, lcc, naming_service, contmgr = salome.salome_kernel.salome_kernel_init()
 #
 # This test program is based on the field named fieldcelldoublevector in 
 # med file $MED_ROOT_DIR/share/salome/resources/pointe.med
-filePath=os.environ["MED_ROOT_DIR"]
-filePath=filePath+"/share/salome/resources/med/"
+#filePath=os.environ["MED_ROOT_DIR"]
+filePath=os.environ["DATA_DIR"]
+#filePath=filePath+"/share/salome/resources/med/"
+filePath=filePath+"/MedFiles/"
 medFile=filePath+"pointe.med"
 fieldname = "fieldcelldoublevector"
 meshname = "maa1"

diff --git a/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py b/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
index aafb8a133dd71b0581179b43d3f7279b210935b5..6a4af982bfd8b98193506524b14bc59bb1feaae8 100755 (executable)
--- a/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
+++ b/src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
@@ -42,8 +42,10 @@ orb, lcc, naming_service, contmgr = salome.salome_kernel.salome_kernel_init()
 #
 # This test program is based on the field named fieldcelldoublevector in 
 # med file $MED_ROOT_DIR/share/salome/resources/med/pointe.med
-filePath=os.environ["MED_ROOT_DIR"]
-filePath=filePath+"/share/salome/resources/med/"
+#filePath=os.environ["MED_ROOT_DIR"]
+filePath=os.environ["DATA_DIR"]
+filePath=filePath+"/MedFiles/"
+#filePath=filePath+"/share/salome/resources/med/"
 medFile=filePath+"pointe.med"
 fieldname = "fieldcelldoublevector"
 meshname = "maa1"