OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1544 from joakim-hove/use-opm-pack

Browse Source 
Relocate restart data file in tests
This commit is contained in:
Atgeirr Flø Rasmussen
2018-08-08 13:27:01 +02:00
committed by GitHub
parent ffd3c6d270 8e71e3878f
commit 11b987b97d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compareECLFiles.cmake
View File

@@ -69,6 +69,7 @@ function(add_test_compare_restarted_simulation)
${PARAM_ABS_TOL} ${PARAM_REL_TOL} ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_SUMMARY_COMMAND} ${COMPARE_SUMMARY_COMMAND}
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
${OPM_PACK_COMMAND}
0 0
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()
@@ -130,6 +131,7 @@ function(add_test_compare_parallel_restarted_simulation)
${PARAM_ABS_TOL} ${PARAM_REL_TOL} ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
${COMPARE_SUMMARY_COMMAND} ${COMPARE_SUMMARY_COMMAND}
${COMPARE_ECL_COMMAND} ${COMPARE_ECL_COMMAND}
${OPM_PACK_COMMAND}
1 1
TEST_ARGS ${TEST_ARGS}) TEST_ARGS ${TEST_ARGS})
endfunction() endfunction()

13
tests/run-restart-regressionTest.sh
View File

@@ -12,11 +12,14 @@ ABS_TOL="$5"
REL_TOL="$6" REL_TOL="$6"
COMPARE_SUMMARY_COMMAND="$7" COMPARE_SUMMARY_COMMAND="$7"
COMPARE_ECL_COMMAND="$8" COMPARE_ECL_COMMAND="$8"
PARALLEL="${9}" OPM_PACK_COMMAND="$9"
EXE_NAME="${10}" PARALLEL="${10}"
shift 10 EXE_NAME="${11}"
shift 11
TEST_ARGS="$@" TEST_ARGS="$@"
BASE_NAME=`basename ${TEST_ARGS}_RESTART.DATA`
rm -Rf ${RESULT_PATH} rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH} mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH} cd ${RESULT_PATH}
@@ -28,7 +31,9 @@ else
fi fi
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false output_dir=${RESULT_PATH} ${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false output_dir=${RESULT_PATH}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}_RESTART.DATA timestep.adaptive=false output_dir=${RESULT_PATH}
${OPM_PACK_COMMAND} -o ${BASE_NAME} ${TEST_ARGS}_RESTART.DATA
${CMD_PREFIX} ${BINPATH}/${EXE_NAME} ${BASE_NAME} timestep.adaptive=false output_dir=${RESULT_PATH}
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
ecode=0 ecode=0