Changeset 14981


Ignore:
Timestamp:
2021-06-11T15:47:19+02:00 (4 months ago)
Author:
acc
Message:

#2673 . Reintegrate sette developments back onto main sette branch. This action closes #2673

Location:
utils/CI/sette
Files:
19 edited
4 copied

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/all_functions.sh

    r13795 r14981  
    9191usage=" if value is a string ths is neede syntax : ./set_namelist namelist_name var_name \"new_value\" " 
    9292 
    93 # sync MYSRC files (input CFG and CFG_ST) 
     93# sync MYSRC files (input CFG and CFG_STg; where g is an optional, single, alphanumeric character) 
    9494sync_config() { 
    9595   if [ ${SYNC_CONFIGS} == "yes" ]; then 
     
    144144} 
    145145 
    146 # clean _ST config (input CFG CFG_ST TYPE (test or ref)) 
     146# clean _STg config (input CFG CFG_STg TYPE (test or ref)) 
    147147clean_config() { 
    148148   if [ ${CLEAN_CONFIGS} == "yes" ]; then 
     
    184184    fi 
    185185    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfgs,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 
    186     NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
     186    # remove last _ST followed by zero or more alphanumeric characters 
     187    NEW_CONF1=$( echo $NEW_CONF | sed -e 's/_ST\([0-9a-zA-Z]*\)$//' ) 
     188    export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF1}/${TEST_NAME} 
    187189} 
    188190 
     
    198200} 
    199201 
    200 # function to set namelists parameters 
     202# set_namelist_opt: function to set namelists parameters based on a yes/no selection 
     203# Mandatory arguments are, in order: 
     204# 1. namelist to be edited 
     205# 2. variable to be set 
     206# 3. yes or no switch setting 
     207# 4. value to set variable to if switch is yes 
     208# 5. value to set variable to if switch is no 
     209set_namelist_opt () { 
     210   minargcount=5 
     211   if [ ${#} -lt ${minargcount} ] 
     212   then 
     213      echo "not enough arguments for set_namelist_opt" >> ${SETTE_DIR}/output.sette 
     214      echo "Usage: set_namelist_opt namelist varname yes_or_no value_if_yes value_if_no" >> ${SETTE_DIR}/output.sette 
     215      exit 1 
     216   fi 
     217   unset minargcount 
     218        if [ $3 != 'yes' ] && [ $3 != 'no' ] ; then 
     219                echo 'option switch must be "yes" or "no"' >> ${SETTE_DIR}/output.sette 
     220                echo "${usage}" >> ${SETTE_DIR}/output.sette 
     221                exit 1 
     222        fi 
     223        if [ $3 == 'yes' ] ; then 
     224                set_namelist $1 $2 $4 
     225        else 
     226                set_namelist $1 $2 $5 
     227        fi 
     228} 
     229         
     230# set_namelist: function to set namelists parameters 
    201231set_namelist () { 
    202232   minargcount=3 
     
    351381    [ -f ${EXE_DIR}/run.stat ] && cp ${EXE_DIR}/*run.stat ${NEMO_VALIDATION_DIR}/. 
    352382    [ -f ${EXE_DIR}/output.namelist.dyn ] && cp ${EXE_DIR}/*output.nam* ${NEMO_VALIDATION_DIR}/. 
     383    [ -f ${EXE_DIR}/namelist_cfg ] && cp ${EXE_DIR}/*nam*_cfg ${NEMO_VALIDATION_DIR}/. 
    353384    [ -f ${EXE_DIR}/tracer.stat ] && cp ${EXE_DIR}/*tracer.stat ${NEMO_VALIDATION_DIR}/. 
    354385    [ -f ${EXE_DIR}/timing.output ] && cp ${EXE_DIR}/*timing.output ${NEMO_VALIDATION_DIR}/. 
     386    [ -f ${EXE_DIR}/sette_config ] && cp ${EXE_DIR}/sette_config ${NEMO_VALIDATION_DIR}/. 
    355387 
    356388    if [ -n "$(ls ${NEMO_VALIDATION_DIR}/*run*)" ] ; then 
     
    448480                exit 1 
    449481        fi 
    450         if [ $2 != "true" ] && [ $2 != "false" ] 
     482        inarg=$2 
     483        if [ ${inarg} == "yes" ] ; then inarg="true" ; fi 
     484        if [ ${inarg} == "no" ]  ; then inarg="false" ; fi 
     485        if [ ${inarg} != "true" ] && [ ${inarg} != "false" ] 
    451486        then 
    452487                echo "unrecognised argument for set_xio_using_server" 
    453488                echo "${usage2}" 
    454                 echo $2 
     489                echo ${inarg} 
    455490                exit 1 
    456491        fi 
     
    474509                exit 1 
    475510        fi 
    476         if [ $2 == "false" ] 
     511        if [ ${inarg} == "false" ] 
    477512        then 
    478513           sed -e "/using_server/s:true:false:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
  • utils/CI/sette/input_AGRIF.cfg

    r13292 r14981  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
    2 AGRIF_DEMO_v4.x.tar.gz AGRIF_DEMO_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
     2AGRIF_DEMO_v4.2_RC.tar.gz AGRIF_DEMO_v4.2_RC 
  • utils/CI/sette/input_AMM12.cfg

    r9579 r14981  
    1 AMM12_v4.0.tar AMM12_v4.0 
     1AMM12_v4.2_RC.tar.gz AMM12_v4.2_RC 
  • utils/CI/sette/input_ICE_AGRIF.cfg

    r13292 r14981  
    1 ICE_AGRIF_v4.x.tar.gz ICE_AGRIF_v4.x 
     1ICE_AGRIF_v4.2_RC.tar.gz ICE_AGRIF_v4.2_RC 
  • utils/CI/sette/input_ISOMIP+.cfg

    r13382 r14981  
    1 ISOMIP+_v4.0.tar ISOMIP+_v4.0 
     1ISOMIP+_v4.2_RC.tar.gz ISOMIP+_v4.2_RC 
  • utils/CI/sette/input_ORCA2_ICE_OBS.cfg

    r13292 r14981  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
  • utils/CI/sette/input_ORCA2_ICE_PISCES.cfg

    r13292 r14981  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
  • utils/CI/sette/input_ORCA2_OFF_PISCES.cfg

    r13292 r14981  
    1 ORCA2_OFF_v4.x.tar.gz ORCA2_OFF_v4.x 
     1ORCA2_OFF_v4.2_RC.tar.gz ORCA2_OFF_v4.2_RC 
  • utils/CI/sette/input_SAS.cfg

    r13292 r14981  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
    2 SAS_v4.x.tar.gz SAS_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
     2SAS_v4.2_RC.tar.gz SAS_v4.2_RC 
  • utils/CI/sette/input_WED025.cfg

    r13382 r14981  
    1 WED025_v4.2.tar WED025_v4.2 
     1WED025_v4.2_RC.tar.gz WED025_v4.2_RC 
  • utils/CI/sette/param.cfg

    r14832 r14981  
    88# ------------------------------------------------------------------------------------------ 
    99# IMPORTANT: 
    10 # variables (COMPILER, USING_XIOS, USING_MPMD, USING_LOOP_FUSION, BATCH_CMD, BATCH_STAT, BATCH_NAME, FORCING_DIR, SVN_CMD, ADD_NOSIGNEDZERO) 
     10# variables (COMPILER, BATCH_CMD, BATCH_STAT, BATCH_NAME, FORCING_DIR, SVN_CMD) 
    1111# can be exported from your shell startup files.  
    1212# If it is the case, nothing to do 
     
    4040# ------------------------------------------------------------------------------------------ 
    4141# 
    42 # RUN set up 
    43 # USING_XIOS        : flag to control the activation of key_xios 
    44 #                      "yes" to compile using key_xios and link to the external XIOS library 
    45 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    46 USING_XIOS=${SETTE_XIOS:-"yes"} 
    47 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    48 #                     requires USING_XIOS="yes" 
    49 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    50 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    51 # MPMD 
    52 USING_MPMD=${SETTE_MPMD:-"no"} 
    53 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    54 #                     "yes" to use the loop fusion adv routines when halo = 2 
    55 #                     "no" to use standard adv routines 
    56 USING_LOOP_FUSION=${SETTE_LOOP_FUSION:-"no"} 
    57 # generique batch scrip prefix name if MPMD set to true/false 
     42# RUN setup 
     43# generic batch scrip prefix name if MPMD set to true/false 
    5844JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch-mpmd} 
    5945JOB_PREFIX_NOMPMD=${SETTE_JOB_PREFIX_NOMPMD:-batch} 
    6046# ------------------------------------------------------------------------------------------ 
    6147# 
    62 # MISCELENIOUS 
     48# MISCELLANEOUS 
    6349# command for svn (some people use git svn)  
    6450# used in sette_rpt and in all_function to display revision and build correct repository name 
    6551SVN_CMD=${SETTE_SVN_CMD:-svn} 
    66 # add key key_nosignedzero at the compilation step 
    67 ADD_NOSIGNEDZERO=${SETTE_ADD_NOSIGNEDZERO:-"yes"} 
    6852# only for IBM 
    6953#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    8367# 
    8468# TYPES OF TESTS TO PERFORM 
    85 export DO_RESTART=1    # The restart test is always needed because this compiles the code 
     69# Note an attempt will be made to compile each configuration even if none of these tests are activated 
     70export DO_RESTART=0   
    8671export DO_REPRO=0 
    8772export DO_CORRUPT=0 
    8873export DO_PHYOPTS=0 
    8974TEST_TYPES=(${SETTE_TEST_TYPES[@]:-"RESTART REPRO PHYOPTS CORRUPT"}) 
    90 if [[ ! ${TEST_TYPES[*]} =~ .*RESTART.* ]]; then export TEST_TYPES=("RESTART" ${TEST_TYPES[@]}) ;fi 
     75if [[ ${TEST_TYPES[*]} =~ .*RESTART.* ]]; then export DO_RESTART=1 ;fi 
    9176if [[ ${TEST_TYPES[*]} =~ .*REPRO.* ]]; then export DO_REPRO=1 ;fi 
    9277if [[ ${TEST_TYPES[*]} =~ .*CORRUPT.* ]]; then export DO_CORRUPT=1 ;fi 
  • utils/CI/sette/prepare_exe_dir.sh

    r11161 r14981  
    7575#cat ${SETTE_DIR}/iodef_sette.xml | sed -e"s;DEF_SHARED;${CONFIG_DIR0}/SHARED;" > ${EXE_DIR}/iodef.xml 
    7676cd ${EXE_DIR} 
     77# 
     78# Add summary of the sette.sh set-up used and the current list of keys added or deleted 
     79COMP_KEYS="`cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | sed -e 's/.*fppkeys *//'`" 
     80echo "Summary of sette environment"                                > ./sette_config 
     81echo "----------------------------"                               >> ./sette_config 
     82echo "requested by the command          : "$cmd $cmdargs          >> ./sette_config 
     83printf "%-33s : %s\n" USING_TIMING $USING_TIMING                  >> ./sette_config 
     84printf "%-33s : %s\n" USING_ICEBERGS $USING_ICEBERGS              >> ./sette_config 
     85printf "%-33s : %s\n" USING_EXTRA_HALO $USING_EXTRA_HALO          >> ./sette_config 
     86printf "%-33s : %s\n" USING_TILING $USING_TILING                  >> ./sette_config 
     87printf "%-33s : %s\n" USING_COLLECTIVES $USING_COLLECTIVES        >> ./sette_config 
     88printf "%-33s : %s\n" USING_QCO $USING_QCO                        >> ./sette_config 
     89printf "%-33s : %s\n" USING_LOOP_FUSION $USING_LOOP_FUSION        >> ./sette_config 
     90printf "%-33s : %s\n" USING_XIOS $USING_XIOS                      >> ./sette_config 
     91printf "%-33s : %s\n" USING_MPMD $USING_MPMD                      >> ./sette_config 
     92printf "%-33s : %s\n" USING_RK3 $USING_RK3                        >> ./sette_config 
     93printf "%-33s : %s\n" "Common compile keys added" "$ADD_KEYS"     >> ./sette_config 
     94printf "%-33s : %s\n" "Common compile keys deleted" "$DEL_KEYS"   >> ./sette_config 
     95printf "%-33s : %s\n" "Compile keys actually used" "${COMP_KEYS}" >> ./sette_config 
    7796 
    7897# Remove previously generated output files used for test evaluation 
  • utils/CI/sette/prepare_job.sh

    r14825 r14981  
    200200            ;; 
    201201         X86_ARCHER2*) 
    202                                 MK_TEMPLATE=$( /work/n01/shared/acc/mkslurm_settejob -S $NXIO_PROC -s 8 -m 4 -C $NB_PROC -g 2 -a n01-CLASS -j sette_job -t 20:00 > ${SETTE_DIR}/job_batch_template ) 
     202                                MK_TEMPLATE=$( /work/n01/shared/acc/mkslurm_settejob_4.2 -S $NXIO_PROC -s 8 -m 4 -C $NB_PROC -g 2 -a n01-CLASS -j sette_job -t 20:00 > ${SETTE_DIR}/job_batch_template ) 
    203203            ;; 
    204204                        XC40_METO*) #Setup for Met Office XC40 with any compiler 
  • utils/CI/sette/sette.sh

    r14826 r14981  
    11#!/bin/sh 
    22# initialise user dependent variable 
     3export cmd=$0 ; export cmdargs=$@ 
    34SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    45MAIN_DIR=$(dirname $SETTE_DIR) 
    5 export SETTE_TIMING='no' 
    6 export NOT_USING_QCO='no' 
    7 export USING_RK3='no' 
    8 export USING_ICEBERGS='yes' 
    9 export USING_EXTRA_HALO='no' 
    10 export USING_TILING='no' 
     6export CMPL_CORES=8            # Number of threads to use for compiling 
     7export SETTE_STG="_ST"         # Base suffix to append to configuration name 
     8dry_run=0 
     9NO_REPORT=0 
     10# 
     11# controls for some common namelist, run-time options: 
     12# 
     13export USING_TIMING='yes'      # Default: yes => set ln_timing=.true.   ; use -T to disable 
     14export USING_ICEBERGS='yes'    # Default: yes => set ln_icebergs=.true. ; use -i to disable 
     15export USING_EXTRA_HALO='yes'  # Default: yes => set nn_hls=2           ; use -e to set nn_hls=1 
     16export USING_COLLECTIVES='yes' # Default: yes => set nn_comm=2          ; use -C to set nn_comm=1 
     17export USING_TILING='yes'      # Default: yes => set ln_tile=.true.     ; use -t to disable 
     18                               #    Note: yes also ensures nn_hls=2 but -t will not alter nn_hls  
     19# 
     20# controls for some common compile-time keys: 
     21# 
     22export USING_QCO='yes'         # Default: yes => add key_qco            ; use -q to delete key_qco 
     23export USING_RK3='no'          # Default: yes => add key_RK3 & key_qco  ; use -Q to delete key_RK3 
     24export USING_LOOP_FUSION='yes' # Default: yes => add key_loop_fusion    ; use -F to delete key_loop_fusion 
     25export USING_XIOS='yes'        # Default: yes => add key_xios           ; use -X to delete key_xios 
     26                               #    Note: changing USING_XIOS may require a change in arch file 
     27# 
     28# controls for some common batch-script, run-time options: 
     29# 
     30export USING_MPMD='yes'        # Default: yes => run with detached XIOS servers ; use -A to run in attached (SPMD) mode 
     31                               #    Note: yes also ensures key_xios but -A will not remove it 
     32export SETTE_SUB_VAL="MAIN"    # Default subdirectory below NEMO_VALIDATION_DIR 
    1133 
    1234# Parse command-line arguments 
    1335if [ $# -gt 0 ]; then 
    14   while getopts n:x:cshTqQtei option; do  
     36  while getopts n:x:v:g:cdrshTqQteiACFX option; do  
    1537     case $option in 
    1638        c) export SETTE_CLEAN_CONFIGS='yes' 
    1739           export SETTE_SYNC_CONFIGS='yes' 
    18            echo "" 
    19            echo "Configuration $SETTE_TEST_CONFIGS will be cleaned; this option enforces also synchronisation" 
     40           echo "-c: Configuration ${SETTE_TEST_CONFIGS[@]} will be cleaned; this option enforces also synchronisation" 
     41           echo "";; 
     42        d) dry_run=1 
     43           echo "";; 
     44        r) NO_REPORT=1 
    2045           echo "";; 
    2146        s) export SETTE_SYNC_CONFIGS='yes' 
    22            echo "" 
    23            echo "MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
    24            echo "";; 
    25         n) export SETTE_TEST_CONFIGS=($OPTARG) 
    26            echo "" 
     47           echo "-s: MY_SRC and EXP00 in ${SETTE_TEST_CONFIGS[@]} will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
     48           echo "";; 
     49        n) OPTSTR="$OPTARG" 
     50           OPTSTR="${OPTSTR/ORCA2_SAS_ICE/SAS}"              # Permit either shortened (expected) or full name for SAS 
     51           OPTSTR="${OPTSTR/AGRIF_DEMO/AGRIF}"               # Permit either shortened (expected) or full name for AGRIF 
     52           export SETTE_TEST_CONFIGS=(${OPTSTR}) 
     53           echo "==================================" 
    2754           if [ ${#SETTE_TEST_CONFIGS[@]} -gt 1 ]; then 
    28              echo "Configurations ${SETTE_TEST_CONFIGS[@]} will be tested if they are available" 
     55             echo "-n: Configurations ${SETTE_TEST_CONFIGS[@]} will be tested if they are available" 
    2956           else 
    30              echo "Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
     57             echo "-n: Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
    3158           fi 
    32            echo "" ;; 
    33         x) export SETTE_TEST_TYPES=($OPTARG) 
    34            ;; 
    35         T) export SETTE_TIMING='yes' 
    36            echo "" 
    37            echo "ln_timing will be set to true" 
    38            echo "";; 
    39    q) export NOT_USING_QCO='yes' 
    40            echo "" 
    41            echo "key_qco and key_linssh will NOT be activated" 
    42            echo "";; 
    43    Q) export USING_RK3='no' 
    44            echo "" 
    45            echo "key_qco and key_RK3 will be activated" 
    46            echo "..when they are ready; disabled for now: USING_RK3='no'" 
    47            echo "";; 
    48         t) export USING_TILING='yes' 
    49            echo "" 
    50            echo "ln_tile will be set to true AND nn_hls will be set to 2" 
    51            echo "";; 
    52         e) export USING_EXTRA_HALO='yes' 
    53            echo "" 
    54            echo "nn_hls will be set to 2" 
     59           echo "";; 
     60        g) case $OPTARG in 
     61             [0-9,a-z,A-Z] ) echo "-g: Using ${SETTE_STG}${OPTARG} as the configuration suffix";; 
     62             * ) echo "-g only accepts a single, alphanumeric character. Processing halted"; exit 42;; 
     63           esac 
     64           export SETTE_STG=${SETTE_STG}${OPTARG} 
     65           echo "";; 
     66        x) export SETTE_TEST_TYPES=(${OPTARG}) 
     67           echo "-x: ${SETTE_TEST_TYPES[@]} tests requested" 
     68           echo "";; 
     69        v) export SETTE_SUB_VAL=($OPTARG) 
     70           echo "-v: $SETTE_SUB_VAL validation sub-directory requested" 
     71           echo "";; 
     72        T) export USING_TIMING='no' 
     73           echo "-T: ln_timing will be set to false" 
     74           echo "";; 
     75        t) export USING_TILING='no' 
     76           echo "-t: ln_tile will be set to false" 
     77           echo "";; 
     78        e) export USING_EXTRA_HALO='no' 
     79           echo "-e: nn_hls will be set to 1" 
    5580           echo "";; 
    5681        i) export USING_ICEBERGS='no' 
    57            echo "" 
    58            echo "ln_icebergs will be set to false" 
    59            echo "";; 
    60         h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested)' 
     82           echo "-i: ln_icebergs will be set to false" 
     83           echo "";; 
     84        C) export USING_COLLECTIVES='no' 
     85           echo "-C: nn_comm will be set to 1" 
     86           echo "";; 
     87        q) export USING_QCO='no' 
     88           echo "-q: key_qco and key_linssh will NOT be activated" 
     89           echo "";; 
     90        Q) export USING_RK3='no' 
     91           echo "-Q: key_qco and key_RK3 will not be activated" 
     92           echo "    This is the curent default for now since RK3 is not ready" 
     93           echo "";; 
     94        F) export USING_LOOP_FUSION='no' 
     95           echo "-F: key_loop_fusion will not be activated" 
     96           echo "";; 
     97        X) export USING_XIOS='no' 
     98           echo "-X: key_xios will not be activated" 
     99           echo "";; 
     100        A) export USING_MPMD='no' 
     101           echo "-A: Tasks will be run in attached (SPMD) mode" 
     102           echo "";; 
     103        h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested with default options)' 
     104               echo '-T to set ln_timing false for all non-AGRIF configurations (default: true)' 
     105               echo '-t set ln_tile false in all tests that support it (default: true)' 
     106               echo '-e set nn_hls=1 (default: nn_hls=2)' 
     107               echo '-i set ln_icebergs false (default: true)' 
     108               echo '-C set nn_comm=1 (default: nn_comm=2 ==> use MPI3 collective comms)' 
     109               echo '-q to remove the key_qco key (default: added)' 
     110               echo '-X to remove the key_xios key (default: added)' 
     111               echo '-F to remove the key_loop_fusion key (default: added)' 
     112               echo '-Q to remove the key_RK3 key (currently a null-op since key_RK3 is not used)' 
     113               echo '-A to run tests in attached (SPMD) mode (default: MPMD with key_xios)' 
    61114               echo '-n "CFG1_to_test CFG2_to_test ..." to test some specific configurations' 
    62                echo '-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)' 
    63                echo '-T to set ln_timing true for all non-AGRIF configurations' 
     115               echo '-x "TEST_type TEST_type ..." to specify particular type(s) of test(s) to run after compilation' 
     116               echo '              TEST_type choices are: RESTART REPRO CORRUPT PHYSICS - anything else will COMPILE only' 
     117               echo '-v "subdir" optional validation record subdirectory to be created below NEMO_VALIDATION_DIR' 
     118               echo '-g "group_suffix" single character suffix to be appended to the standard _ST suffix used' 
     119               echo '                  for SETTE-built configurations (needed if sette.sh invocations may overlap)' 
     120               echo '-r to execute without waiting to run sette_rpt.sh at the end (useful for chaining sette.sh invocations)' 
     121               echo '-d to perform a dryrun to simply report what settings will be used' 
    64122               echo '-c to clean each configuration' 
    65                echo '-q run without qco environment' 
    66                echo '-Q run with key_qco AND key_RK3 (currently disabled)' 
    67                echo '-t activate ln_tile in all tests that support it; also forces nn_hls=2 (default: off)' 
    68                echo '-e activate extended halo (nn_hls=2) in all tests that support it (default: nn_hls=1)' 
    69                echo '-i run without icebergs even in tests that support them (default: on)' 
    70123               echo '-s to synchronise the sette MY_SRC and EXP00 with the reference MY_SRC and EXPREF'; exit 42 ;; 
    71124     esac 
     
    73126  shift $((OPTIND - 1)) 
    74127fi 
    75  
     128# 
     129# Option dependency tests 
     130# 
     131if [ ${USING_TILING} == "yes" ] ; then  
     132 if [ ${USING_EXTRA_HALO} == "no" ] ; then 
     133  while true; do 
     134      read -p "Tiling requires the extra halo but you have used -e to deselect it. Would you like to reselect it? (y/n)?: " yn 
     135      case $yn in 
     136          [Yy]* ) echo "Ok, ignoring the -e option"; USING_EXTRA_HALO="yes"; break;; 
     137          [Nn]* ) echo "Ok, exiting instead"; exit 42;; 
     138          * ) echo "Please answer yes or no.";; 
     139      esac 
     140  done 
     141 fi 
     142fi 
     143if [ ${USING_LOOP_FUSION} == "yes" ] ; then  
     144 if [ ${USING_EXTRA_HALO} == "no" ] ; then 
     145  while true; do 
     146      read -p "Loop fusion requires the extra halo but you have used -e to deselect it. Would you like to reselect it? (y/n)?: " yn 
     147      case $yn in 
     148          [Yy]* ) echo "Ok, ignoring the -e option"; USING_EXTRA_HALO="yes"; break;; 
     149          [Nn]* ) echo "Ok, exiting instead"; exit 42;; 
     150          * ) echo "Please answer yes or no.";; 
     151      esac 
     152  done 
     153 fi 
     154fi 
     155# 
     156# Get SETTE parameters 
    76157. ./param.cfg 
    77158 
     159# 
     160# Set the common compile keys to add or delete based on command-line arguments: 
     161# 
     162export ADD_KEYS="" ; export DEL_KEYS="" 
     163if [ ${USING_XIOS} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_xios " ; fi 
     164if [ ${USING_XIOS} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_xios " ; fi 
     165# 
     166if [ ${USING_LOOP_FUSION} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_loop_fusion " ; fi 
     167if [ ${USING_LOOP_FUSION} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_loop_fusion " ; fi 
     168# 
     169if [ ${USING_QCO} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_qco " ; fi 
     170if [ ${USING_QCO} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_qco key_linssh " ; fi 
     171# 
     172if [ ${USING_RK3} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_qco key_RK3 " ; fi 
     173if [ ${USING_RK3} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_RK3 " ; fi 
     174 
     175# 
     176# Set validation record sub-directories (if required) 
     177# 
     178if [ ! -d $NEMO_VALIDATION_DIR ] ; then 
     179 if [ ${dry_run} -eq 0 ] ; then 
     180  while true; do 
     181      read -p "$NEMO_VALIDATION_DIR does not exist. Do you wish to create it? " yn 
     182      case $yn in 
     183          [Yy]* ) echo "Ok, creating $NEMO_VALIDATION_DIR"; mkdir $NEMO_VALIDATION_DIR; break;; 
     184          [Nn]* ) echo "Ok, exiting instead"; exit 42;; 
     185          * ) echo "Please answer yes or no.";; 
     186      esac 
     187  done 
     188 else 
     189  echo "$NEMO_VALIDATION_DIR does not exist" 
     190  echo "but this is a dry run so it will not be created" 
     191 fi 
     192fi 
     193if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] && [ ${dry_run} -eq 0 ] ; then 
     194   mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     195fi 
     196export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     197 
    78198if [ ${#SETTE_TEST_CONFIGS[@]} -eq 0 ]; then 
    79    echo "" 
     199   echo "==================================" 
    80200   echo "Configurations $TEST_CONFIGS will be tested if they are available" 
    81    echo "" 
    82 fi 
    83 echo "" 
    84 echo "Carrying out the following tests: ${TEST_TYPES[@]}" 
    85 echo "" 
     201fi 
     202echo "Carrying out the following tests  : ${TEST_TYPES[@]}" 
     203echo "requested by the command          : "$cmd $cmdargs 
     204printf "%-33s : %s\n" USING_TIMING $USING_TIMING 
     205printf "%-33s : %s\n" USING_ICEBERGS $USING_ICEBERGS 
     206printf "%-33s : %s\n" USING_EXTRA_HALO $USING_EXTRA_HALO 
     207printf "%-33s : %s\n" USING_TILING $USING_TILING 
     208printf "%-33s : %s\n" USING_COLLECTIVES $USING_COLLECTIVES 
     209printf "%-33s : %s\n" USING_QCO $USING_QCO 
     210printf "%-33s : %s\n" USING_LOOP_FUSION $USING_LOOP_FUSION 
     211printf "%-33s : %s\n" USING_XIOS $USING_XIOS 
     212printf "%-33s : %s\n" USING_MPMD $USING_MPMD 
     213printf "%-33s : %s\n" USING_RK3 $USING_RK3 
     214printf "%-33s : %s\n" "Common compile keys to be added" "$ADD_KEYS" 
     215printf "%-33s : %s\n" "Common compile keys to be deleted" "$DEL_KEYS" 
     216echo "Validation records to appear under: "$NEMO_VALIDATION_DIR 
     217echo "==================================" 
     218echo "" 
     219# 
     220# Option compatibility tests 
     221# 
     222if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] ; then echo "Incompatible choices. MPMD mode requires the XIOS server" ; exit ; fi 
     223 
     224if [ ${dry_run} -eq 1 ] ; then echo "dryrun only: no tests performed" ; exit ; fi 
    86225 
    87226# run sette on reference configuration 
     
    107246fi 
    108247 
     248if [ ${NO_REPORT} -ne 0 ] ; then exit ; fi 
    109249# run sette report 
    110250echo "" 
  • utils/CI/sette/sette_list_avail_cfg.sh

    r13382 r14981  
    1616printf "%-15s \n" VORTEX 
    1717printf "%-15s \n" ICE_AGRIF 
     18printf "%-15s \n" SWG 
    1819printf "%-15s \n" ISOMIP+ 
    1920echo '' 
  • utils/CI/sette/sette_list_avail_rev.sh

    r12569 r14981  
    44SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    55MAIN_DIR=$(dirname $SETTE_DIR) 
     6USE_REF=0 
    67 
    78. ./param.cfg 
    89 
    910if [ $# -gt 0 ]; then 
    10   while getopts c:h option; do  
     11  while getopts c:v:Rh option; do  
    1112     case $option in 
    1213        c) COMPILER=$OPTARG;; 
     14        v) SETTE_SUB_VAL=$OPTARG;; 
     15        R) USE_REF=1;; 
    1316        h | *) echo '' 
    1417               echo 'sette_list_avail_rev.sh : '  
     
    1619               echo '-c COMPILER_name :' 
    1720               echo '     list all sette directory and available revisions created with the compiler specified' 
     21               echo ' -v sub_dir :' 
     22               echo '     validation sub-directory below NEMO_VALIDATION_DIR' 
    1823               echo '' 
    1924               exit 42;; 
     
    2227  shift $((OPTIND - 1)) 
    2328fi 
     29if [ ! -z $SETTE_SUB_VAL ] ; then 
     30 NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     31 NEMO_VALIDATION_REF=$NEMO_VALIDATION_REF/$SETTE_SUB_VAL 
     32else 
     33 NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/MAIN 
     34 NEMO_VALIDATION_REF=$NEMO_VALIDATION_REF/MAIN 
     35fi 
    2436 
    2537# 
    2638lst_rev () { 
    2739    # get the list of revision available for a configuration 
    28     if [ ! -d $1 ] ; then  
    29        CFGLST=-9999 
    30     else 
    31        CFGLST=`ls $1 | sort -u -r `  
    32     fi 
     40    # base directory 
     41    VALSUB=$1 
    3342    # config name 
    3443    CONFIG=$2 
    3544    # list of all revision available 
    3645    ALLLST=${@:3} 
    37     # number of revision total and for CONFIG 
    38     nrevall=`echo $ALLLST | wc -w` 
    39     nrevcfg=`echo $CFGLST | wc -w` 
    4046    # display 
    41     echo "" 
    42     printf "%-27s : " $CONFIG 
    43     irev=1 
    44     irevcfg=1 
    45     while [[ $irev -le $nrevall ]] ; do 
    46        rev=`echo $ALLLST | cut -d\  -f ${irev}` 
    47        cfgrev=`echo $CFGLST | cut -d\  -f ${irevcfg}` 
    48        if [ -z $cfgrev ] ; then cfgrev=-9999 ; fi 
    49        if [ $cfgrev == $rev ] ; then 
     47    printf "\n %-28s : " $CONFIG 
     48    for rev in $ALLLST 
     49    do 
     50       if [ -d ${VALSUB}/$rev/${CONFIG} ]  ; then 
    5051          printf "%-6s  " $rev 
    51           irevcfg=$((irevcfg+1)) 
    5252       else 
    53           printf "%-5s  " "***** "  
     53          printf "%-5s  " "----- "  
    5454       fi 
    55        irev=$((irev+1)) 
    5655    done 
    5756} 
     
    5958 
    6059  NEMO_VALID=${NEMO_VALIDATION_DIR}/ 
     60  if [ ${USE_REF} == 1 ] ; then  
     61    NEMO_VALID=${NEMO_VALIDATION_REF}/ 
     62  fi 
    6163  
    6264 # list of all revision available 
    63  DIRLST=`find ${NEMO_VALID} -maxdepth 3 -mindepth 3 -type d -regex ".*\/W.*\/${COMPILER}\/.*" | sed -e "s/.*\/W.*\/${COMPILER}\///" | sort -u -r` 
     65 DIRLIST=`find ${NEMO_VALID}/${COMPILER} -maxdepth 1 -mindepth 1 -type d | sort -u` 
     66 DIRLIST=`basename -a $DIRLIST` 
    6467 
    6568 # display header 
     
    6770 echo " Compiler used is : $COMPILER" 
    6871 echo "" 
    69  printf " List of all avail. rev. is : " 
    70  for dir in `echo $DIRLST`; do printf "%-6s  " $dir ; done 
     72 printf " List of all avail. rev. in   :"${NEMO_VALID}"\n" 
     73 printf "                         is   : " 
     74 for dir in `echo $DIRLIST`; do printf "%-6s  " $dir ; done 
    7175 printf "\n" 
    7276 
    7377 # start checking configuration revision 
    74  echo "" 
    75  echo "   !---- check revision available for each configuration ----!   " 
    76  for CONFIG in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WICE_AGRIF_ST  
     78 echo " Availability for each config.: " 
     79 echo -n " ------------------------------" 
     80 for CONFIG in GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE AGRIF_DEMO SWG ISOMIP+ OVERFLOW LOCK_EXCHANGE VORTEX ICE_AGRIF  
    7781 do 
    78     DIR=${NEMO_VALIDATION_DIR}/${CONFIG}/${COMPILER} 
    79     lst_rev $DIR $CONFIG $DIRLST 
     82    DIR=${NEMO_VALID}/${COMPILER}/ 
     83    lst_rev $DIR $CONFIG $DIRLIST 
    8084 done 
    8185 printf "\n" 
  • utils/CI/sette/sette_reference-configurations.sh

    r14830 r14981  
    2929# MPIRUN_FLAG       : flag to run in parallel (MPI) "yes" 
    3030#                           to run in sequential mode (NB_PROC = 1) "no" 
    31 # USING_XIOS        : flag to control the activation of key_xios 
    32 #                      "yes" to compile using key_xios and link to the external XIOS library 
    33 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    34 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    35 #                     requires USING_XIOS="yes" 
    36 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    37 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    38 # SETTE_TIMING      : flag to control the production of timing.output 
    39 #                     requires SETTE_TIMING="yes" 
    4031 
    4132# NUM_XIOSERVERS    : number of stand-alone IO servers to employ 
    4233#                     set to zero if USING_MPMD="no" 
    43 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    44 #                     "yes" to use the loop fusion adv routines when halo = 2 
    45 #                     "no" to use standard adv routines 
    4634# 
    4735# Principal script is sette.sh, that calls  
     
    10896export MPIRUN_FLAG="yes" 
    10997# 
    110 if [ ${USING_TILING} == "yes" ] 
    111  then 
    112    export USING_EXTRA_HALO="yes" 
    113 fi 
    114 # 
    115 export ADD_KEYS="" 
    116 export DEL_KEYS="" 
    117 if [ ${USING_XIOS} == "yes" ]  
    118  then  
    119    export ADD_KEYS="${ADD_KEYS} key_xios" 
    120  else 
    121    export DEL_KEYS="${DEL_KEYS} key_xios" 
    122 fi 
    123 # 
    124 if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
    125  then 
    126    export ADD_KEYS="${ADD_KEYS} key_nosignedzero" 
    127  else 
    128    export DEL_KEYS="${DEL_KEYS} key_nosignedzero"  
    129 fi 
    130 # 
    131 if [ ${USING_LOOP_FUSION} == "yes" ] 
    132  then 
    133    export ADD_KEYS="${ADD_KEYS} key_loop_fusion" 
    134 fi 
    135 # 
    136 if [ ${NOT_USING_QCO} == "yes" ] 
    137  then 
    138    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh" 
    139 fi 
    140 # 
    141 if [ ${USING_RK3} == "yes" ] 
    142  then 
    143    export ADD_KEYS="${ADD_KEYS} key_qco key_RK3" 
    144 else 
    145    export DEL_KEYS="${DEL_KEYS} key_RK3" 
    146 fi 
    147 # 
    14898# Settings which control the use of stand alone servers (only relevant if using xios) 
    14999# 
     
    157107fi 
    158108# 
    159 # 
    160 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    161  then 
    162    echo "Incompatible choices. MPMD mode requires the XIOS server" 
    163    exit 
    164 fi 
    165109 
    166110# Directory to run the tests 
     
    177121# ORCA2_OFF_PISCES  : 
    178122# AMM12             : 
    179 # SAS               : 
     123# SAS               : aka ORCA2_SAS_ICE 
    180124# ORCA2_ICE_OBS     : 
    181 # AGRIF             : test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific (AGRIF_DEMO) 
    182 #                       and check that key_agrif without zoom = no key_agrif 
    183 # WED025           : regional configuration including sea-ice and tides (Spitzbergen) 
    184  
     125# AGRIF             : AGRIF_DEMO: test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific and 
     126#                     AGRIF_DEMO_NOAGRIF: check that key_agrif without zoom = no key_agrif 
     127# WED025            : regional configuration including sea-ice and tides (Spitzbergen) 
     128 
     129. ./all_functions.sh 
    185130for config in ${TEST_CONFIGS[@]} 
    186131do 
     
    189134# GYRE_PISCES 
    190135# ----------- 
    191 if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    192 ## Restartability tests for GYRE_PISCES 
     136if [ ${config} == "GYRE_PISCES" ] ;  then 
     137    SETTE_CONFIG="GYRE_PISCES"${SETTE_STG} 
    193138    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    194139    then 
     
    198143    fi 
    199144    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     145    cd ${MAIN_DIR} 
     146    # 
     147    # syncronisation if target directory/file exist (not done by makenemo) 
     148    sync_config  GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 
     149    clean_config GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 
     150    # 
     151    # GYRE uses linssh so remove key_qco if added by default 
     152    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     153fi 
     154if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     155## Restartability tests for GYRE_PISCES 
    200156    export TEST_NAME="LONG" 
    201     cd ${MAIN_DIR} 
    202     # 
    203     # syncronisation if target directory/file exist (not done by makenemo) 
    204     . ${SETTE_DIR}/all_functions.sh 
    205     sync_config  GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
    206     clean_config GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
    207     # 
    208     . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    209     cd ${SETTE_DIR} 
    210     . ./param.cfg 
    211     . ./all_functions.sh 
     157    cd ${SETTE_DIR} 
    212158    . ./prepare_exe_dir.sh 
    213159    set_valid_dir 
     
    226172    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    227173    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    228     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    229     if [ ${USING_MPMD} == "yes" ] ; then 
    230        set_xio_using_server iodef.xml true 
    231     else 
    232        set_xio_using_server iodef.xml false 
    233     fi 
     174    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     175    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     176    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     177    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     178    set_xio_using_server iodef.xml ${USING_MPMD} 
    234179    cd ${SETTE_DIR} 
    235180    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    256201    set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_${ITRST}_restart\" 
    257202    set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_${ITRST}_restart_trc\" 
    258     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    259     if [ ${USING_MPMD} == "yes" ] ; then 
    260        set_xio_using_server iodef.xml true 
    261     else 
    262        set_xio_using_server iodef.xml false 
    263     fi 
     203    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     204    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     205    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     206    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     207    set_xio_using_server iodef.xml ${USING_MPMD} 
    264208    for (( i=1; i<=$NPROC; i++)) ; do 
    265209        L_NPROC=$(( $i - 1 )) 
     
    280224    cd ${MAIN_DIR} 
    281225    cd ${SETTE_DIR} 
    282     . ./param.cfg 
    283     . ./all_functions.sh 
    284226    . ./prepare_exe_dir.sh 
    285227    set_valid_dir 
     
    297239    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    298240    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    299     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    300     if [ ${USING_MPMD} == "yes" ] ; then 
    301        set_xio_using_server iodef.xml true 
    302     else 
    303        set_xio_using_server iodef.xml false 
    304     fi 
     241    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     242    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     243    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     244    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     245    set_xio_using_server iodef.xml ${USING_MPMD} 
    305246    cd ${SETTE_DIR} 
    306247    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    325266    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    326267    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    327     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    328     if [ ${USING_MPMD} == "yes" ] ; then 
    329        set_xio_using_server iodef.xml true 
    330     else 
    331        set_xio_using_server iodef.xml false 
    332     fi 
     268    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     269    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     270    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     271    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     272    set_xio_using_server iodef.xml ${USING_MPMD} 
    333273    cd ${SETTE_DIR} 
    334274    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    341281# ORCA2_ICE_PISCES 
    342282# ----------------- 
    343 if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    344 ## Restartability tests for ORCA2_ICE_PISCES 
     283if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
     284    SETTE_CONFIG="ORCA2_ICE_PISCES"${SETTE_STG} 
    345285    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    346286    then 
     
    350290    fi 
    351291    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     292    cd ${MAIN_DIR} 
     293    # 
     294    # syncronisation if target directory/file exist (not done by makenemo) 
     295    sync_config  ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     296    clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     297    # 
     298    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     299fi 
     300if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     301## Restartability tests for ORCA2_ICE_PISCES 
    352302    export TEST_NAME="LONG" 
    353     cd ${MAIN_DIR} 
    354     # 
    355     # syncronisation if target directory/file exist (not done by makenemo) 
    356     . ${SETTE_DIR}/all_functions.sh 
    357     sync_config  ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    358     clean_config ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    359     # 
    360     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    361     cd ${SETTE_DIR} 
    362     . ./param.cfg 
    363     . ./all_functions.sh 
     303    cd ${SETTE_DIR} 
    364304    . ./prepare_exe_dir.sh 
    365305    set_valid_dir 
     
    383323    set_namelist namelist_cfg ln_stcor .true. 
    384324    # 
    385     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    386     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    387     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    388     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    389     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    390     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     325    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     326    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     327    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     328    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    391329    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    392330    # 
     
    402340    # put ln_pisdmp to false : no restoring to global mean value 
    403341    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    404     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    405     if [ ${USING_MPMD} == "yes" ] ; then 
    406        set_xio_using_server iodef.xml true 
    407     else 
    408        set_xio_using_server iodef.xml false 
    409     fi 
     342    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     343    set_xio_using_server iodef.xml ${USING_MPMD} 
    410344    cd ${SETTE_DIR} 
    411345    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    433367    set_namelist namelist_cfg ln_stcor .true. 
    434368    # 
    435     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    436     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    437     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    438     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    439     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    440     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     369    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     370    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     371    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     372    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    441373    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    442374    # 
     
    468400        fi 
    469401    done 
    470     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    471     if [ ${USING_MPMD} == "yes" ] ; then 
    472        set_xio_using_server iodef.xml true 
    473     else 
    474        set_xio_using_server iodef.xml false 
    475     fi 
     402    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     403    set_xio_using_server iodef.xml ${USING_MPMD} 
    476404    cd ${SETTE_DIR} 
    477405    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    486414    cd ${MAIN_DIR} 
    487415    cd ${SETTE_DIR} 
    488     . ./param.cfg 
    489     . ./all_functions.sh 
    490416    . ./prepare_exe_dir.sh 
    491417    set_valid_dir 
     
    507433    set_namelist namelist_cfg ln_stcor .true. 
    508434 
    509     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    510     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    511     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    512     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    513     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    514     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     435    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     436    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     437    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     438    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    515439    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    516440 
     
    525449    # put ln_pisdmp to false : no restoring to global mean value 
    526450    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    527     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    528     if [ ${USING_MPMD} == "yes" ] ; then 
    529        set_xio_using_server iodef.xml true 
    530     else 
    531        set_xio_using_server iodef.xml false 
    532     fi 
     451    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     452    set_xio_using_server iodef.xml ${USING_MPMD} 
    533453    cd ${SETTE_DIR} 
    534454    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    557477    set_namelist namelist_cfg ln_stcor .true. 
    558478 
    559     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    560     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    561     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    562     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    563     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    564     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     479    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     480    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     481    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     482    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    565483    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    566484 
     
    575493    # put ln_pisdmp to false : no restoring to global mean value 
    576494    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    577     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    578     if [ ${USING_MPMD} == "yes" ] ; then 
    579        set_xio_using_server iodef.xml true 
    580     else 
    581        set_xio_using_server iodef.xml false 
    582     fi 
     495    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     496    set_xio_using_server iodef.xml ${USING_MPMD} 
    583497    cd ${SETTE_DIR} 
    584498    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    590504# ORCA2_OFF_PISCES 
    591505# ---------------- 
    592 if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    593 ## Restartability tests for ORCA2_OFF_PISCES 
     506if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
     507    SETTE_CONFIG="ORCA2_OFF_PISCES"${SETTE_STG} 
    594508    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    595509    then 
     
    599513    fi 
    600514    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     515    cd ${MAIN_DIR} 
     516    # 
     517    # syncronisation if target directory/file exist (not done by makenemo) 
     518    sync_config  ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 
     519    clean_config ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 
     520    # 
     521    # ORCA2_OFF_PISCES uses linssh so remove key_qco if added by default 
     522    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_OFF_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     523fi 
     524if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     525## Restartability tests for ORCA2_OFF_PISCES 
    601526    export TEST_NAME="LONG" 
    602     cd ${MAIN_DIR} 
    603     # 
    604     # syncronisation if target directory/file exist (not done by makenemo) 
    605     . ${SETTE_DIR}/all_functions.sh 
    606     sync_config  ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
    607     clean_config ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
    608     # 
    609     . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST -r ORCA2_OFF_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    610     cd ${SETTE_DIR} 
    611     . ./param.cfg 
    612     . ./all_functions.sh 
     527    cd ${SETTE_DIR} 
    613528    . ./prepare_exe_dir.sh 
    614529    set_valid_dir 
     
    637552    # put ln_pisdmp to false : no restoring to global mean value 
    638553    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    639     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    640     if [ ${USING_MPMD} == "yes" ] ; then 
    641        set_xio_using_server iodef.xml true 
    642     else 
    643        set_xio_using_server iodef.xml false 
    644     fi 
     554    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     555    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     556    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     557    set_xio_using_server iodef.xml ${USING_MPMD} 
    645558    cd ${SETTE_DIR} 
    646559    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    678591    # put ln_pisdmp to false : no restoring to global mean value 
    679592    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    680     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    681     if [ ${USING_MPMD} == "yes" ] ; then 
    682        set_xio_using_server iodef.xml true 
    683     else 
    684        set_xio_using_server iodef.xml false 
    685     fi 
     593    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     594    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     595    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     596    set_xio_using_server iodef.xml ${USING_MPMD} 
    686597    cd ${SETTE_DIR} 
    687598    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME}  ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    696607    cd ${MAIN_DIR} 
    697608    cd ${SETTE_DIR} 
    698     . ./param.cfg 
    699     . ./all_functions.sh 
    700609    . ./prepare_exe_dir.sh 
    701610    set_valid_dir 
     
    723632    # put ln_pisdmp to false : no restoring to global mean value 
    724633    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    725     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    726     if [ ${USING_MPMD} == "yes" ] ; then 
    727        set_xio_using_server iodef.xml true 
    728     else 
    729        set_xio_using_server iodef.xml false 
    730     fi 
     634    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     635    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     636    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     637    set_xio_using_server iodef.xml ${USING_MPMD} 
    731638    cd ${SETTE_DIR} 
    732639    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    761668    # put ln_pisdmp to false : no restoring to global mean value 
    762669    set_namelist namelist_pisces_cfg ln_pisdmp .false.  
    763     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    764     if [ ${USING_MPMD} == "yes" ] ; then 
    765        set_xio_using_server iodef.xml true 
    766     else 
    767        set_xio_using_server iodef.xml false 
    768     fi 
     670    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     671    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     672    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     673    set_xio_using_server iodef.xml ${USING_MPMD} 
    769674    cd ${SETTE_DIR} 
    770675    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    776681# AMM12 
    777682# ----- 
    778 if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
    779     ## Restartability tests for AMM12 
     683if [ ${config} == "AMM12" ] ;  then 
     684    SETTE_CONFIG="AMM12"${SETTE_STG} 
    780685    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    781686    then 
     
    785690    fi 
    786691    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     692    cd ${MAIN_DIR} 
     693    # 
     694    # syncronisation if target directory/file exist (not done by makenemo) 
     695    sync_config  AMM12 ${SETTE_CONFIG} 'cfgs' 
     696    clean_config AMM12 ${SETTE_CONFIG} 'cfgs' 
     697    # 
     698    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     699fi 
     700if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
     701    ## Restartability tests for AMM12 
    787702    export TEST_NAME="LONG" 
    788     cd ${MAIN_DIR} 
    789     # 
    790     # syncronisation if target directory/file exist (not done by makenemo) 
    791     . ${SETTE_DIR}/all_functions.sh 
    792     sync_config  AMM12 AMM12_ST 'cfgs' 
    793     clean_config AMM12 AMM12_ST 'cfgs' 
    794     # 
    795     . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    796     cd ${SETTE_DIR} 
    797     . ./param.cfg 
    798     . ./all_functions.sh 
     703    cd ${SETTE_DIR} 
    799704    . ./prepare_exe_dir.sh 
    800705    set_valid_dir 
     
    811716    set_namelist namelist_cfg jpnj 8 
    812717    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    813     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    814     if [ ${USING_MPMD} == "yes" ] ; then 
    815        set_xio_using_server iodef.xml true 
    816     else 
    817        set_xio_using_server iodef.xml false 
    818     fi 
     718    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     719    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     720    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     721    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     722    set_xio_using_server iodef.xml ${USING_MPMD} 
    819723    cd ${SETTE_DIR} 
    820724    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    842746        ln -sf ../LONG/AMM12_LONG_${ITRST}_restart_${L_NPROC}.nc . 
    843747    done 
    844     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    845     if [ ${USING_MPMD} == "yes" ] ; then 
    846        set_xio_using_server iodef.xml true 
    847     else 
    848        set_xio_using_server iodef.xml false 
    849     fi 
     748    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     749    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     750    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     751    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     752    set_xio_using_server iodef.xml ${USING_MPMD} 
    850753    cd ${SETTE_DIR} 
    851754    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    860763    cd ${MAIN_DIR} 
    861764    cd ${SETTE_DIR} 
    862     . ./param.cfg 
    863     . ./all_functions.sh 
    864765    . ./prepare_exe_dir.sh 
    865766    set_valid_dir 
     
    875776    set_namelist namelist_cfg jpnj 4 
    876777    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    877     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    878     if [ ${USING_MPMD} == "yes" ] ; then 
    879        set_xio_using_server iodef.xml true 
    880     else 
    881        set_xio_using_server iodef.xml false 
    882     fi 
     778    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     779    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     780    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     781    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     782    set_xio_using_server iodef.xml ${USING_MPMD} 
    883783    cd ${SETTE_DIR} 
    884784    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    900800    set_namelist namelist_cfg jpnj 8 
    901801    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    902     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    903     if [ ${USING_MPMD} == "yes" ] ; then 
    904        set_xio_using_server iodef.xml true 
    905     else 
    906        set_xio_using_server iodef.xml false 
    907     fi 
     802    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     803    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     804    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     805    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     806    set_xio_using_server iodef.xml ${USING_MPMD} 
    908807    cd ${SETTE_DIR} 
    909808    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    914813 
    915814# --------- 
    916 # ORCA2_SAS 
     815# ORCA2_SAS_ICE 
    917816# --------- 
    918 if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
    919 ## Restartability tests 
     817if [ ${config} == "SAS" ] ;  then 
     818    SETTE_CONFIG="ORCA2_SAS_ICE"${SETTE_STG} 
    920819    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    921820    then 
     
    925824    fi 
    926825    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     826    cd ${MAIN_DIR} 
     827    # 
     828    # syncronisation if target directory/file exist (not done by makenemo) 
     829    sync_config  ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 
     830    clean_config ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 
     831    # 
     832    # ORCA2_SAS_ICE uses linssh so remove key_qco if added by default 
     833    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_SAS_ICE -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     834fi 
     835if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     836## Restartability tests 
    927837    export TEST_NAME="LONG" 
    928     cd ${MAIN_DIR} 
    929     # 
    930     # syncronisation if target directory/file exist (not done by makenemo) 
    931     . ${SETTE_DIR}/all_functions.sh 
    932     sync_config  ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
    933     clean_config ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
    934     # 
    935     . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    936     cd ${SETTE_DIR} 
    937     . ./param.cfg 
    938     . ./all_functions.sh 
     838    cd ${SETTE_DIR} 
    939839    . ./prepare_exe_dir.sh 
    940840    set_valid_dir 
     
    952852    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    953853    set_namelist namelist_ice_cfg ln_icediachk .true. 
    954     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    955     if [ ${USING_MPMD} == "yes" ] ; then 
    956        set_xio_using_server iodef.xml true 
    957     else 
    958        set_xio_using_server iodef.xml false 
    959     fi 
     854    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     855    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     856    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     857    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     858    set_xio_using_server iodef.xml ${USING_MPMD} 
    960859    cd ${SETTE_DIR} 
    961860    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    979878    set_namelist namelist_cfg cn_ocerst_in \"SAS_${ITRST}_restart\" 
    980879    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_${ITRST}_restart_ice\" 
    981     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    982     if [ ${USING_MPMD} == "yes" ] ; then 
    983        set_xio_using_server iodef.xml true 
    984     else 
    985        set_xio_using_server iodef.xml false 
    986     fi 
     880    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     881    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     882    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     883    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     884    set_xio_using_server iodef.xml ${USING_MPMD} 
    987885    for (( i=1; i<=$NPROC; i++)) ; do 
    988886        L_NPROC=$(( $i - 1 )) 
     
    1009907    cd ${MAIN_DIR} 
    1010908    cd ${SETTE_DIR} 
    1011     . ./param.cfg 
    1012     . ./all_functions.sh 
    1013909    . ./prepare_exe_dir.sh 
    1014910    set_valid_dir 
     
    1024920    set_namelist namelist_cfg jpnj 8 
    1025921    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1026     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1027     if [ ${USING_MPMD} == "yes" ] ; then 
    1028        set_xio_using_server iodef.xml true 
    1029     else 
    1030        set_xio_using_server iodef.xml false 
    1031     fi 
     922    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     923    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     924    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     925    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     926    set_xio_using_server iodef.xml ${USING_MPMD} 
    1032927    cd ${SETTE_DIR} 
    1033928    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1050945    set_namelist namelist_cfg jpnj 4 
    1051946    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1052     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1053     if [ ${USING_MPMD} == "yes" ] ; then 
    1054        set_xio_using_server iodef.xml true 
    1055     else 
    1056        set_xio_using_server iodef.xml false 
    1057     fi 
     947    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     948    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     949    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     950    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     951    set_xio_using_server iodef.xml ${USING_MPMD} 
    1058952    cd ${SETTE_DIR} 
    1059953    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1069963## Test assimilation interface code, OBS and ASM for reproducibility 
    1070964## Restartability not tested (ASM code not restartable while increments are being applied) 
    1071 if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     965if [ ${config} == "ORCA2_ICE_OBS" ] ;  then 
     966    SETTE_CONFIG="ORCA2_ICE_OBS"${SETTE_STG} 
    1072967## Reproducibility tests 
    1073968    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     
    1077972   ITEND=80  # 5 days 
    1078973    fi 
     974    cd ${MAIN_DIR} 
     975    # 
     976    # syncronisation if target directory/file exist (not done by makenemo) 
     977    sync_config  ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     978    clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     979    # 
     980    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_ICE_PISCES -d "OCE ICE"  -j ${CMPL_CORES} add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}" 
     981fi 
     982if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     983## Reproducibility tests 
    1079984    export TEST_NAME="REPRO_4_8" 
    1080     cd ${MAIN_DIR} 
    1081     # 
    1082     # syncronisation if target directory/file exist (not done by makenemo) 
    1083     . ${SETTE_DIR}/all_functions.sh 
    1084     sync_config  ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    1085     clean_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    1086     # 
    1087     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}" 
    1088     cd ${SETTE_DIR} 
    1089     . ./param.cfg 
    1090     . ./all_functions.sh 
     985    cd ${SETTE_DIR} 
    1091986    . ./prepare_exe_dir.sh 
    1092987    set_valid_dir 
     
    11251020    set_namelist namelist_pisces_cfg ln_ironice .false. 
    11261021    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1127     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1128     if [ ${USING_MPMD} == "yes" ] ; then 
    1129        set_xio_using_server iodef.xml true 
    1130     else 
    1131        set_xio_using_server iodef.xml false 
    1132     fi 
     1022    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1023    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1024    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1025    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1026    set_xio_using_server iodef.xml ${USING_MPMD} 
    11331027    cd ${SETTE_DIR} 
    11341028    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    11741068    set_namelist namelist_pisces_cfg ln_ironice .false. 
    11751069    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1176     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1177     if [ ${USING_MPMD} == "yes" ] ; then 
    1178        set_xio_using_server iodef.xml true 
    1179     else 
    1180        set_xio_using_server iodef.xml false 
    1181     fi 
     1070    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1071    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1072    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1073    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1074    set_xio_using_server iodef.xml ${USING_MPMD} 
    11821075    cd ${SETTE_DIR} 
    11831076    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    11891082# AGRIF ICE 
    11901083# ----------- 
    1191 if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    1192 ## Restartability tests 
     1084if [ ${config} == "AGRIF" ] ;  then 
     1085    SETTE_CONFIG="AGRIF_DEMO"${SETTE_STG} 
    11931086    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    11941087    then 
     
    12011094    ITRST_2=$( printf "%08d" $(( ${ITEND} * 4 / 2 )) ) 
    12021095    ITRST_3=$( printf "%08d" $(( ${ITEND} * 4 * 3 / 2 )) ) 
     1096    cd ${MAIN_DIR} 
     1097    # 
     1098    # syncronisation if target directory/file exist (not done by makenemo) 
     1099    sync_config  AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1100    clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1101    # 
     1102    # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 
     1103    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 
     1104fi 
     1105if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
     1106## Restartability tests 
    12031107    export TEST_NAME="LONG" 
    1204     cd ${MAIN_DIR} 
    1205     # 
    1206     # syncronisation if target directory/file exist (not done by makenemo) 
    1207     . ${SETTE_DIR}/all_functions.sh 
    1208     sync_config  AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
    1209     clean_config AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
    1210     # 
    1211     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    1212     cd ${SETTE_DIR} 
    1213     . ./param.cfg 
    1214     . ./all_functions.sh 
     1108    cd ${SETTE_DIR} 
    12151109    . ./prepare_exe_dir.sh 
    12161110    set_valid_dir 
     
    12251119    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    12261120    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1121    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    12271122    set_namelist 1_namelist_cfg cn_exp \"AGRIF_LONG\" 
    12281123    set_namelist 1_namelist_cfg nn_it000 1 
     
    12411136    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    12421137 
    1243     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1244     if [ ${USING_MPMD} == "yes" ] ; then 
    1245        set_xio_using_server iodef.xml true 
    1246     else 
    1247        set_xio_using_server iodef.xml false 
    1248     fi 
     1138    set_xio_using_server iodef.xml ${USING_MPMD} 
    12491139    cd ${SETTE_DIR} 
    12501140    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    12631153    set_namelist namelist_cfg ln_rstart .true. 
    12641154    set_namelist namelist_cfg nn_rstctl 2 
     1155    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    12651156    set_namelist 1_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    12661157    set_namelist 1_namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     
    13051196        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_ice_${L_NPROC}.nc . 
    13061197    done 
    1307     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1308     if [ ${USING_MPMD} == "yes" ] ; then 
    1309        set_xio_using_server iodef.xml true 
    1310     else 
    1311        set_xio_using_server iodef.xml false 
    1312     fi 
     1198    set_xio_using_server iodef.xml ${USING_MPMD} 
    13131199    cd ${SETTE_DIR} 
    13141200    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    13231209    cd ${MAIN_DIR} 
    13241210    cd ${SETTE_DIR} 
    1325     . ./param.cfg 
    1326     . ./all_functions.sh 
    13271211    . ./prepare_exe_dir.sh 
    13281212    set_valid_dir 
     
    13381222    set_namelist namelist_cfg jpnj 8 
    13391223    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1224    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    13401225    set_namelist 1_namelist_cfg cn_exp \"AGRIF_28\" 
    13411226    set_namelist 1_namelist_cfg nn_it000 1 
     
    13571242    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    13581243 
    1359     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1360     if [ ${USING_MPMD} == "yes" ] ; then 
    1361        set_xio_using_server iodef.xml true 
    1362     else 
    1363        set_xio_using_server iodef.xml false 
    1364     fi 
     1244    set_xio_using_server iodef.xml ${USING_MPMD} 
    13651245    cd ${SETTE_DIR} 
    13661246    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    13831263    set_namelist namelist_cfg jpnj 4 
    13841264    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1265    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1266    set_xio_using_server iodef.xml ${USING_MPMD} 
    13851267    set_namelist 1_namelist_cfg cn_exp \"AGRIF_44\" 
    13861268    set_namelist 1_namelist_cfg nn_it000 1 
     
    14021284    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    14031285 
    1404     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1405     if [ ${USING_MPMD} == "yes" ] ; then 
    1406        set_xio_using_server iodef.xml true 
    1407     else 
    1408        set_xio_using_server iodef.xml false 
    1409     fi 
    14101286    cd ${SETTE_DIR} 
    14111287    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    14261302    cd ${MAIN_DIR} 
    14271303    cd ${SETTE_DIR} 
    1428     . ./param.cfg 
    1429     . ./all_functions.sh 
    14301304    . ./prepare_exe_dir.sh 
    14311305    set_valid_dir 
     
    14391313    set_namelist namelist_cfg nn_itend ${ITEND} 
    14401314    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1315    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    14411316 
    14421317#   Set the number of fine grids to zero:     
    14431318    sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
    14441319 
    1445     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1446     if [ ${USING_MPMD} == "yes" ] ; then 
    1447        set_xio_using_server iodef.xml true 
    1448     else 
    1449        set_xio_using_server iodef.xml false 
    1450     fi 
     1320    set_xio_using_server iodef.xml ${USING_MPMD} 
    14511321    cd ${SETTE_DIR} 
    14521322    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    14591329## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 
    14601330if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ;  then 
     1331    SETTE_CONFIG="AGRIF_DEMO_NOAGRIF"${SETTE_STG} 
    14611332    export TEST_NAME="ORCA2" 
    14621333    cd ${MAIN_DIR} 
    14631334    # 
    14641335    # syncronisation if target directory/file exist (not done by makenemo) 
    1465     . ${SETTE_DIR}/all_functions.sh 
    1466     sync_config  AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    1467     clean_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    1468     # 
    1469     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "key_agrif ${DEL_KEYS}" 
    1470     cd ${SETTE_DIR} 
    1471     . ./param.cfg 
    1472     . ./all_functions.sh 
     1336    sync_config  AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1337    clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1338    # 
     1339    # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 
     1340    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "key_agrif ${DEL_KEYS}" 
     1341    cd ${SETTE_DIR} 
    14731342    . ./prepare_exe_dir.sh 
    14741343    set_valid_dir 
     
    14821351    set_namelist namelist_cfg nn_itend ${ITEND} 
    14831352    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1484 # 
    1485     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1486     if [ ${USING_MPMD} == "yes" ] ; then 
    1487        set_xio_using_server iodef.xml true 
    1488     else 
    1489        set_xio_using_server iodef.xml false 
    1490     fi 
     1353    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1354# 
     1355    set_xio_using_server iodef.xml ${USING_MPMD} 
    14911356    cd ${SETTE_DIR} 
    14921357    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    14991364# WED025 
    15001365# ------- 
    1501 if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 
    1502 ## Restartability tests 
     1366if [ ${config} == "WED025" ] ;  then 
     1367    SETTE_CONFIG="WED025"${SETTE_STG} 
    15031368    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    15041369    then 
     
    15081373    fi 
    15091374    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     1375    cd ${MAIN_DIR} 
     1376    # 
     1377    # syncronisation if target directory/file exist (not done by makenemo) 
     1378    sync_config  WED025 ${SETTE_CONFIG} 'cfgs' 
     1379    clean_config WED025 ${SETTE_CONFIG} 'cfgs' 
     1380    # 
     1381    # WED025 uses ln_hpg_isf so remove key_qco if added by default 
     1382    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     1383fi 
     1384if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 
     1385## Restartability tests 
    15101386    export TEST_NAME="LONG" 
    1511     cd ${MAIN_DIR} 
    1512     # 
    1513     # syncronisation if target directory/file exist (not done by makenemo) 
    1514     . ${SETTE_DIR}/all_functions.sh 
    1515     sync_config  WED025 WED025_ST 'cfgs' 
    1516     clean_config WED025 WED025_ST 'cfgs' 
    1517     # 
    1518     . ./makenemo -m ${CMP_NAM} -n WED025_ST -r WED025 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    1519     cd ${SETTE_DIR} 
    1520     . ./param.cfg 
    1521     . ./all_functions.sh 
     1387    cd ${SETTE_DIR} 
    15221388    . ./prepare_exe_dir.sh 
    15231389    set_valid_dir 
     
    15361402    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    15371403    #set_namelist namelist_ice_cfg ln_icediachk .true. 
    1538     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1539     if [ ${USING_MPMD} == "yes" ] ; then 
    1540        set_xio_using_server iodef.xml true 
    1541     else 
    1542        set_xio_using_server iodef.xml false 
    1543     fi 
     1404    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1405    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1406    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1407    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1408    set_xio_using_server iodef.xml ${USING_MPMD} 
    15441409    cd ${SETTE_DIR} 
    15451410    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    15681433        ln -sf ../LONG/WED025_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
    15691434    done 
    1570     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1571     if [ ${USING_MPMD} == "yes" ] ; then 
    1572        set_xio_using_server iodef.xml true 
    1573     else 
    1574        set_xio_using_server iodef.xml false 
    1575     fi 
     1435    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1436    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1437    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1438    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1439    set_xio_using_server iodef.xml ${USING_MPMD} 
    15761440    cd ${SETTE_DIR} 
    15771441    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    15861450    cd ${MAIN_DIR} 
    15871451    cd ${SETTE_DIR} 
    1588     . ./param.cfg 
    1589     . ./all_functions.sh 
    15901452    . ./prepare_exe_dir.sh 
    15911453    set_valid_dir 
     
    16021464    set_namelist namelist_cfg jpnj 7 
    16031465    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1604     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1605     if [ ${USING_MPMD} == "yes" ] ; then 
    1606        set_xio_using_server iodef.xml true 
    1607     else 
    1608        set_xio_using_server iodef.xml false 
    1609     fi 
     1466    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1467    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1468    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1469    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1470    set_xio_using_server iodef.xml ${USING_MPMD} 
    16101471    cd ${SETTE_DIR} 
    16111472    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    16291490    set_namelist namelist_cfg jpnj 4 
    16301491    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1631     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1632     if [ ${USING_MPMD} == "yes" ] ; then 
    1633        set_xio_using_server iodef.xml true 
    1634     else 
    1635        set_xio_using_server iodef.xml false 
    1636     fi 
     1492    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1493    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1494    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1495    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1496    set_xio_using_server iodef.xml ${USING_MPMD} 
    16371497    cd ${SETTE_DIR} 
    16381498    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
  • utils/CI/sette/sette_rpt.sh

    r14844 r14981  
    1313function get_dorv() { 
    1414  if [ $lastchange == 'old' ] ; then  
    15     dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l ` 
     15    dorv=`ls -1rt $vdir/$mach/ | tail -1l ` 
    1616    dorv=`echo $dorv | sed -e 's:.*/::'` 
    17     dorv2=`ls -1rt $vdir/$nam2/$mach/ 2>/dev/null | tail -1l ` 
     17    dorv2=`ls -1rt $vdir/$mach/ 2>/dev/null | tail -1l ` 
    1818    dorv2=`echo $dorv2 | sed -e 's:.*/::'` 
    1919  else 
     
    4444# 
    4545# check if directory is here 
    46   if [ ! -d $vdir/$nam/$mach/$dorv ]; then 
     46  if [ ! -d $vdir/$mach/$dorv/$nam ]; then 
    4747    printf "%-27s %s %s\n" $nam  " directory                  MISSING : " $dorv 
    4848    return 
    4949  fi 
    5050 
    51   if [ -d $vdir/$nam/$mach/$dorv ]; then 
     51  if [ -d $vdir/$mach/$dorv/$nam ]; then 
    5252    # check ocean output 
    5353    runtest $vdir $nam $pass RST 
    5454    # 
    5555    # run restartibility test 
    56     f1o=$vdir/$nam/$mach/$dorv/LONG/ocean.output 
    57     f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
    58     f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
    59     f2o=$vdir/$nam/$mach/$dorv/SHORT/ocean.output 
    60     f2s=$vdir/$nam/$mach/$dorv/SHORT/run.stat 
    61     f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat 
     56    f1o=$vdir/$mach/$dorv/$nam/LONG/ocean.output 
     57    f1s=$vdir/$mach/$dorv/$nam/LONG/run.stat 
     58    f1t=$vdir/$mach/$dorv/$nam/LONG/tracer.stat 
     59    f2o=$vdir/$mach/$dorv/$nam/SHORT/ocean.output 
     60    f2s=$vdir/$mach/$dorv/$nam/SHORT/run.stat 
     61    f2t=$vdir/$mach/$dorv/$nam/SHORT/tracer.stat 
    6262 
    6363    if  [ ! -f $f1s ] &&  [ ! -f $f1t ] ; then  
     
    150150# 
    151151# check if directory is here 
    152   if [ ! -d $vdir/$nam/$mach/$dorv ]; then 
     152  if [ ! -d $vdir/$mach/$dorv/$nam ]; then 
    153153    printf "%-27s %s %s\n" $nam  " directory                  MISSING : " $dorv 
    154154    return 
    155155  fi 
    156156# 
    157   if [ -d $vdir/$nam/$mach/$dorv ]; then 
     157  if [ -d $vdir/$mach/$dorv/$nam ]; then 
    158158    # check ocean output 
    159159    runtest $vdir $nam $pass REPRO 
    160160    # 
    161161    # check reproducibility 
    162     rep1=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -2l | head -1 ` 
    163     rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -1l` 
     162    rep1=`ls -1rt $vdir/$mach/$dorv/$nam/ | grep REPRO | tail -2l | head -1 ` 
     163    rep2=`ls -1rt $vdir/$mach/$dorv/$nam/ | grep REPRO | tail -1l` 
    164164    if [ $rep1 == $rep2 ]; then 
    165165       rep2='' 
    166166    fi 
    167     f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    168     f1s=$vdir/$nam/$mach/$dorv/$rep1/run.stat 
    169     f1t=$vdir/$nam/$mach/$dorv/$rep1/tracer.stat 
    170     f2o=$vdir/$nam/$mach/$dorv/$rep2/ocean.output 
    171     f2s=$vdir/$nam/$mach/$dorv/$rep2/run.stat 
    172     f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat 
     167    f1o=$vdir/$mach/$dorv/$nam/$rep1/ocean.output 
     168    f1s=$vdir/$mach/$dorv/$nam/$rep1/run.stat 
     169    f1t=$vdir/$mach/$dorv/$nam/$rep1/tracer.stat 
     170    f2o=$vdir/$mach/$dorv/$nam/$rep2/ocean.output 
     171    f2s=$vdir/$mach/$dorv/$nam/$rep2/run.stat 
     172    f2t=$vdir/$mach/$dorv/$nam/$rep2/tracer.stat 
    173173 
    174174    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then  
     
    257257# 
    258258# check if reference directory is present 
    259   if [ ! -d $vdirref/$nam/$mach/$dorvref ]; then 
     259  if [ ! -d $vdirref/$mach/$dorvref/$nam ]; then 
    260260    printf "%-27s %s\n" $nam " REFERENCE directory at $dorvref is MISSING" 
    261261    return 
    262262  fi 
    263   if [ ! -d $vdir/$nam/$mach/$dorv ]; then 
     263  if [ ! -d $vdir/$mach/$dorv/$nam ]; then 
    264264    printf "%-27s %s\n" $nam " VALID     directory at $dorv is MISSING" 
    265265    return 
     
    267267 
    268268# 
    269   if [ -d $vdir/$nam/$mach/$dorv ]; then 
    270     f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
    271     f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
    272     f2s=$vdirref/$nam/$mach/$dorvref/LONG/run.stat 
    273     f2t=$vdirref/$nam/$mach/$dorvref/LONG/tracer.stat 
     269  if [ -d $vdir/$mach/$dorv/$nam ]; then 
     270    f1s=$vdir/$mach/$dorv/$nam/LONG/run.stat 
     271    f1t=$vdir/$mach/$dorv/$nam/LONG/tracer.stat 
     272    f2s=$vdirref/$mach/$dorvref/$nam/LONG/run.stat 
     273    f2t=$vdirref/$mach/$dorvref/$nam/LONG/tracer.stat 
    274274    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then 
    275275      printf "%-20s %s\n" $nam " incomplete test"; 
     
    343343# 
    344344# check if reference directory is present 
    345   if [ ! -d $vdirref/$nam/$mach/$dorvref ]; then 
     345  if [ ! -d $vdirref/$mach/$dorvref/$nam ]; then 
    346346    return 
    347347  fi 
    348   if [ ! -d $vdir/$nam/$mach/$dorv ]; then 
     348  if [ ! -d $vdir/$mach/$dorv/$nam ]; then 
    349349    return 
    350350  fi 
    351351 
    352352# 
    353   if [ -d $vdir/$nam/$mach/$dorv ]; then 
    354     f1a=$vdir/$nam/$mach/$dorv/LONG/timing.output 
    355     f2a=$vdirref/$nam/$mach/$dorvref/LONG/timing.output 
     353  if [ -d $vdir/$mach/$dorv/$nam ]; then 
     354    f1a=$vdir/$mach/$dorv/$nam/LONG/timing.output 
     355    f2a=$vdirref/$mach/$dorvref/$nam/LONG/timing.output 
    356356# 
    357357# Report average CPU time differences (if available) 
     
    390390# no print needed if the repository is not here (already catch before) 
    391391# 
    392   if [ -d $vdir/$nam/$mach/$dorv/ ]; then 
     392  if [ -d $vdir/$mach/$dorv/$nam/ ]; then 
    393393    # 
    394394    # apply check for all ttype directory 
    395     rep1=$(ls -rt $vdir/$nam/$mach/$dorv/ | grep -E $ttype) 
     395    rep1=$(ls -rt $vdir/$mach/$dorv/$nam/ | grep -E $ttype) 
    396396    for tdir in $rep1 ; do 
    397        f1o=$vdir/$nam/$mach/$dorv/$tdir/ocean.output 
     397       f1o=$vdir/$mach/$dorv/$nam/$tdir/ocean.output 
    398398       if  [ ! -f $f1o ] ; then 
    399399          if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam " ocean.output               MISSING : " $dorv ; fi 
     
    430430  get_dorv 
    431431# 
    432   rep=`ls -1rt $vdir/$nam/$mach/$dorv/ |  tail -1l` 
    433   f1s=${vdir}/${nam}/${mach}/${dorv}/${rep}/run.stat 
    434   f2s=${vdir}/${nam2}/${mach}/${dorv2}/${rep}/run.stat 
     432  rep=`ls -1rt $vdir/$mach/$dorv/$nam/ |  tail -1l` 
     433  f1s=${vdir}/${mach}/${dorv}/${nam}/${rep}/run.stat 
     434  f2s=${vdir}/${mach}/${dorv2}/${nam2}/${rep}/run.stat 
    435435# 
    436436  if  [ -f $f1s ] && [ -f $f2s ] ; then 
     
    470470 
    471471  mach=${COMPILER} 
    472   NEMO_VALID=${NEMO_VALIDATION_DIR} 
    473   NEMO_VALID_REF=${NEMO_VALIDATION_REF} 
    474 # 
    475   if [ ! -d $NEMO_VALID ]; then 
    476     echo "$NEMO_VALID validation directory not found" 
    477     exit 
    478   fi 
    479 # 
    480 # 
    481 # Show current revision tag and branch name 
    482 # 
    483 echo "" 
    484 lastchange=`${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'` 
    485 revision=`${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'` 
    486 branchname=`${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` 
    487 echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )" 
    488 [ `${SVN_CMD} status -q ${MAIN_DIR}/{cfgs,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ 
    489  
    490 # overwrite revision or compiler 
     472# overwrite revision (later) or compiler 
    491473  if [ $# -gt 0 ]; then 
    492     while getopts r:c:h option; do  
     474    while getopts r:R:c:v:V:h option; do  
    493475       case $option in 
    494476          c) mach=$OPTARG;; 
    495477          r) rev=$OPTARG;; 
     478          R) refrev=$OPTARG;; 
     479          v) SETTE_SUB_VAL=$OPTARG;; 
     480          V) SETTE_SUB_VAL2=$OPTARG 
     481             if [ -d ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} ] ; then 
     482               export NEMO_VALIDATION_REF=${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} 
     483             else 
     484               echo "Requested comparison subdirectory: ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} does not exist" 
     485             fi 
     486             ;; 
    496487          h | *) echo '' 
    497488                 echo 'sette_rpt.sh : '  
     
    501492                 echo ' -r REVISION_number :' 
    502493                 echo '     display sette results for the specified revision (set old for the latest revision available for each config)' 
     494                 echo ' -R REFERENCE REVISION_number :' 
     495                 echo '     compare sette results against the specified revision (use to over-ride value set in param.cfg)' 
     496                 echo ' -v sub_dir :' 
     497                 echo '     validation sub-directory below NEMO_VALIDATION_DIR' 
     498                 echo ' -V sub_dir2 :' 
     499                 echo '     2nd validation sub-directory below NEMO_VALIDATION_DIR' 
     500                 echo '     if set the comparison is between two subdirectory trees beneath NEMO_VALIDATION_DIR' 
    503501                 echo '' 
    504502                 exit 42;; 
     
    506504    done 
    507505    shift $((OPTIND - 1)) 
    508 fi 
    509  
     506  fi 
    510507# if $1 (remaining arguments) 
    511 if [[ ! -z $1 ]] ; then rev=$1 ; fi 
     508  if [[ ! -z $1 ]] ; then rev=$1 ; fi 
     509 
     510  if [ ! -z $SETTE_SUB_VAL ] ; then 
     511   export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     512   if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] && [ -z $SETTE_SUB_VAL2 ] ; then 
     513    while true; do 
     514        read -p "$NEMO_VALIDATION_REF/$SETTE_SUB_VAL exists. Do you wish to use it as a reference? " yn 
     515        case $yn in 
     516            [Yy]* ) export $NEMO_VALIDATION_REF/$SETTE_SUB_VAL; break;; 
     517            [Nn]* ) echo "Ok, continuing with ${NEMO_VALIDATION_REF}/MAIN as the reference directory" 
     518                    export NEMO_VALIDATION_REF=${NEMO_VALIDATION_REF}/MAIN 
     519                    break 
     520                    ;; 
     521            * ) echo "Please answer yes or no.";; 
     522        esac 
     523    done 
     524   fi 
     525  else 
     526   export NEMO_VALIDATION_DIR=${NEMO_VALIDATION_DIR}/MAIN 
     527   export NEMO_VALIDATION_REF=${NEMO_VALIDATION_REF}/MAIN 
     528  fi 
     529  NEMO_VALID=${NEMO_VALIDATION_DIR} 
     530  NEMO_VALID_REF=${NEMO_VALIDATION_REF} 
     531  if [ ! -z $refrev ] ; then 
     532    NEMO_REV_REF=${refrev} 
     533  fi 
     534# 
     535  if [ ! -d $NEMO_VALID ]; then 
     536    echo "$NEMO_VALID validation directory not found" 
     537    exit 
     538  fi 
     539# 
     540# 
     541# Show current revision tag and branch name 
     542# 
     543echo "" 
     544lastchange=`${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'` 
     545revision=`${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'` 
     546branchname=`${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` 
     547echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )" 
     548[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfgs,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ 
    512549 
    513550# by default use the current lastchanged revision 
     
    541578 echo "" 
    542579 echo "   !----restart----!   " 
    543  for restart_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WICE_AGRIF_ST WSWG_ST 
     580 for restart_test in GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE AGRIF_DEMO WED025 ISOMIP+ OVERFLOW LOCK_EXCHANGE VORTEX ICE_AGRIF SWG 
    544581 do 
    545582   resttest $NEMO_VALID $restart_test $pass 
     
    549586 echo "" 
    550587 echo "   !----repro----!   " 
    551  for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WORCA2_ICE_OBS_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WVORTEX_ST WICE_AGRIF_ST WSWG_ST 
     588 for repro_test in GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE ORCA2_ICE_OBS AGRIF_DEMO WED025 ISOMIP+ VORTEX ICE_AGRIF SWG 
    552589 do 
    553590   reprotest $NEMO_VALID $repro_test $pass 
     
    557594 echo "" 
    558595 echo "   !----agrif check----!   " 
    559  dir1=WAGRIF_DEMO_NOAGRIF_ST 
    560  dir2=WAGRIF_DEMO_ST 
     596 dir1=AGRIF_DEMO_NOAGRIF 
     597 dir2=AGRIF_DEMO 
    561598 identictest $NEMO_VALID $dir1 $dir2 $pass  
    562599# 
     
    576613     echo "REFERENCE directory : $NEMO_VALID_REF at rev $NEMO_REV_REF" 
    577614     echo '' 
    578      checklist=(WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WVORTEX_ST WICE_AGRIF_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WSWG_ST) 
     615     checklist=(GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE AGRIF_DEMO WED025 ISOMIP+ VORTEX ICE_AGRIF OVERFLOW LOCK_EXCHANGE SWG) 
    579616     for repro_test in ${checklist[@]} 
    580617     do 
  • utils/CI/sette/sette_test-cases.sh

    r14826 r14981  
    3131# MPIRUN_FLAG       : flag to run in parallel (MPI) "yes" 
    3232#                           to run in sequential mode (NB_PROC = 1) "no" 
    33 # USING_XIOS        : flag to control the activation of key_xios 
    34 #                      "yes" to compile using key_xios and link to the external XIOS library 
    35 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    36 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    37 #                     requires USING_XIOS="yes" 
    38 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    39 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    4033# NUM_XIOSERVERS    : number of stand-alone IO servers to employ 
    4134#                     set to zero if USING_MPMD="no" 
    42 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    43 #                     "yes" to use the loop fusion adv routines when halo = 2 
    44 #                     "no" to use standard adv routines 
    4535# 
    4636# Principal script is sette_test-cases.sh, that calls  
     
    10797export MPIRUN_FLAG="yes" 
    10898# 
    109 export ADD_KEYS="" 
    110 export DEL_KEYS="" 
    111 if [ ${USING_XIOS} == "yes" ]  
    112  then  
    113    export ADD_KEYS="${ADD_KEYS} key_xios" 
    114  else 
    115    export DEL_KEYS="${DEL_KEYS} key_xios" 
    116 fi 
    117 # 
    118 if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
    119  then 
    120    export ADD_KEYS="${ADD_KEYS} key_nosignedzero" 
    121  else 
    122    export DEL_KEYS="${DEL_KEYS} key_nosignedzero"  
    123 fi 
    124 # 
    125 if [ ${USING_LOOP_FUSION} == "yes" ] 
    126  then 
    127    export ADD_KEYS="${ADD_KEYS} key_loop_fusion" 
    128 fi 
    129 # 
    130 if [ ${NOT_USING_QCO} == "yes" ] 
    131  then 
    132    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh" 
    133 fi 
    134 # 
    135 if [ ${USING_RK3} == "yes" ] 
    136  then 
    137    export ADD_KEYS="${ADD_KEYS} key_qco key_RK3" 
    138 fi 
    139 # 
    14099# Settings which control the use of stand alone servers (only relevant if using xios) 
    141100# 
     
    149108fi 
    150109# 
    151 # 
    152 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    153  then 
    154    echo "Incompatible choices. MPMD mode requires the XIOS server" 
    155    exit 
    156 fi 
    157  
    158110# Directory to run the tests 
    159111CONFIG_DIR0=${MAIN_DIR}/cfgs 
     
    175127# WAD 
    176128 
     129. ./all_functions.sh 
    177130for config in ${TEST_CONFIGS[@]} 
    178131do 
     
    181134#  OVERFLOW 
    182135# --------- 
    183 if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
    184     ## Restartability tests for OVERFLOW 
     136if [ ${config} == "OVERFLOW" ] ;  then 
     137    SETTE_CONFIG="OVERFLOW"${SETTE_STG} 
    185138    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    186139    then 
     
    190143    fi 
    191144    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     145    cd ${MAIN_DIR} 
     146    # 
     147    # 
     148    clean_config OVERFLOW ${SETTE_CONFIG} 'tests' 
     149    # 
     150    sync_config  OVERFLOW ${SETTE_CONFIG} 'tests' 
     151    # 
     152    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a OVERFLOW -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     153fi 
     154if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
     155    ## Restartability tests for OVERFLOW 
    192156    export TEST_NAME="LONG" 
    193     cd ${MAIN_DIR} 
    194     # 
    195     . ${SETTE_DIR}/all_functions.sh 
    196     # 
    197     clean_config OVERFLOW OVERFLOW_ST 'tests' 
    198     # 
    199     sync_config  OVERFLOW OVERFLOW_ST 'tests' 
    200     # 
    201     . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    202     cd ${SETTE_DIR} 
    203     . ./param.cfg 
    204     . ./all_functions.sh 
     157    cd ${SETTE_DIR} 
    205158    . ./prepare_exe_dir.sh 
    206159    set_valid_dir 
     
    215168    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    216169    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    217     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    218     if [ ${USING_MPMD} == "yes" ] ; then 
    219        set_xio_using_server iodef.xml true 
    220     else 
    221        set_xio_using_server iodef.xml false 
    222     fi 
     170    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     171    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     172    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     173    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     174    set_xio_using_server iodef.xml ${USING_MPMD} 
    223175    cd ${SETTE_DIR} 
    224176    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    238190    set_namelist namelist_cfg nn_rstctl 2 
    239191    set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_${ITRST}_restart\" 
    240     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    241     if [ ${USING_MPMD} == "yes" ] ; then 
    242        set_xio_using_server iodef.xml true 
    243     else 
    244        set_xio_using_server iodef.xml false 
    245     fi 
     192    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     193    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     194    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     195    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     196    set_xio_using_server iodef.xml ${USING_MPMD} 
    246197    ln -sf ../LONG/OVF_LONG_${ITRST}_restart.nc . 
    247198 
     
    272223         ## 
    273224        cd ${SETTE_DIR} 
    274         . ./param.cfg 
    275         . ./all_functions.sh 
    276225        . ./prepare_exe_dir.sh 
    277226        set_valid_dir 
     
    285234   set_namelist namelist_cfg nn_it000 1 
    286235   set_namelist namelist_cfg nn_itend ${ITEND} 
    287         if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    288         if [ ${USING_MPMD} == "yes" ] ; then 
    289            set_xio_using_server iodef.xml true 
    290         else 
    291            set_xio_using_server iodef.xml false 
    292         fi 
     236        set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     237        set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     238        set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     239        set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     240        set_xio_using_server iodef.xml ${USING_MPMD} 
    293241        cd ${SETTE_DIR} 
    294242        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    302250#  LOCK_EXCHANGE 
    303251# -------------- 
    304 if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
    305     ## Restartability tests for LOCK_EXCHANGE 
     252if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
     253    SETTE_CONFIG="LOCK_EXCHANGE"${SETTE_STG} 
    306254    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    307255    then 
     
    311259    fi 
    312260    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     261    cd ${MAIN_DIR} 
     262    # 
     263    # syncronisation if target directory/file exist (not done by makenemo) 
     264    # 
     265    clean_config LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 
     266    # 
     267    sync_config  LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 
     268    # 
     269    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     270fi 
     271if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
     272    ## Restartability tests for LOCK_EXCHANGE 
    313273    export TEST_NAME="LONG" 
    314     cd ${MAIN_DIR} 
    315     # 
    316     # syncronisation if target directory/file exist (not done by makenemo) 
    317     . ${SETTE_DIR}/all_functions.sh 
    318     # 
    319     clean_config LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
    320     # 
    321     sync_config  LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
    322     # 
    323     . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    324     cd ${SETTE_DIR} 
    325     . ./param.cfg 
    326     . ./all_functions.sh 
     274    cd ${SETTE_DIR} 
    327275    . ./prepare_exe_dir.sh 
    328276    set_valid_dir 
     
    337285    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    338286    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    339     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    340     if [ ${USING_MPMD} == "yes" ] ; then 
    341        set_xio_using_server iodef.xml true 
    342     else 
    343        set_xio_using_server iodef.xml false 
    344     fi 
     287    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     288    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     289    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     290    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     291    set_xio_using_server iodef.xml ${USING_MPMD} 
    345292    cd ${SETTE_DIR} 
    346293    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    360307    set_namelist namelist_cfg nn_rstctl 2 
    361308    set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_${ITRST}_restart\" 
    362     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    363     if [ ${USING_MPMD} == "yes" ] ; then 
    364        set_xio_using_server iodef.xml true 
    365     else 
    366        set_xio_using_server iodef.xml false 
    367     fi 
     309    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     310    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     311    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     312    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     313    set_xio_using_server iodef.xml ${USING_MPMD} 
    368314    ln -sf ../LONG/LOCK_LONG_${ITRST}_restart.nc . 
    369315 
     
    394340        ##   
    395341        cd ${SETTE_DIR} 
    396         . ./param.cfg 
    397         . ./all_functions.sh 
    398342        . ./prepare_exe_dir.sh 
    399343        set_valid_dir 
     
    405349        rm namelist_*_*_*_* 
    406350        cp -pL ${CONFIG_DIR}/${NEW_CONF}/EXP00/$file namelist_cfg 
    407         if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    408351   set_namelist namelist_cfg nn_it000 1 
    409352        set_namelist namelist_cfg nn_itend ${ITEND} 
    410         if [ ${USING_MPMD} == "yes" ] ; then 
    411            set_xio_using_server iodef.xml true 
    412         else 
    413            set_xio_using_server iodef.xml false 
    414         fi 
     353        set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     354        set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     355        set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     356        set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     357        set_xio_using_server iodef.xml ${USING_MPMD} 
    415358        cd ${SETTE_DIR} 
    416359        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    425368# VORTEX 
    426369# --------- 
    427 if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
    428 ## Restartability tests for VORTEX 
     370if [ ${config} == "VORTEX" ] ;  then 
     371    SETTE_CONFIG="VORTEX"${SETTE_STG} 
    429372    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    430373    then 
     
    435378    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
    436379    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
     380    cd ${MAIN_DIR} 
     381    # 
     382    # syncronisation if target directory/file exist (not done by makenemo) 
     383    # 
     384    clean_config VORTEX ${SETTE_CONFIG} 'tests' 
     385    # 
     386    sync_config  VORTEX ${SETTE_CONFIG} 'tests' 
     387    # 
     388    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a VORTEX -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     389fi 
     390if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
     391## Restartability tests for VORTEX 
    437392    export TEST_NAME="LONG" 
    438     cd ${MAIN_DIR} 
    439     # 
    440     # syncronisation if target directory/file exist (not done by makenemo) 
    441     . ${SETTE_DIR}/all_functions.sh 
    442     # 
    443     clean_config VORTEX VORTEX_ST 'tests' 
    444     # 
    445     sync_config  VORTEX VORTEX_ST 'tests' 
    446     # 
    447     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    448     cd ${SETTE_DIR} 
    449     . ./param.cfg 
    450     . ./all_functions.sh 
     393    cd ${SETTE_DIR} 
    451394    . ./prepare_exe_dir.sh 
    452395    set_valid_dir 
     
    461404    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    462405    set_namelist namelist_cfg sn_cfctl%l_runstat .true.   
     406    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     407    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     408    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     409    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    463410 
    464411    set_namelist 1_namelist_cfg cn_exp \"VORTEX_LONG\" 
     
    467414    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    468415    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
     416    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     417    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     418    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    469419    
    470     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    471     if [ ${USING_MPMD} == "yes" ] ; then 
    472         set_xio_using_server iodef.xml true 
    473     else 
    474         set_xio_using_server iodef.xml false 
    475     fi 
     420    set_xio_using_server iodef.xml ${USING_MPMD} 
    476421    cd ${SETTE_DIR} 
    477422    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    491436    set_namelist namelist_cfg nn_rstctl 2 
    492437    set_namelist namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST}_restart\" 
     438    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     439    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     440    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     441    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    493442     
    494443    set_namelist 1_namelist_cfg cn_exp \"VORTEX_SHORT\" 
     
    500449    set_namelist 1_namelist_cfg nn_rstctl 2 
    501450    set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST_1}_restart\" 
     451    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     452    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     453    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    502454       
    503     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    504     if [ ${USING_MPMD} == "yes" ] ; then 
    505         set_xio_using_server iodef.xml true 
    506     else 
    507         set_xio_using_server iodef.xml false 
    508     fi 
     455    set_xio_using_server iodef.xml ${USING_MPMD} 
    509456    if [ $NPROC -eq 1 ] ;  then 
    510457        ln -sf ../LONG/VORTEX_LONG_${ITRST}_restart.nc . 
     
    530477    cd ${MAIN_DIR} 
    531478    cd ${SETTE_DIR} 
    532     . ./param.cfg 
    533     . ./all_functions.sh 
    534479    . ./prepare_exe_dir.sh 
    535480    set_valid_dir 
     
    546491    set_namelist namelist_cfg jpnj 3 
    547492    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     493    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     494    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     495    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     496    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    548497    
    549498    set_namelist 1_namelist_cfg cn_exp \"VORTEX_23\" 
     
    554503    set_namelist 1_namelist_cfg jpnj 3 
    555504    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    556  
    557     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     505    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     506    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     507    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     508 
    558509    if [ ${USING_MPMD} == "yes" ] ; then 
    559510       set_xio_using_server iodef.xml true 
     
    583534    set_namelist namelist_cfg jpnj 2 
    584535    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     536    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     537    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     538    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     539    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    585540 
    586541    set_namelist 1_namelist_cfg cn_exp \"VORTEX_32\" 
     
    591546    set_namelist 1_namelist_cfg jpnj 2 
    592547    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    593  
    594     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    595     if [ ${USING_MPMD} == "yes" ] ; then 
    596        set_xio_using_server iodef.xml true 
    597     else 
    598        set_xio_using_server iodef.xml false 
    599     fi 
     548    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     549    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     550    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     551 
     552    set_xio_using_server iodef.xml ${USING_MPMD} 
    600553    cd ${SETTE_DIR} 
    601554    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    609562# ICE_AGRIF 
    610563# --------- 
    611 if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    612 ## Restartability tests for ICE_AGRIF 
     564if [ ${config} == "ICE_AGRIF" ] ;  then 
     565    SETTE_CONFIG="ICE_AGRIF"${SETTE_STG} 
    613566    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    614567    then 
     
    619572    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
    620573    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
     574    cd ${MAIN_DIR} 
     575    # 
     576    # syncronisation if target directory/file exist (not done by makenemo) 
     577    # 
     578    clean_config ICE_AGRIF ${SETTE_CONFIG} 'tests' 
     579    # 
     580    sync_config  ICE_AGRIF ${SETTE_CONFIG} 'tests' 
     581    # 
     582    # ICE_AGRIF uses linssh so remove key_qco if added by default 
     583    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ICE_AGRIF -j ${CMPL_CORES}  add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     584fi 
     585if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
     586## Restartability tests for ICE_AGRIF 
    621587    export TEST_NAME="LONG" 
    622     cd ${MAIN_DIR} 
    623     # 
    624     # syncronisation if target directory/file exist (not done by makenemo) 
    625     . ${SETTE_DIR}/all_functions.sh 
    626     # 
    627     clean_config ICE_AGRIF ICE_AGRIF_ST 'tests' 
    628     # 
    629     sync_config  ICE_AGRIF ICE_AGRIF_ST 'tests' 
    630     # 
    631     . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    632     cd ${SETTE_DIR} 
    633     . ./param.cfg 
    634     . ./all_functions.sh 
     588    cd ${SETTE_DIR} 
    635589    . ./prepare_exe_dir.sh 
    636590    set_valid_dir 
     
    645599    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    646600    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     601    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     602    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     603    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     604    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    647605     
    648606    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_LONG\" 
     
    651609    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    652610    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    653      
    654     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    655     if [ ${USING_MPMD} == "yes" ] ; then 
    656         set_xio_using_server iodef.xml true 
    657     else 
    658         set_xio_using_server iodef.xml false 
    659     fi 
     611    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     612    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     613    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     614     
     615    set_xio_using_server iodef.xml ${USING_MPMD} 
    660616    cd ${SETTE_DIR} 
    661617    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    676632    set_namelist namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST}_restart\" 
    677633    set_namelist namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST}_restart_ice\" 
     634    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     635    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     636    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     637    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    678638     
    679639    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_SHORT\" 
     
    686646    set_namelist 1_namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart\" 
    687647    set_namelist 1_namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart_ice\" 
    688      
    689      
    690     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    691     if [ ${USING_MPMD} == "yes" ] ; then 
    692         set_xio_using_server iodef.xml true 
    693     else 
    694         set_xio_using_server iodef.xml false 
    695     fi 
     648    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     649    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     650    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     651     
     652     
     653    set_xio_using_server iodef.xml ${USING_MPMD} 
    696654    if [ $NPROC -eq 1 ] ;  then 
    697655        ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart.nc . 
     
    723681    cd ${MAIN_DIR} 
    724682    cd ${SETTE_DIR} 
    725     . ./param.cfg 
    726     . ./all_functions.sh 
    727683    . ./prepare_exe_dir.sh 
    728684    set_valid_dir 
     
    739695    set_namelist namelist_cfg jpnj 3 
    740696    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     697    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     698    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     699    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     700    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    741701     
    742702    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_23\" 
     
    747707    set_namelist 1_namelist_cfg jpnj 3 
    748708    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    749  
    750     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    751     if [ ${USING_MPMD} == "yes" ] ; then 
    752        set_xio_using_server iodef.xml true 
    753     else 
    754        set_xio_using_server iodef.xml false 
    755     fi 
     709    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     710    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     711    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     712 
     713    set_xio_using_server iodef.xml ${USING_MPMD} 
    756714    cd ${SETTE_DIR} 
    757715    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    776734    set_namelist namelist_cfg jpnj 2 
    777735    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     736    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     737    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     738    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     739    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    778740     
    779741    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_32\" 
     
    784746    set_namelist 1_namelist_cfg jpnj 2 
    785747    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    786      
    787     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    788     if [ ${USING_MPMD} == "yes" ] ; then 
    789        set_xio_using_server iodef.xml true 
    790     else 
    791        set_xio_using_server iodef.xml false 
    792     fi 
     748    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     749    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     750    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     751     
     752    set_xio_using_server iodef.xml ${USING_MPMD} 
    793753    cd ${SETTE_DIR} 
    794754    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    801761# ISOMIP+ 
    802762# ------ 
    803 if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
    804 ## Restartability tests 
     763if [ ${config} == "ISOMIP+" ] ;  then 
     764    SETTE_CONFIG="ISOMIP+"${SETTE_STG} 
    805765    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    806766    then 
     
    810770    fi 
    811771    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     772    cd ${MAIN_DIR} 
     773    # 
     774    # syncronisation if target directory/file exist (not done by makenemo) 
     775    # 
     776    clean_config ISOMIP+ ${SETTE_CONFIG} 'tests' 
     777    # 
     778    sync_config  ISOMIP+ ${SETTE_CONFIG} 'tests' 
     779    # 
     780    # ISOMIP+ uses ln_hpg_isf so remove key_qco if added by default 
     781    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     782fi 
     783if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
     784## Restartability tests 
    812785    export TEST_NAME="LONG" 
    813     cd ${MAIN_DIR} 
    814     # 
    815     # syncronisation if target directory/file exist (not done by makenemo) 
    816     . ${SETTE_DIR}/all_functions.sh 
    817     # 
    818     clean_config ISOMIP+ ISOMIP+_ST 'tests' 
    819     # 
    820     sync_config  ISOMIP+ ISOMIP+_ST 'tests' 
    821     # 
    822     . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    823     cd ${SETTE_DIR} 
    824     . ./param.cfg 
    825     . ./all_functions.sh 
     786    cd ${SETTE_DIR} 
    826787    . ./prepare_exe_dir.sh 
    827788    set_valid_dir 
     
    838799    set_namelist namelist_cfg jpnj 3 
    839800    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    840     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    841     if [ ${USING_MPMD} == "yes" ] ; then 
    842        set_xio_using_server iodef.xml true 
    843     else 
    844        set_xio_using_server iodef.xml false 
    845     fi 
     801    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     802    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     803    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     804    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     805    set_xio_using_server iodef.xml ${USING_MPMD} 
    846806    cd ${SETTE_DIR} 
    847807    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    863823    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    864824    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_${ITRST}_restart\" 
    865     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    866     if [ ${USING_MPMD} == "yes" ] ; then 
    867        set_xio_using_server iodef.xml true 
    868     else 
    869        set_xio_using_server iodef.xml false 
    870     fi 
     825    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     826    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     827    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     828    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     829    set_xio_using_server iodef.xml ${USING_MPMD} 
    871830    for (( i=1; i<=$NPROC; i++)) ; do 
    872831        L_NPROC=$(( $i - 1 )) 
     
    893852    cd ${MAIN_DIR} 
    894853    cd ${SETTE_DIR} 
    895     . ./param.cfg 
    896     . ./all_functions.sh 
    897854    . ./prepare_exe_dir.sh 
    898855    set_valid_dir 
     
    908865    set_namelist namelist_cfg jpnj 3 
    909866    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    910     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    911     if [ ${USING_MPMD} == "yes" ] ; then 
    912        set_xio_using_server iodef.xml true 
    913     else 
    914        set_xio_using_server iodef.xml false 
    915     fi 
     867    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     868    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     869    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     870    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     871    set_xio_using_server iodef.xml ${USING_MPMD} 
    916872    cd ${SETTE_DIR} 
    917873    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    934890    set_namelist namelist_cfg jpnj 4 
    935891    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    936     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    937     if [ ${USING_MPMD} == "yes" ] ; then 
    938        set_xio_using_server iodef.xml true 
    939     else 
    940        set_xio_using_server iodef.xml false 
    941     fi 
     892    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     893    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     894    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     895    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     896    set_xio_using_server iodef.xml ${USING_MPMD} 
    942897    cd ${SETTE_DIR} 
    943898    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    951906# SWG 
    952907# --------- 
    953 if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${NOT_USING_QCO} == "no" ] ;  then 
    954 ## Restartability tests for SWG 
     908if [ ${config} == "SWG" ] && [ ${USING_QCO} == "yes" ] ;  then 
     909    SETTE_CONFIG="SWG"${SETTE_STG} 
    955910    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    956911    then 
     
    960915    fi 
    961916    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
     917    cd ${MAIN_DIR} 
     918    # 
     919    # syncronisation if target directory/file exist (not done by makenemo) 
     920    # 
     921    clean_config SWG ${SETTE_CONFIG} 'tests' 
     922    # 
     923    sync_config  SWG ${SETTE_CONFIG} 'tests' 
     924    # 
     925    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a SWG -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     926fi 
     927if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes" ] ;  then 
     928## Restartability tests for SWG 
    962929    export TEST_NAME="LONG" 
    963     cd ${MAIN_DIR} 
    964     # 
    965     # syncronisation if target directory/file exist (not done by makenemo) 
    966     . ${SETTE_DIR}/all_functions.sh 
    967     # 
    968     clean_config SWG SWG_ST 'tests' 
    969     # 
    970     sync_config  SWG SWG_ST 'tests' 
    971     # 
    972     . ./makenemo -m ${CMP_NAM} -n SWG_ST -a SWG -j 8  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    973     cd ${SETTE_DIR} 
    974     . ./param.cfg 
    975     . ./all_functions.sh 
     930    cd ${SETTE_DIR} 
    976931    . ./prepare_exe_dir.sh 
    977932    set_valid_dir 
     
    986941    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    987942    set_namelist namelist_cfg sn_cfctl%l_runstat .true.   
     943    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     944    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     945    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     946    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    988947    
    989     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    990     if [ ${USING_MPMD} == "yes" ] ; then 
    991         set_xio_using_server iodef.xml true 
    992     else 
    993         set_xio_using_server iodef.xml false 
    994     fi 
     948    set_xio_using_server iodef.xml ${USING_MPMD} 
    995949    cd ${SETTE_DIR} 
    996950    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1011965    set_namelist namelist_cfg cn_ocerst_in \"SWG_LONG_${ITRST}_restart\" 
    1012966       
    1013     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1014     if [ ${USING_MPMD} == "yes" ] ; then 
    1015         set_xio_using_server iodef.xml true 
    1016     else 
    1017         set_xio_using_server iodef.xml false 
    1018     fi 
     967    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     968    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     969    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     970    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     971    set_xio_using_server iodef.xml ${USING_MPMD} 
    1019972    if [ $NPROC -eq 1 ] ;  then 
    1020973        ln -sf ../LONG/SWG_LONG_${ITRST}_restart.nc . 
     
    1032985fi 
    1033986 
    1034 if [ ${config} == "SWG" ] && [ ${DO_REPRO} == "1" ] && [ ${NOT_USING_QCO} == "no" ] ;  then 
     987if [ ${config} == "SWG" ] && [ ${DO_REPRO} == "1" ] && [ ${USING_QCO} == "yes" ] ;  then 
    1035988 
    1036989## Reproducibility tests for SWG 
     
    1038991    cd ${MAIN_DIR} 
    1039992    cd ${SETTE_DIR} 
    1040     . ./param.cfg 
    1041     . ./all_functions.sh 
    1042993    . ./prepare_exe_dir.sh 
    1043994    set_valid_dir 
     
    10571008    
    10581009 
    1059     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1060     if [ ${USING_MPMD} == "yes" ] ; then 
    1061        set_xio_using_server iodef.xml true 
    1062     else 
    1063        set_xio_using_server iodef.xml false 
    1064     fi 
     1010    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1011    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1012    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1013    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1014    set_xio_using_server iodef.xml ${USING_MPMD} 
    10651015    cd ${SETTE_DIR} 
    10661016    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    10871037    set_namelist namelist_cfg sn_cfctl%l_prtctl .true. 
    10881038 
    1089     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1090     if [ ${USING_MPMD} == "yes" ] ; then 
    1091        set_xio_using_server iodef.xml true 
    1092     else 
    1093        set_xio_using_server iodef.xml false 
    1094     fi 
     1039    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1040    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1041    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1042    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1043    set_xio_using_server iodef.xml ${USING_MPMD} 
    10951044    cd ${SETTE_DIR} 
    10961045    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
Note: See TracChangeset for help on using the changeset viewer.