Merge pull request #1568 from akva2/adjust_compareECL

changed: adjust to compareSummary being part of compareECL
OPM · Sep 10, 2018 · a8addc1 · a8addc1
2 parents 2524806 + 0f482ee
commit a8addc1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 32 deletions.
diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake
@@ -38,7 +38,6 @@ function(add_test_compareECLFiles)
                            ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_SUMMARY_COMMAND}
                            ${COMPARE_ECL_COMMAND}
                TEST_ARGS ${TEST_ARGS})
 endfunction()
@@ -67,7 +66,6 @@ function(add_test_compare_restarted_simulation)
                            ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_SUMMARY_COMMAND}
                            ${COMPARE_ECL_COMMAND}
                            ${OPM_PACK_COMMAND}
                            0
@@ -99,7 +97,6 @@ function(add_test_compare_parallel_simulation)
                            ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_SUMMARY_COMMAND}
                            ${COMPARE_ECL_COMMAND}
                TEST_ARGS ${TEST_ARGS})
 endfunction()
@@ -129,7 +126,6 @@ function(add_test_compare_parallel_restarted_simulation)
                            ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
-                           ${COMPARE_SUMMARY_COMMAND}
                            ${COMPARE_ECL_COMMAND}
                            ${OPM_PACK_COMMAND}
                            1

diff --git a/tests/run-init-regressionTest.sh b/tests/run-init-regressionTest.sh
@@ -12,10 +12,9 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-COMPARE_SUMMARY_COMMAND="$7"
-COMPARE_ECL_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+COMPARE_ECL_COMMAND="$7"
+EXE_NAME="${8}"
+shift 8
 TEST_ARGS="$@"
 
 rm -Rf  ${RESULT_PATH}

diff --git a/tests/run-parallel-regressionTest.sh b/tests/run-parallel-regressionTest.sh
@@ -10,10 +10,9 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-COMPARE_SUMMARY_COMMAND="$7"
-COMPARE_ECL_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+COMPARE_ECL_COMMAND="$7"
+EXE_NAME="${8}"
+shift 8
 TEST_ARGS="$@"
 
 rm -Rf ${RESULT_PATH}
@@ -38,11 +37,11 @@ cd ..
 
 ecode=0
 echo "=== Executing comparison for summary file ==="
-${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
+${COMPARE_ECL_COMMAND} -t SMRY -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
 if [ $? -ne 0 ]
 then
   ecode=1
-  ${COMPARE_SUMMARY_COMMAND} -a -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL}
+  ${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 ==="

diff --git a/tests/run-porv-acceptanceTest.sh b/tests/run-porv-acceptanceTest.sh
@@ -12,10 +12,9 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-COMPARE_SUMMARY_COMMAND="$7"
-COMPARE_ECL_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+COMPARE_ECL_COMMAND="$7"
+EXE_NAME="${8}"
+shift 8
 TEST_ARGS="$@"
 
 rm -Rf  ${RESULT_PATH}

diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh
@@ -9,10 +9,9 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-COMPARE_SUMMARY_COMMAND="$7"
-COMPARE_ECL_COMMAND="$8"
-EXE_NAME="${9}"
-shift 9
+COMPARE_ECL_COMMAND="$7"
+EXE_NAME="${8}"
+shift 8
 TEST_ARGS="$@"
 
 mkdir -p ${RESULT_PATH}
@@ -27,11 +26,11 @@ cd ..
 
 ecode=0
 echo "=== Executing comparison for summary file ==="
-${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
+${COMPARE_ECL_COMMAND} -t SMRY ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
 if [ $? -ne 0 ]
 then
   ecode=1
-  ${COMPARE_SUMMARY_COMMAND} -a -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
+  ${COMPARE_ECL_COMMAND} -a -t SMRY ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL}
 fi
 
 echo "=== Executing comparison for restart file ==="

diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh
@@ -10,12 +10,11 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-COMPARE_SUMMARY_COMMAND="$7"
-COMPARE_ECL_COMMAND="$8"
-OPM_PACK_COMMAND="$9"
-PARALLEL="${10}"
-EXE_NAME="${11}"
-shift 11
+COMPARE_ECL_COMMAND="$7"
+OPM_PACK_COMMAND="$8"
+PARALLEL="${9}"
+EXE_NAME="${10}"
+shift 10
 TEST_ARGS="$@"
 
 BASE_NAME=`basename ${TEST_ARGS}_RESTART.DATA`
@@ -48,11 +47,11 @@ test $? -eq 0 || exit 1
 
 ecode=0
 echo "=== Executing comparison for summary file ==="
-${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
+${COMPARE_ECL_COMMAND} -R -t SMRY ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
 if [ $? -ne 0 ]
 then
   ecode=1
-  ${COMPARE_SUMMARY_COMMAND} -a -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
+  ${COMPARE_ECL_COMMAND} -a -R -t SMRY ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL}
 fi
 
 echo "=== Executing comparison for restart file ==="