add dev_simulator to all regression tests

compareECLFiles.cmake

@@ -525,40 +525,70 @@ include (${CMAKE_CURRENT_SOURCE_DIR}/restartTests.cmake)
 
 # PORV test
 opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-porv-acceptanceTest.sh "")
-add_test_compareECLFiles(CASENAME norne
-                         FILENAME NORNE_ATW2013
-                         SIMULATOR flow
-                         DEV_SIMULATOR flow_blackoil
-                         ABS_TOL 1e-5
-                         REL_TOL 1e-8
-                         PREFIX comparePORV
-                         DIR_PREFIX /porv)
+add_test_compareECLFiles(
+  CASENAME
+    norne
+  FILENAME
+    NORNE_ATW2013
+  SIMULATOR
+    flow
+  DEV_SIMULATOR
+    flow_blackoil
+  ABS_TOL
+    1e-5
+  REL_TOL
+    1e-8
+  PREFIX
+    comparePORV
+  DIR_PREFIX
+    /porv
+)
 
 # Init tests
 opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-init-regressionTest.sh "")
-
-add_test_compareECLFiles(CASENAME norne_init
-                         FILENAME NORNE_ATW2013
-                         SIMULATOR flow
-                         ABS_TOL ${abs_tol}
-                         REL_TOL ${rel_tol}
-                         PREFIX compareECLInitFiles
-                         DIR norne
-                         DIR_PREFIX /init)
+add_test_compareECLFiles(
+  CASENAME
+    norne_init
+  FILENAME
+    NORNE_ATW2013
+  SIMULATOR
+    flow
+  DEV_SIMULATOR
+    flow_blackoil
+  ABS_TOL
+    ${abs_tol}
+  REL_TOL
+    ${rel_tol}
+  PREFIX
+    compareECLInitFiles
+  DIR
+    norne
+  DIR_PREFIX
+    /init
+)
 
 set(_operate_work_tests
   OPERATE_ENDPOINTS-01
   OPERATER_ENDPOINTS-01
 )
 
-add_multiple_tests(_operate_work_tests
+add_multiple_tests(
+  _operate_work_tests
   "operate_work_"
-  SIMULATOR flow
-  ABS_TOL ${abs_tol}
-  REL_TOL ${rel_tol}
-  PREFIX compareECLInitFiles
-  DIR operate
-  DIR_PREFIX /init
+  SIMULATOR
+    flow
+  DEV_SIMULATOR
+    flow_blackoil
+  ABS_TOL
+    ${abs_tol}
+  REL_TOL
+    ${rel_tol}
+  PREFIX
+    compareECLInitFiles
+  DIR
+    operate
+  DIR_PREFIX
+    /init
 )
 
 # This is not a proper regression test; the test will load a norne case prepared

tests/run-porv-acceptanceTest.sh

@@ -18,11 +18,13 @@ then
   echo -e "\t\t -t <tol>      Relative tolerance in comparison"
   echo -e "\t\t -c <path>     Path to comparison tool"
   echo -e "\t\t -e <filename> Simulator binary to use"
+  echo -e "\tOptional options:"
+  echo -e "\t\t -u <filename> Simulator binary for reference data"
   exit 1
 fi
 
 OPTIND=1
-while getopts "i:r:b:f:a:t:c:e:d:h:" OPT
+while getopts "i:r:b:f:a:t:c:e:d:h:u:" OPT
 do
   case "${OPT}" in
     i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -35,11 +37,14 @@ do
     e) EXE_NAME=${OPTARG} ;;
     d) ;; # Ignored
     h) ;; # Ignored
+    u) REF_EXE_NAME=${OPTARG} ;;
   esac
 done
 shift $(($OPTIND-1))
 TEST_ARGS="$@"
 
+REF_EXE_NAME=${REF_EXE_NAME:-${EXE_NAME}}
+
 rm -Rf  ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
@@ -47,11 +52,11 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --enable-dry-run=true --output-dir=${RESULT_
 cd ..
 
 ecode=0
-${COMPARE_ECL_COMMAND} -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
+${COMPARE_ECL_COMMAND} -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
 if [ $? -ne 0 ]
 then
   ecode=1
-  ${COMPARE_ECL_COMMAND} -a -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
+  ${COMPARE_ECL_COMMAND} -a -t INIT -k PORV ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-porevolume-reference/${REF_EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
 fi
 
 exit $ecode