Changeset 14826 for utils/CI

Timestamp:

2021-05-10T18:02:51+02:00 (3 years ago)

Author:

acc

Message:

Added command-line support for switching on/off tiling, extended halo and icebergs.
These changes only set the shell variables previously set in sette_reference_configurations.sh;
developers will still need to add the relevant logic to those configurations that may wish
to toggle these options. Also added an option for the future to support RK3 timestepping.

Options are now:

sette.sh with no arguments (in this case all configuration will be tested)
-n "CFG1_to_test CFG2_to_test ..." to test some specific configurations
-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)
-T to set ln_timing true for all non-AGRIF configurations
-c to clean each configuration
-q run without qco environment
-Q run with key_qco AND key_RK3
-t activate ln_tile in all tests that support it; also forces nn_hls=2 (default: off)
-e activate extended halo (nn_hls=2) in all tests that support it (default: nn_hls=1)
-i run without icebergs even in tests that support them (default: on)
-s to synchronise the sette MY_SRC and EXP00 with the reference MY_SRC and EXPREF

Location:

utils/CI/sette

Files:

• sette.sh (modified) (3 diffs)
• sette_reference-configurations.sh (modified) (2 diffs)
• sette_test-cases.sh (modified) (1 diff)

utils/CI/sette/sette.sh

@@ -5 +5 @@
 export SETTE_TIMING='no'
 export NOT_USING_QCO='no'
+export USING_RK3='no'
+export USING_ICEBERGS='yes'
+export USING_EXTRA_HALO='no'
+export USING_TILING='no'
 
 # Parse command-line arguments
 if [ $# -gt 0 ]; then
-  while getopts t:x:cshTq option; do 
+  while getopts n:x:cshTqQtei option; do 
      case $option in
         c) export SETTE_CLEAN_CONFIGS='yes'
@@ -19 +23 @@
            echo "MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration"
            echo "";;
-        t) export SETTE_TEST_CONFIGS=($OPTARG)
+        n) export SETTE_TEST_CONFIGS=($OPTARG)
            echo ""
            if [ ${#SETTE_TEST_CONFIGS[@]} -gt 1 ]; then
@@ -37 +41 @@
            echo "key_qco and key_linssh will NOT be activated"
            echo "";;
+   Q) export USING_RK3='no'
+           echo ""
+           echo "key_qco and key_RK3 will be activated"
+           echo "..when they are ready; disabled for now: USING_RK3='no'"
+           echo "";;
+        t) export USING_TILING='yes'
+           echo ""
+           echo "ln_tile will be set to true AND nn_hls will be set to 2"
+           echo "";;
+        e) export USING_EXTRA_HALO='yes'
+           echo ""
+           echo "nn_hls will be set to 2"
+           echo "";;
+        i) export USING_ICEBERGS='no'
+           echo ""
+           echo "ln_icebergs will be set to false"
+           echo "";;
         h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested)'
-               echo '-t "CFG1_to_test CFG2_to_test ..." to test some specific configurations'
+               echo '-n "CFG1_to_test CFG2_to_test ..." to test some specific configurations'
                echo '-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)'
                echo '-T to set ln_timing true for all non-AGRIF configurations'
                echo '-c to clean each configuration'
                echo '-q run without qco environment'
+               echo '-Q run with key_qco AND key_RK3 (currently disabled)'
+               echo '-t activate ln_tile in all tests that support it; also forces nn_hls=2 (default: off)'
+               echo '-e activate extended halo (nn_hls=2) in all tests that support it (default: nn_hls=1)'
+               echo '-i run without icebergs even in tests that support them (default: on)'
                echo '-s to synchronise the sette MY_SRC and EXP00 with the reference MY_SRC and EXPREF'; exit 42 ;;
      esac

utils/CI/sette/sette_reference-configurations.sh

@@ -107 +107 @@
 export INTERACT_FLAG="no"
 export MPIRUN_FLAG="yes"
-export USING_ICEBERGS="yes"
-export USING_EXTRA_HALO="no"
-export USING_TILING="no"
+#
 if [ ${USING_TILING} == "yes" ]
  then
@@ -139 +137 @@
  then
    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh"
+fi
+#
+if [ ${USING_RK3} == "yes" ]
+ then
+   export ADD_KEYS="${ADD_KEYS} key_qco key_RK3"
+else
+   export DEL_KEYS="${DEL_KEYS} key_qco key_RK3"
 fi
 #

utils/CI/sette/sette_test-cases.sh

@@ -131 +131 @@
  then
    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh"
+fi
+#
+if [ ${USING_RK3} == "yes" ]
+ then
+   export ADD_KEYS="${ADD_KEYS} key_qco key_RK3"
 fi
 #