Add option of comparing only the SMRY file to run-parallel-regressionTest.sh via the flag -s

compareECLFiles.cmake

@@ -194,7 +194,7 @@ endfunction()
 #   - This test class compares the output from a parallel simulation
 #     to the output from the serial instance of the same model.
 function(add_test_compare_parallel_simulation)
-  set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS)
+  set(oneValueArgs CASENAME FILENAME SIMULATOR ABS_TOL REL_TOL DIR MPI_PROCS ONLY_SMRY)
   set(multiValueArgs TEST_ARGS)
   cmake_parse_arguments(PARAM "$" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
@@ -210,7 +210,22 @@ function(add_test_compare_parallel_simulation)
 
   set(RESULT_PATH ${BASE_RESULT_PATH}/parallel/${PARAM_SIMULATOR}+${PARAM_CASENAME})
   set(TEST_ARGS ${OPM_TESTS_ROOT}/${PARAM_DIR}/${PARAM_FILENAME} ${PARAM_TEST_ARGS})
-  set(DRIVER_ARGS -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
+
+  # Handle ONLY_SMRY flag (defaults to 0 if not provided)
+  if(PARAM_ONLY_SMRY)
+    if(${PARAM_ONLY_SMRY} EQUAL 1)
+      set(DRIVER_ARGS -s)
+    elseif(${PARAM_ONLY_SMRY} EQUAL 0)
+      set(DRIVER_ARGS "")
+    else()
+      message(FATAL_ERROR "ONLY_SMRY must be either 0 or 1.")
+    endif()
+  else()
+    set(DRIVER_ARGS "")
+  endif()
+
+  set(DRIVER_ARGS ${DRIVER_ARGS}
+                  -i ${OPM_TESTS_ROOT}/${PARAM_DIR}
                   -r ${RESULT_PATH}
                   -b ${PROJECT_BINARY_DIR}/bin
                   -f ${PARAM_FILENAME}

tests/run-parallel-regressionTest.sh

@@ -18,12 +18,15 @@ then
   echo -e "\t\t -e <filename> Simulator binary to use"
   echo -e "\tOptional options:"
   echo -e "\t\t -n <procs>    Number of MPI processes to use"
+  echo -e "\t\t -s            If given, compare only the SMRY file and skip comparison of the UNRST file."
   exit 1
 fi
 
 MPI_PROCS=4
 OPTIND=1
-while getopts "i:r:b:f:a:t:c:e:n:" OPT
+ONLY_SUMMARY=false
+
+while getopts "i:r:b:f:a:t:c:e:n:s" OPT
 do
   case "${OPT}" in
     i) INPUT_DATA_PATH=${OPTARG} ;;
@@ -35,6 +38,7 @@ do
     c) COMPARE_ECL_COMMAND=${OPTARG} ;;
     e) EXE_NAME=${OPTARG} ;;
     n) MPI_PROCS=${OPTARG} ;;
+    s) ONLY_SUMMARY=true ;;
   esac
 done
 shift $(($OPTIND-1))
@@ -61,12 +65,16 @@ then
   ${COMPARE_ECL_COMMAND} -t SMRY -a -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
 fi
 
-echo "=== Executing comparison for restart file ==="
+if [ "$ONLY_SUMMARY" = false ]; then
-${COMPARE_ECL_COMMAND} -l -t UNRST ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
+  echo "=== Executing comparison for restart file ==="
-if [ $? -ne 0 ]
+  ${COMPARE_ECL_COMMAND} -l -t UNRST ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
-then
+  if [ $? -ne 0 ]
-  ecode=1
+  then
-  ${COMPARE_ECL_COMMAND} -a -l -t UNRST ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
+    ecode=1
+    ${COMPARE_ECL_COMMAND} -a -l -t UNRST ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
+  fi
+else
+  echo "=== Skipping comparison for restart file due to -s flag ==="
 fi
 
 exit $ecode