Restoration of the full SETTE AGRIF_DEMO test suite
Context
The routine comparison of output from two correspondingly configured executables that are built with and without AGRIF preprocessing of the source code, respectively, is not carried out by the current main
version of SETTE.
Analysis
Two different NEMO configurations are compiled and run for SETTE configuration AGRIF_DEMO
(by default AGRIF_DEMO_ST
and AGRIF_DEMO_NOAGRIF_ST
). The results from these runs, however, are copied to a common subdirectory named after the SETTE configuration name (the first set of results is overwritten by the second), and no separate directory for the second run is created. As a result, sette_rpt.sh
reports the unavailability of the test results required for the comparison of output from the runs of these two NEMO configurations.
Fix
The use of the NEMO configuration name with removed SETTE suffix instead of the SETTE configuration name for the configuration-specific subdirectories in the SETTE validation archive, i.e.,
--- a/sette/all_functions.sh
+++ b/sette/all_functions.sh
@@ -186,9 +186,9 @@ set_valid_dir () {
fi
CMP_NAM_L=$(echo ${CMP_NAM} | tr '[:upper:]' '[:lower:]')
if [[ -n "${NEMO_DEBUG}" && ! ${CMP_NAM_L} =~ ("debug"|"dbg") ]]; then
- export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}_DEBUG/${REVISION_NB}/${config}/${TEST_NAME}
+ export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}_DEBUG/${REVISION_NB}/${SETTE_CONFIG%${SETTE_STG}}/${TEST_NAME}
else
- export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${config}/${TEST_NAME}
+ export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${SETTE_CONFIG%${SETTE_STD}}/${TEST_NAME}
fi
}
would restore the full suite of the AGRIF_DEMO
SETTE tests.