OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-25 07:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7083 from akva2/opm_add_test_target

Browse Source 
opm_add_test: pass target
This commit is contained in:
Bård Skaflestad authored and GitHub committed 2026-05-22 14:01:54 +02:00
2 parents 6cba035d10 cedd916154
commit 9e3acc932f
16 files changed
+153 -168
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

compareECLFiles.cmake
+76 -52
View File
@@ -41,22 +41,26 @@ function(add_test_runSimulator)
set(TEST_ARGS ${PARAM_TEST_ARGS})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME})
if(PARAM_PROCS)
list(APPEND DRIVER_ARGS -n ${PARAM_PROCS})
endif()
if(PARAM_POST_COMMAND)
list(APPEND DRIVER_ARGS -p "${PARAM_POST_COMMAND}")
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS}
CONFIGURATION ${PARAM_CONFIGURATION})
if(PARAM_PROCS)
list(APPEND DRIVER_ARGS -n ${PARAM_PROCS})
endif()
if(PARAM_POST_COMMAND)
list(APPEND DRIVER_ARGS -p "${PARAM_POST_COMMAND}")
endif()
if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
opm_add_test(runSimulator/${PARAM_CASENAME} NO_COMPILE
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${TEST_ARGS}
CONFIGURATION
${PARAM_CONFIGURATION}
)
if(PARAM_PROCS)
set_tests_properties(runSimulator/${PARAM_CASENAME} PROPERTIES PROCESSORS ${PARAM_PROCS})
endif()
@@ -97,7 +101,6 @@ function(add_test_compareECLFiles)
set(TEST_ARGS ${PARAM_TEST_ARGS})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
@@ -114,9 +117,13 @@ function(add_test_compareECLFiles)
set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
endif()
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${TEST_ARGS}
)
set_tests_properties(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} PROPERTIES
DIRNAME ${PARAM_DIR}
FILENAME ${PARAM_FILENAME}
@@ -173,7 +180,6 @@ function(add_test_compareSeparateECLFiles)
-f ${PARAM_FILENAME1}
-g ${PARAM_FILENAME2}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c $<TARGET_FILE:compareECL>
@@ -182,9 +188,13 @@ function(add_test_compareSeparateECLFiles)
list(APPEND DRIVER_ARGS -y ${PARAM_IGNORE_EXTRA_KW})
endif()
opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${TEST_ARGS}
)
set_tests_properties(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME} PROPERTIES
DIRNAME ${PARAM_DIR}
FILENAME1 ${PARAM_FILENAME1}
@@ -236,17 +246,20 @@ function(add_test_compare_restarted_simulation)
set(RESULT_PATH ${BASE_RESULT_PATH}/restart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
opm_add_test(${TEST_NAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c $<TARGET_FILE:compareECL>
-d $<TARGET_FILE:rst_deck>
-s ${PARAM_RESTART_STEP}
TEST_ARGS ${PARAM_TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
-i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c $<TARGET_FILE:compareECL>
-d $<TARGET_FILE:rst_deck>
-s ${PARAM_RESTART_STEP}
TEST_ARGS
${PARAM_TEST_ARGS}
)
endfunction()
###########################################################################
@@ -301,7 +314,6 @@ function(add_test_compare_parallel_simulation)
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
@@ -310,9 +322,13 @@ function(add_test_compare_parallel_simulation)
# Add test that runs flow_mpi and outputs the results to file
opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}${PARAM_POSTFIX} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${TEST_ARGS}
)
set_tests_properties(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME}${PARAM_POSTFIX}
PROPERTIES PROCESSORS ${MPI_PROCS})
endif()
@@ -370,7 +386,6 @@ function(add_test_compare_parallel_restarted_simulation)
set(RESULT_PATH ${BASE_RESULT_PATH}/parallelRestart/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
@@ -380,9 +395,13 @@ function(add_test_compare_parallel_restarted_simulation)
-n ${MPI_PROCS})
opm_add_test(${TEST_NAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${PARAM_TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${PARAM_TEST_ARGS}
)
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCS})
endif()
endfunction()
@@ -429,17 +448,19 @@ function(add_test_split_comm)
set(RESULT_PATH ${BASE_RESULT_PATH}/parallelSplitComm/${PARAM_SIMULATOR}+${PARAM_CASENAME})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
-c $<TARGET_FILE:compareECL>
-n ${MPI_PROCS})
-c $<TARGET_FILE:compareECL>)
opm_add_test(compareParallelSplitComm_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${PARAM_TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${PARAM_TEST_ARGS}
)
set_tests_properties(compareParallelSplitComm_${PARAM_SIMULATOR}+${PARAM_FILENAME}
PROPERTIES PROCESSORS ${MPI_PROCS})
endfunction()
@@ -489,7 +510,6 @@ function(add_test_compareDamarisFiles)
set(TEST_ARGS ${PARAM_TEST_ARGS})
set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
-r ${RESULT_PATH}
-b ${PROJECT_BINARY_DIR}/bin
-f ${PARAM_FILENAME}
-a ${PARAM_ABS_TOL}
-t ${PARAM_REL_TOL}
@@ -497,9 +517,13 @@ function(add_test_compareDamarisFiles)
-n ${MPI_PROCS})
set(TEST_NAME ${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME})
opm_add_test(${TEST_NAME} NO_COMPILE
EXE_NAME ${PARAM_SIMULATOR}
DRIVER_ARGS ${DRIVER_ARGS}
TEST_ARGS ${TEST_ARGS})
EXE_TARGET
${PARAM_SIMULATOR}
DRIVER_ARGS
${DRIVER_ARGS}
TEST_ARGS
${TEST_ARGS}
)
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCS}
DIRNAME ${PARAM_DIR}
FILENAME ${PARAM_FILENAME}
modelTests.cmake
+18 -18
View File
@@ -2,8 +2,8 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-vtu-test.sh "--simulation")
opm_add_test(art2dgf
NO_COMPILE
EXE_NAME
$<TARGET_FILE:art2dgf>
EXE_TARGET
art2dgf
DRIVER_ARGS
--plain
TEST_ARGS
@@ -19,8 +19,8 @@ foreach(tgt lens_immiscible_ecfv_ad
lens_immiscible_vcfv_fd)
opm_add_test(${tgt}
NO_COMPILE
EXE_NAME
$<TARGET_FILE:${tgt}>
EXE_TARGET
${tgt}
TEST_ARGS
--end-time=3000
WORKING_DIRECTORY
@@ -30,8 +30,8 @@ endforeach()
opm_add_test(waterair_pvs_ni
NO_COMPILE
EXE_NAME
$<TARGET_FILE:waterair_pvs_ni>
EXE_TARGET
waterair_pvs_ni
TEST_ARGS
--grid-global-refinements=1
WORKING_DIRECTORY
@@ -85,8 +85,8 @@ endif()
foreach(tgt ${PLAIN_TGT})
opm_add_test(${tgt}
NO_COMPILE
EXE_NAME
$<TARGET_FILE:${tgt}>
EXE_TARGET
${tgt}
WORKING_DIRECTORY
${PROJECT_BINARY_DIR}/tests
)
@@ -98,8 +98,8 @@ foreach(tgt reservoir_blackoil_ecfv
reservoir_ncp_vcfv)
opm_add_test(${tgt}
NO_COMPILE
EXE_NAME
$<TARGET_FILE:${tgt}>
EXE_TARGET
${tgt}
TEST_ARGS
--end-time=8750000
WORKING_DIRECTORY
@@ -110,8 +110,8 @@ endforeach()
if(dune-alugrid_FOUND)
opm_add_test(fracture_discretefracture
NO_COMPILE
EXE_NAME
$<TARGET_FILE:fracture_discretefracture>
EXE_TARGET
fracture_discretefracture
TEST_ARGS
--end-time=400
WORKING_DIRECTORY
@@ -122,8 +122,8 @@ endif()
if(dune-alugrid_FOUND AND dune-fem_FOUND)
opm_add_test(finger_immiscible_ecfv_adaptive
NO_COMPILE
EXE_NAME
$<TARGET_FILE:finger_immiscible_ecfv>
EXE_TARGET
finger_immiscible_ecfv
TEST_ARGS
--enable-grid-adaptation=true
--end-time=25e3
@@ -135,8 +135,8 @@ endif()
opm_add_test(obstacle_immiscible_parameters
NO_COMPILE
EXE_NAME
$<TARGET_FILE:obstacle_immiscible>
EXE_TARGET
obstacle_immiscible
DRIVER_ARGS
--parameters
WORKING_DIRECTORY
@@ -145,8 +145,8 @@ opm_add_test(obstacle_immiscible_parameters
opm_add_test(obstacle_pvs_restart
NO_COMPILE
EXE_NAME
$<TARGET_FILE:obstacle_pvs>
EXE_TARGET
obstacle_pvs
TEST_ARGS
--pvs-verbosity=2
--end-time=30000
parallelUnitTests.cmake
+8 -21
View File
@@ -14,7 +14,6 @@ opm_add_test(test_gatherconvergencereport
tests/test_gatherconvergencereport.cpp
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
PROCESSORS
4
)
@@ -29,17 +28,15 @@ opm_add_test(test_gatherdeferredlogger
tests/test_gatherdeferredlogger.cpp
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
PROCESSORS
4
)
opm_add_test(test_parallelwellinfo_mpi
EXE_NAME
EXE_TARGET
test_parallelwellinfo
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
NO_COMPILE
PROCESSORS
4
@@ -47,11 +44,10 @@ opm_add_test(test_parallelwellinfo_mpi
foreach(NPROC 2 3 4)
opm_add_test(test_parallel_wbp_sourcevalues_np${NPROC}
EXE_NAME
EXE_TARGET
test_parallel_wbp_sourcevalues
DRIVER_ARGS
-n ${NPROC}
-b ${PROJECT_BINARY_DIR}
NO_COMPILE
PROCESSORS
${NPROC}
@@ -70,11 +66,10 @@ opm_add_executable(
)
opm_add_test(test_parallel_wbp_calculation_create
EXE_NAME
EXE_TARGET
test_parallel_wbp_calculation
DRIVER_ARGS
-n 2
-b ${PROJECT_BINARY_DIR}
TEST_ARGS
--run_test=Create
NO_COMPILE
@@ -83,11 +78,10 @@ opm_add_test(test_parallel_wbp_calculation_create
)
opm_add_test(test_parallel_wbp_calculation_well_openconns
EXE_NAME
EXE_TARGET
test_parallel_wbp_calculation
DRIVER_ARGS
-n 2
-b ${PROJECT_BINARY_DIR}
TEST_ARGS
--run_test=TopOfFormation_Well_OpenConns
NO_COMPILE
@@ -97,11 +91,10 @@ opm_add_test(test_parallel_wbp_calculation_well_openconns
foreach(NPROC 2 3 4)
opm_add_test(test_rftcontainer_np${NPROC}
EXE_NAME
EXE_TARGET
test_rftcontainer
DRIVER_ARGS
-n ${NPROC}
-b ${PROJECT_BINARY_DIR}
NO_COMPILE
PROCESSORS
${NPROC}
@@ -110,11 +103,10 @@ endforeach()
foreach(NPROC 2 3 4)
opm_add_test(test_parallel_region_phase_pvaverage_np${NPROC}
EXE_NAME
EXE_TARGET
test_region_phase_pvaverage
DRIVER_ARGS
-n ${NPROC}
-b ${PROJECT_BINARY_DIR}
TEST_ARGS
--run_test=Parallel/*
NO_COMPILE
@@ -125,11 +117,10 @@ endforeach()
foreach(NPROC 2 3 4)
opm_add_test(test_parallel_satfunc_consistency_checks_np${NPROC}
EXE_NAME
EXE_TARGET
test_SatfuncConsistencyChecks_parallel
DRIVER_ARGS
-n ${NPROC}
-b ${PROJECT_BINARY_DIR}
NO_COMPILE
PROCESSORS
${NPROC}
@@ -146,7 +137,6 @@ opm_add_test(test_broadcast
tests/test_broadcast.cpp
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
PROCESSORS
4
)
@@ -163,7 +153,6 @@ opm_add_test(test_HDF5File_Parallel
HDF5_FOUND
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
PROCESSORS
4
)
@@ -181,17 +170,15 @@ opm_add_test(test_HDF5Serializer_Parallel
HDF5_FOUND
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
PROCESSORS
4
)
opm_add_test(test_rstconv_parallel
EXE_NAME
EXE_TARGET
test_rstconv
DRIVER_ARGS
-n 4
-b ${PROJECT_BINARY_DIR}
NO_COMPILE
PROCESSORS
4
tests/run-comparison.sh
+3 -6
View File
@@ -12,7 +12,6 @@ then
echo -e "\t\t -g value Second deck file name"
echo -e "\t\t -y value Ignore extra keywords in the run. For -y 'BOTH', extra keywords in both runs will be ignored. For -y 'SECOND', extra keywords in the second deck will be ignored."
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
echo -e "\t\t -c <path> Path to comparison tool"
@@ -24,7 +23,7 @@ fi
RESTART_STEP=""
MPI_PROCS=1
OPTIND=1
while getopts "i:j:f:g:r:b:a:t:c:e:y:n:" OPT
while getopts "i:j:f:g:r:a:t:c:e:y:n:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH1=${OPTARG} ;;
@@ -32,7 +31,6 @@ do
f) FILENAME1=${OPTARG} ;;
g) FILENAME2=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
c) COMPARE_ECL_COMMAND=${OPTARG} ;;
@@ -46,13 +44,12 @@ TEST_ARGS="$@"
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH1}/${FILENAME1} ${TEST_ARGS} --output-dir=${RESULT_PATH}
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${INPUT_DATA_PATH1}/${FILENAME1} ${TEST_ARGS} --output-dir=${RESULT_PATH}
test $? -eq 0 || exit 1
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH2}/${FILENAME2} ${TEST_ARGS} --output-dir=${RESULT_PATH}
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${INPUT_DATA_PATH2}/${FILENAME2} ${TEST_ARGS} --output-dir=${RESULT_PATH}
test $? -eq 0 || exit 1
cd ..
ecode=0
ignore_extra_kw=""
tests/run-damaris-regressionTest.sh
+6 -7
View File
@@ -9,7 +9,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -23,12 +22,11 @@ fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:u:" OPT
while getopts "i:r:f:a:t:c:e:n:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -41,18 +39,19 @@ done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
BASE_EXE_NAME=$(basename -- "${EXE_NAME}")
REF_EXE_NAME=${REF_EXE_NAME:-${BASE_EXE_NAME}}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} --damaris-dedicated-cores=1 --damaris-save-mesh-to-hdf=true --enable-damaris-output=true --enable-ecl-output=false --damaris-output-hdf-collective=1 --damaris-save-to-hdf=1 --damaris-sim-name="${FILENAME}"
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} --damaris-dedicated-cores=1 --damaris-save-mesh-to-hdf=true --enable-damaris-output=true --enable-ecl-output=false --damaris-output-hdf-collective=1 --damaris-save-to-hdf=1 --damaris-sim-name="${FILENAME}"
test $? -eq 0 || exit 1
cd ..
echo "=== Executing comparison for files if these exists in reference folder ==="
for fname in `ls ${RESULT_PATH}/${FILENAME}*.h5`
for fname in $(ls ${RESULT_PATH}/${FILENAME}*.h5)
do
fname=`basename $fname`
fname=$(basename -- "$fname")
if test -f ${INPUT_DATA_PATH}/opm-simulation-reference/${REF_EXE_NAME}/${fname}
then
echo -e "\t - ${fname}"
tests/run-init-regressionTest.sh
+4 -5
View File
@@ -12,7 +12,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -24,12 +23,11 @@ then
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:u:" OPT
while getopts "i:r:f:a:t:c:e:d:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -43,12 +41,13 @@ done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
BASE_EXE_NAME=$(basename -- "${EXE_NAME}")
REF_EXE_NAME=${REF_EXE_NAME:-${BASE_EXE_NAME}}
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH} ${INPUT_DATA_PATH}/${FILENAME}
"${EXE_NAME}" ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH} ${INPUT_DATA_PATH}/${FILENAME}
cd ..
ecode=0
tests/run-parallel-regressionTest.sh
+3 -5
View File
@@ -10,7 +10,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -24,12 +23,11 @@ fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:" OPT
while getopts "i:r:f:a:t:c:e:n:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -44,12 +42,12 @@ TEST_ARGS="$@"
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}
"${EXE_NAME}" ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}
test $? -eq 0 || exit 1
mkdir mpi
cd mpi
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${TEST_ARGS} --enable-opm-rst-file=true --output-dir=${RESULT_PATH}/mpi
test $? -eq 0 || exit 1
cd ..
tests/run-parallel-restart-regressionTest.sh
+3 -5
View File
@@ -10,7 +10,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -25,12 +24,11 @@ fi
MPI_PROCS=4
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:d:s:" OPT
while getopts "i:r:f:a:t:c:e:n:d:s:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -49,13 +47,13 @@ BASE_NAME=${FILENAME}_RESTART
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
${RST_DECK_COMMAND} -m inline -s ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
ecode=0
tests/run-parallel-unitTest.sh
+2 -4
View File
@@ -6,16 +6,14 @@ then
echo -e "Usage:\t$0 <options> -- [additional simulator options]"
echo -e "\tMandatory options:"
echo -e "\t\t -n <procs> Number of MPI Processes to use"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -e <filename> Simulator binary to use"
exit 1
fi
OPTIND=1
while getopts "n:b:e:" OPT
while getopts "n:e:" OPT
do
case "${OPT}" in
b) BDIR=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) NP=${OPTARG} ;;
esac
@@ -23,4 +21,4 @@ done
shift $(($OPTIND-1))
TEST_ARGS="$@"
mpirun -np $NP $BDIR/bin/${EXE_NAME} ${TEST_ARGS}
mpirun -np $NP "${EXE_NAME}" ${TEST_ARGS}
tests/run-porv-acceptanceTest.sh
+4 -5
View File
@@ -12,7 +12,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -24,12 +23,11 @@ then
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:h:u:" OPT
while getopts "i:r:f:a:t:c:e:d:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -43,12 +41,13 @@ done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
BASE_EXE_NAME=$(basename -- "${EXE_NAME}")
REF_EXE_NAME=${REF_EXE_NAME:-${BASE_EXE_NAME}}
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH} ${INPUT_DATA_PATH}/${FILENAME}
"${EXE_NAME}" ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_PATH} ${INPUT_DATA_PATH}/${FILENAME}
cd ..
ecode=0
tests/run-regressionTest.sh
+10 -12
View File
@@ -9,7 +9,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -25,12 +24,11 @@ fi
RESTART_STEP=""
OPTIND=1
while getopts "i:r:b:f:a:t:c:d:s:e:h:u:" OPT
while getopts "i:r:f:a:t:c:d:s:e:h:u:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -45,29 +43,29 @@ done
shift $(($OPTIND-1))
TEST_ARGS="$@"
REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
BASE_EXE_NAME=$(basename -- "${EXE_NAME}")
REF_EXE_NAME=${REF_EXE_NAME:-${BASE_EXE_NAME}}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
# Check if simulator binary exists
if [ ! -x "${BINPATH}/${EXE_NAME}" ]; then
echo "ERROR: Simulator binary not found: ${BINPATH}/${EXE_NAME}"
if [ ! -x "${EXE_NAME}" ]; then
echo "ERROR: Simulator binary not found: ${EXE_NAME}"
echo ""
echo "To build this binary, run one of:"
echo " ninja ${EXE_NAME}"
echo " make ${EXE_NAME}"
echo " cmake --build . --target ${EXE_NAME}"
echo " ninja ${BASE_EXE_NAME}"
echo " make ${BASE_EXE_NAME}"
echo " cmake --build . --target ${BASE_EXE_NAME}"
echo ""
echo "Or build all targets with: ninja / make"
exit 1
fi
${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} ${TEST_ARGS} --output-dir=${RESULT_PATH}
"${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} ${TEST_ARGS} --output-dir=${RESULT_PATH}
test $? -eq 0 || exit 1
cd ..
ecode=0
ignore_extra_kw=""
@@ -105,7 +103,7 @@ do
then
sched_rst="--sched-restart=${RESTART_SCHED}"
fi
${BINPATH}/${EXE_NAME} ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}_RESTART_${STEP}
"${EXE_NAME}" ${TEST_ARGS} ${sched_rst} --output-dir=${RESULT_PATH}/restart ${FILENAME}_RESTART_${STEP}
test $? -eq 0 || exit 1
if test -n "$type"
tests/run-restart-regressionTest.sh
+3 -5
View File
@@ -10,7 +10,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -22,12 +21,11 @@ then
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
while getopts "i:r:f:a:t:c:e:d:s:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -45,13 +43,13 @@ BASE_NAME=${FILENAME}_RESTART
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
"${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
${RST_DECK_COMMAND} -m inline -s ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA
${BINPATH}/${EXE_NAME} ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
"${EXE_NAME}" ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
ecode=0
tests/run-serialization-regressionTest.sh
+4 -6
View File
@@ -10,7 +10,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -22,12 +21,11 @@ fi
OPTIND=1
MPI_PROCS=1
while getopts "i:r:b:f:a:t:c:e:n:d:s:" OPT
while getopts "i:r:f:a:t:c:e:n:d:s:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -44,18 +42,18 @@ TEST_ARGS="$@"
BASE_NAME=${FILENAME}
if test $MPI_PROCS -gt 1
then
CMD_PREFIX="mpirun -np $MPI_PROCS "
CMD_PREFIX="mpirun -np $MPI_PROCS"
fi
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${CMD_PREFIX}${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS} --save-step=${RESTART_STEP}
${CMD_PREFIX} "${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS} --save-step=${RESTART_STEP}
test $? -eq 0 || exit 1
mkdir -p ${RESULT_PATH}/restart
${CMD_PREFIX}${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH}/restart ${TEST_ARGS} --load-step=${RESTART_STEP} --save-file=${RESULT_PATH}/${FILENAME}.OPMRST
${CMD_PREFIX} "${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH}/restart ${TEST_ARGS} --load-step=${RESTART_STEP} --save-file=${RESULT_PATH}/${FILENAME}.OPMRST
test $? -eq 0 || exit 1
echo "=== Executing comparison for restart file ==="
tests/run-split-comm-test.sh
+3 -7
View File
@@ -11,7 +11,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -23,12 +22,11 @@ fi
BASE_MPI_PROCS=3
TEST_MPI_PROCS=4 # should be 1 more than the base
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:n:" OPT
while getopts "i:r:f:a:t:c:e:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -42,12 +40,10 @@ TEST_ARGS="$@"
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
echo mpirun -np ${BASE_MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/base
mpirun -np ${BASE_MPI_PROCS} ${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/base
mpirun -np ${BASE_MPI_PROCS} "${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/base
test $? -eq 0 || exit 1
echo mpirun -np ${TEST_MPI_PROCS} ${BINPATH}/${EXE_NAME} --test-split-communicator=true ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/test
mpirun -np ${TEST_MPI_PROCS} ${BINPATH}/${EXE_NAME} --test-split-communicator=true ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/test
mpirun -np ${TEST_MPI_PROCS} "${EXE_NAME}" --test-split-communicator=true ${INPUT_DATA_PATH}/${FILENAME}.DATA ${TEST_ARGS} --output-dir=${RESULT_PATH}/test
test $? -eq 0 || exit 1
ecode=0
tests/run-summary-restart-regressionTest.sh
+3 -5
View File
@@ -12,7 +12,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -a <tol> Absolute tolerance in comparison"
echo -e "\t\t -t <tol> Relative tolerance in comparison"
@@ -24,12 +23,11 @@ then
fi
OPTIND=1
while getopts "i:r:b:f:a:t:c:e:d:s:" OPT
while getopts "i:r:f:a:t:c:e:d:s:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
a) ABS_TOL=${OPTARG} ;;
t) REL_TOL=${OPTARG} ;;
@@ -47,13 +45,13 @@ BASE_NAME=${FILENAME}_RESTART
rm -Rf ${RESULT_PATH}
mkdir -p ${RESULT_PATH}
cd ${RESULT_PATH}
${BINPATH}/${EXE_NAME} ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
"${EXE_NAME}" ${INPUT_DATA_PATH}/${FILENAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
${RST_DECK_COMMAND} -m inline -s ${INPUT_DATA_PATH}/${FILENAME}.DATA ${FILENAME}.UNRST:${RESTART_STEP} ${BASE_NAME}.DATA
${BINPATH}/${EXE_NAME} ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
"${EXE_NAME}" ${BASE_NAME} --output-dir=${RESULT_PATH} ${TEST_ARGS}
test $? -eq 0 || exit 1
ecode=0
tests/run-test.sh
+3 -5
View File
@@ -8,7 +8,6 @@ then
echo -e "\tMandatory options:"
echo -e "\t\t -i <path> Path to read deck from"
echo -e "\t\t -r <path> Path to store results in"
echo -e "\t\t -b <path> Path to simulator binary"
echo -e "\t\t -f <filename> Deck file name"
echo -e "\t\t -e <filename> Simulator binary to use"
echo -e "\tOptional options:"
@@ -19,12 +18,11 @@ fi
OPTIND=1
MPI_PROCS=1
while getopts "i:r:b:f:e:n:p:" OPT
while getopts "i:r:f:e:n:p:" OPT
do
case "${OPT}" in
i) INPUT_DATA_PATH=${OPTARG} ;;
r) RESULT_PATH=${OPTARG} ;;
b) BINPATH=${OPTARG} ;;
f) FILENAME=${OPTARG} ;;
e) EXE_NAME=${OPTARG} ;;
n) MPI_PROCS=${OPTARG} ;;
@@ -37,9 +35,9 @@ TEST_ARGS="$@"
mkdir -p ${RESULT_PATH}
if (( ${MPI_PROCS} > 1))
then
mpirun -np ${MPI_PROCS} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} "${INPUT_DATA_PATH}/${FILENAME}.DATA"
mpirun -np ${MPI_PROCS} "${EXE_NAME}" ${TEST_ARGS} --output-dir=${RESULT_PATH} "${INPUT_DATA_PATH}/${FILENAME}.DATA"
else
${BINPATH}/${EXE_NAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} "${INPUT_DATA_PATH}/${FILENAME}.DATA"
"${EXE_NAME}" ${TEST_ARGS} --output-dir=${RESULT_PATH} "${INPUT_DATA_PATH}/${FILENAME}.DATA"
fi
test $? -eq 0 || exit 1