From f869401692a1113fe74e1308ab32197664009d89 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 13 May 2008 12:10:25 +0000 Subject: [PATCH] Replace DATA_DIR environment variable in tests by MED_ROOT_DIR --- src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx | 8 ++++---- .../Test/ParaMEDMEMTest_NonCoincidentDEC.cxx | 10 +++++----- .../Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx index bc408649a..77364428e 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx @@ -100,8 +100,8 @@ void ParaMEDMEMTest::testIntersectionDEC_2D() string tmp_dir = getenv("TMP"); if (tmp_dir == "") tmp_dir = "/tmp"; - string filename_xml1 = data_dir + "/share/salome/resources/MedFiles/square1_split"; - string filename_xml2 = data_dir + "/share/salome/resources/MedFiles/square2_split"; + string filename_xml1 = data_dir + "/share/salome/resources/med/square1_split"; + string filename_xml2 = data_dir + "/share/salome/resources/med/square2_split"; string filename_seq_wr = tmp_dir + "/"; string filename_seq_med = tmp_dir + "/myWrField_seq_pointe221.med"; @@ -356,8 +356,8 @@ void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA string tmp_dir = getenv("TMP"); if (tmp_dir == "") tmp_dir = "/tmp"; - string filename_xml1 = data_dir + "/share/salome/resources/MedFiles/square1_split"; - string filename_xml2 = data_dir + "/share/salome/resources/MedFiles/square2_split"; + string filename_xml1 = data_dir + "/share/salome/resources/med/square1_split"; + string filename_xml2 = data_dir + "/share/salome/resources/med/square2_split"; string filename_seq_wr = tmp_dir + "/"; string filename_seq_med = tmp_dir + "/myWrField_seq_pointe221.med"; diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx index 7faa9b9c8..f2fc9ddde 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx @@ -65,9 +65,9 @@ void ParaMEDMEMTest::testNonCoincidentDEC_2D() //the test is meant to run on five processors if (size !=5) return ; - testNonCoincidentDEC( "/share/salome/resources/MedFiles/square1_split", + testNonCoincidentDEC( "/share/salome/resources/med/square1_split", "Mesh_2", - "/share/salome/resources/MedFiles/square2_split", + "/share/salome/resources/med/square2_split", "Mesh_3", 3, 1e-6); @@ -81,9 +81,9 @@ void ParaMEDMEMTest::testNonCoincidentDEC_3D() //the test is meant to run on five processors if (size !=4) return ; - testNonCoincidentDEC( "/share/salome/resources/MedFiles/blade_12000_split2", + testNonCoincidentDEC( "/share/salome/resources/med/blade_12000_split2", "Mesh_1", - "/share/salome/resources/MedFiles/blade_3000_split2", + "/share/salome/resources/med/blade_3000_split2", "Mesh_1", 2, 1e4); @@ -130,7 +130,7 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1, ParaMEDMEM::ParaMESH* paramesh; ParaMEDMEM::ParaFIELD* parafield; - string data_dir = getenv("MED_ROOT_DIR"); + string data_dir = getenv("MED_ROOT_DIR") + "/share/salome/resources/med/"; string tmp_dir = getenv("TMP"); if (tmp_dir == "") tmp_dir = "/tmp"; diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx index edd94c8ec..bb676d56b 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx @@ -82,8 +82,8 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() { if (tmp_dir == "") tmp_dir = "/tmp"; string filename_xml1 = data_dir - + "/share/salome/resources/MedFiles/square1_split"; - string filename_2 = data_dir + "/share/salome/resources/MedFiles/square1.med"; + + "/share/salome/resources/med/square1_split"; + string filename_2 = data_dir + "/share/salome/resources/med/square1.med"; string filename_seq_wr = tmp_dir + "/"; string filename_seq_med = tmp_dir + "/myWrField_seq_pointe221.med"; -- 2.39.2