New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14873 – NEMO

Changeset 14873


Ignore:
Timestamp:
2021-05-17T16:19:02+02:00 (3 years ago)
Author:
acc
Message:

Branch: sette_ticket2673. Improved functionality: added -r (no report) option to disable running sette_rpt.sh at the end of sette.sh (allows chaining of sette.sh invocations with different arguments). Allowed SAS and AGRIF to be equivalently requested as ORCA2_SAS_ICE or AGRIF_DEMO (saves having to remember which are abbreviated). Sorted out the logic so that RESTART is no longer a mandatory test (allows REPRO without RESTART but, also, importantly, allows COMPILE as a test which will compile but not attempt to run - should mean fewer excuses for not running SETTE)

Location:
utils/CI/sette_ticket2673
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • utils/CI/sette_ticket2673/param.cfg

    r14867 r14873  
    6767# 
    6868# TYPES OF TESTS TO PERFORM 
    69 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   
    7071export DO_REPRO=0 
    7172export DO_CORRUPT=0 
    7273export DO_PHYOPTS=0 
    7374TEST_TYPES=(${SETTE_TEST_TYPES[@]:-"RESTART REPRO PHYOPTS CORRUPT"}) 
    74 if [[ ! ${TEST_TYPES[*]} =~ .*RESTART.* ]]; then export TEST_TYPES=("RESTART" ${TEST_TYPES[@]}) ;fi 
     75if [[ ${TEST_TYPES[*]} =~ .*RESTART.* ]]; then export DO_RESTART=1 ;fi 
    7576if [[ ${TEST_TYPES[*]} =~ .*REPRO.* ]]; then export DO_REPRO=1 ;fi 
    7677if [[ ${TEST_TYPES[*]} =~ .*CORRUPT.* ]]; then export DO_CORRUPT=1 ;fi 

  • utils/CI/sette_ticket2673/sette.sh

    r14870 r14873  
    66export CMPL_CORES=8            # Number of threads to use for compiling 
    77dry_run=0 
     8NO_REPORT=0 
    89# 
    910# controls for some common namelist, run-time options: 
    … …  
    3334# Parse command-line arguments 
    3435if [ $# -gt 0 ]; then 
    35   while getopts n:x:v:cdshTzqQteiACFX option; do  
     36  while getopts n:x:v:cdrshTzqQteiACFX option; do  
    3637     case $option in 
    3738        c) export SETTE_CLEAN_CONFIGS='yes' 
    3839           export SETTE_SYNC_CONFIGS='yes' 
    39            echo "-c: 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" 
    4041           echo "";; 
    4142        d) dry_run=1 
    4243           echo "";; 
     44        r) NO_REPORT=1 
     45           echo "";; 
    4346        s) export SETTE_SYNC_CONFIGS='yes' 
    44            echo "-s: MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
    45            echo "";; 
    46         n) export SETTE_TEST_CONFIGS=($OPTARG) 
     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}) 
    4753           echo "==================================" 
    4854           if [ ${#SETTE_TEST_CONFIGS[@]} -gt 1 ]; then 
    … …  
    5258           fi 
    5359           echo "";; 
    54         x) export SETTE_TEST_TYPES=($OPTARG) 
    55            echo "-x: $SETTE_TEST_TYPES tests requested" 
     60        x) export SETTE_TEST_TYPES=(${OPTARG}) 
     61           echo "-x: ${SETTE_TEST_TYPES[@]} tests requested" 
    5662           echo "";; 
    5763        v) export SETTE_SUB_VAL=($OPTARG) 
    … …  
    107113               echo '-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)' 
    108114               echo '-v "subdir" optional validation record subdirectory to be created below NEMO_VALIDATION_DIR' 
     115               echo '-r to execute without waiting to run sette_rpt.sh at the end (useful for chaining sette.sh invocations)' 
    109116               echo '-d to perform a dryrun to simply report what settings will be used' 
    110117               echo '-c to clean each configuration' 
    … …  
    213220fi 
    214221 
     222if [ ${NO_REPORT} -ne 0 ] ; then exit ; fi 
    215223# run sette report 
    216224echo "" 

  • utils/CI/sette_ticket2673/sette_reference-configurations.sh

    r14870 r14873  
    127127# WED025            : regional configuration including sea-ice and tides (Spitzbergen) 
    128128 
     129. ./all_functions.sh 
    129130for config in ${TEST_CONFIGS[@]} 
    130131do 
    … …  
    133134# GYRE_PISCES 
    134135# ----------- 
    135 if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    136 ## Restartability tests for GYRE_PISCES 
     136if [ ${config} == "GYRE_PISCES" ] ;  then 
    137137    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    138138    then 
    … …  
    142142    fi 
    143143    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    144     export TEST_NAME="LONG" 
    145144    cd ${MAIN_DIR} 
    146145    # 
    147146    # syncronisation if target directory/file exist (not done by makenemo) 
    148     . ${SETTE_DIR}/all_functions.sh 
    149147    sync_config  GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
    150148    clean_config GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
    … …  
    152150    # GYRE uses linssh so remove key_qco if added by default 
    153151    . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    154     cd ${SETTE_DIR} 
    155     . ./all_functions.sh 
     152fi 
     153if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     154## Restartability tests for GYRE_PISCES 
     155    export TEST_NAME="LONG" 
     156    cd ${SETTE_DIR} 
    156157    . ./prepare_exe_dir.sh 
    157158    set_valid_dir 
    … …  
    216217    cd ${MAIN_DIR} 
    217218    cd ${SETTE_DIR} 
    218     . ./all_functions.sh 
    219219    . ./prepare_exe_dir.sh 
    220220    set_valid_dir 
    … …  
    268268# ORCA2_ICE_PISCES 
    269269# ----------------- 
    270 if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    271 ## Restartability tests for ORCA2_ICE_PISCES 
     270if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
    272271    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    273272    then 
    … …  
    277276    fi 
    278277    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    279     export TEST_NAME="LONG" 
    280278    cd ${MAIN_DIR} 
    281279    # 
    282280    # syncronisation if target directory/file exist (not done by makenemo) 
    283     . ${SETTE_DIR}/all_functions.sh 
    284281    sync_config  ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    285282    clean_config ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    286283    # 
    287284    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    288     cd ${SETTE_DIR} 
    289     . ./all_functions.sh 
     285fi 
     286if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     287## Restartability tests for ORCA2_ICE_PISCES 
     288    export TEST_NAME="LONG" 
     289    cd ${SETTE_DIR} 
    290290    . ./prepare_exe_dir.sh 
    291291    set_valid_dir 
    … …  
    400400    cd ${MAIN_DIR} 
    401401    cd ${SETTE_DIR} 
    402     . ./all_functions.sh 
    403402    . ./prepare_exe_dir.sh 
    404403    set_valid_dir 
    … …  
    491490# ORCA2_OFF_PISCES 
    492491# ---------------- 
    493 if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    494 ## Restartability tests for ORCA2_OFF_PISCES 
     492if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
    495493    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    496494    then 
    … …  
    500498    fi 
    501499    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    502     export TEST_NAME="LONG" 
    503500    cd ${MAIN_DIR} 
    504501    # 
    505502    # syncronisation if target directory/file exist (not done by makenemo) 
    506     . ${SETTE_DIR}/all_functions.sh 
    507503    sync_config  ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
    508504    clean_config ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
    … …  
    510506    # ORCA2_OFF_PISCES uses linssh so remove key_qco if added by default 
    511507    . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST -r ORCA2_OFF_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    512     cd ${SETTE_DIR} 
    513     . ./all_functions.sh 
     508fi 
     509if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
     510## Restartability tests for ORCA2_OFF_PISCES 
     511    export TEST_NAME="LONG" 
     512    cd ${SETTE_DIR} 
    514513    . ./prepare_exe_dir.sh 
    515514    set_valid_dir 
    … …  
    591590    cd ${MAIN_DIR} 
    592591    cd ${SETTE_DIR} 
    593     . ./all_functions.sh 
    594592    . ./prepare_exe_dir.sh 
    595593    set_valid_dir 
    … …  
    665663# AMM12 
    666664# ----- 
    667 if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
    668     ## Restartability tests for AMM12 
     665if [ ${config} == "AMM12" ] ;  then 
    669666    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    670667    then 
    … …  
    674671    fi 
    675672    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    676     export TEST_NAME="LONG" 
    677673    cd ${MAIN_DIR} 
    678674    # 
    679675    # syncronisation if target directory/file exist (not done by makenemo) 
    680     . ${SETTE_DIR}/all_functions.sh 
    681676    sync_config  AMM12 AMM12_ST 'cfgs' 
    682677    clean_config AMM12 AMM12_ST 'cfgs' 
    683678    # 
    684679    . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    685     cd ${SETTE_DIR} 
    686     . ./all_functions.sh 
     680fi 
     681if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
     682    ## Restartability tests for AMM12 
     683    export TEST_NAME="LONG" 
     684    cd ${SETTE_DIR} 
    687685    . ./prepare_exe_dir.sh 
    688686    set_valid_dir 
    … …  
    740738    cd ${MAIN_DIR} 
    741739    cd ${SETTE_DIR} 
    742     . ./all_functions.sh 
    743740    . ./prepare_exe_dir.sh 
    744741    set_valid_dir 
    … …  
    785782 
    786783# --------- 
    787 # ORCA2_SAS 
     784# ORCA2_SAS_ICE 
    788785# --------- 
    789 if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
    790 ## Restartability tests 
     786if [ ${config} == "SAS" ] ;  then 
    791787    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    792788    then 
    … …  
    796792    fi 
    797793    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    798     export TEST_NAME="LONG" 
    799794    cd ${MAIN_DIR} 
    800795    # 
    801796    # syncronisation if target directory/file exist (not done by makenemo) 
    802     . ${SETTE_DIR}/all_functions.sh 
    803797    sync_config  ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
    804798    clean_config ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
    … …  
    806800    # ORCA2_SAS_ICE uses linssh so remove key_qco if added by default 
    807801    . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    808     cd ${SETTE_DIR} 
    809     . ./all_functions.sh 
     802fi 
     803if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     804## Restartability tests 
     805    export TEST_NAME="LONG" 
     806    cd ${SETTE_DIR} 
    810807    . ./prepare_exe_dir.sh 
    811808    set_valid_dir 
    … …  
    872869    cd ${MAIN_DIR} 
    873870    cd ${SETTE_DIR} 
    874     . ./all_functions.sh 
    875871    . ./prepare_exe_dir.sh 
    876872    set_valid_dir 
    … …  
    923919## Test assimilation interface code, OBS and ASM for reproducibility 
    924920## Restartability not tested (ASM code not restartable while increments are being applied) 
    925 if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     921if [ ${config} == "ORCA2_ICE_OBS" ] ;  then 
    926922## Reproducibility tests 
    927923    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    931927   ITEND=80  # 5 days 
    932928    fi 
    933     export TEST_NAME="REPRO_4_8" 
    934929    cd ${MAIN_DIR} 
    935930    # 
    936931    # syncronisation if target directory/file exist (not done by makenemo) 
    937     . ${SETTE_DIR}/all_functions.sh 
    938932    sync_config  ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    939933    clean_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    940934    # 
    941935    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j ${CMPL_CORES} add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}" 
    942     cd ${SETTE_DIR} 
    943     . ./all_functions.sh 
     936fi 
     937if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ;  then 
     938## Reproducibility tests 
     939    export TEST_NAME="REPRO_4_8" 
     940    cd ${SETTE_DIR} 
    944941    . ./prepare_exe_dir.sh 
    945942    set_valid_dir 
    … …  
    10341031# AGRIF ICE 
    10351032# ----------- 
    1036 if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    1037 ## Restartability tests 
     1033if [ ${config} == "AGRIF" ] ;  then 
    10381034    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    10391035    then 
    … …  
    10461042    ITRST_2=$( printf "%08d" $(( ${ITEND} * 4 / 2 )) ) 
    10471043    ITRST_3=$( printf "%08d" $(( ${ITEND} * 4 * 3 / 2 )) ) 
    1048     export TEST_NAME="LONG" 
    10491044    cd ${MAIN_DIR} 
    10501045    # 
    10511046    # syncronisation if target directory/file exist (not done by makenemo) 
    1052     . ${SETTE_DIR}/all_functions.sh 
    10531047    sync_config  AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
    10541048    clean_config AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
    10551049    # 
    10561050    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    1057     cd ${SETTE_DIR} 
    1058     . ./all_functions.sh 
     1051fi 
     1052if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
     1053## Restartability tests 
     1054    export TEST_NAME="LONG" 
     1055    cd ${SETTE_DIR} 
    10591056    . ./prepare_exe_dir.sh 
    10601057    set_valid_dir 
    … …  
    11591156    cd ${MAIN_DIR} 
    11601157    cd ${SETTE_DIR} 
    1161     . ./all_functions.sh 
    11621158    . ./prepare_exe_dir.sh 
    11631159    set_valid_dir 
    … …  
    12531249    cd ${MAIN_DIR} 
    12541250    cd ${SETTE_DIR} 
    1255     . ./all_functions.sh 
    12561251    . ./prepare_exe_dir.sh 
    12571252    set_valid_dir 
    … …  
    12851280    # 
    12861281    # syncronisation if target directory/file exist (not done by makenemo) 
    1287     . ${SETTE_DIR}/all_functions.sh 
    12881282    sync_config  AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    12891283    clean_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    … …  
    12911285    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "key_agrif ${DEL_KEYS}" 
    12921286    cd ${SETTE_DIR} 
    1293     . ./all_functions.sh 
    12941287    . ./prepare_exe_dir.sh 
    12951288    set_valid_dir 
    … …  
    13161309# WED025 
    13171310# ------- 
    1318 if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 
    1319 ## Restartability tests 
     1311if [ ${config} == "WED025" ] ;  then 
    13201312    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    13211313    then 
    … …  
    13251317    fi 
    13261318    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    1327     export TEST_NAME="LONG" 
    13281319    cd ${MAIN_DIR} 
    13291320    # 
    13301321    # syncronisation if target directory/file exist (not done by makenemo) 
    1331     . ${SETTE_DIR}/all_functions.sh 
    13321322    sync_config  WED025 WED025_ST 'cfgs' 
    13331323    clean_config WED025 WED025_ST 'cfgs' 
    … …  
    13351325    # WED025 uses ln_hpg_isf so remove key_qco if added by default 
    13361326    . ./makenemo -m ${CMP_NAM} -n WED025_ST -r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    1337     cd ${SETTE_DIR} 
    1338     . ./all_functions.sh 
     1327fi 
     1328if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 
     1329## Restartability tests 
     1330    export TEST_NAME="LONG" 
     1331    cd ${SETTE_DIR} 
    13391332    . ./prepare_exe_dir.sh 
    13401333    set_valid_dir 
    … …  
    13951388    cd ${MAIN_DIR} 
    13961389    cd ${SETTE_DIR} 
    1397     . ./all_functions.sh 
    13981390    . ./prepare_exe_dir.sh 
    13991391    set_valid_dir 

  • utils/CI/sette_ticket2673/sette_test-cases.sh

    r14869 r14873  
    127127# WAD 
    128128 
     129. ./all_functions.sh 
    129130for config in ${TEST_CONFIGS[@]} 
    130131do 
    … …  
    133134#  OVERFLOW 
    134135# --------- 
    135 if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
    136     ## Restartability tests for OVERFLOW 
     136if [ ${config} == "OVERFLOW" ] ;  then 
    137137    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    138138    then 
    … …  
    142142    fi 
    143143    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     144    cd ${MAIN_DIR} 
     145    # 
     146    # 
     147    clean_config OVERFLOW OVERFLOW_ST 'tests' 
     148    # 
     149    sync_config  OVERFLOW OVERFLOW_ST 'tests' 
     150    # 
     151    . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     152fi 
     153if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
     154    ## Restartability tests for OVERFLOW 
    144155    export TEST_NAME="LONG" 
    145     cd ${MAIN_DIR} 
    146     # 
    147     . ${SETTE_DIR}/all_functions.sh 
    148     # 
    149     clean_config OVERFLOW OVERFLOW_ST 'tests' 
    150     # 
    151     sync_config  OVERFLOW OVERFLOW_ST 'tests' 
    152     # 
    153     . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    154     cd ${SETTE_DIR} 
    155     . ./all_functions.sh 
     156    cd ${SETTE_DIR} 
    156157    . ./prepare_exe_dir.sh 
    157158    set_valid_dir 
    … …  
    215216         ## 
    216217        cd ${SETTE_DIR} 
    217         . ./all_functions.sh 
    218218        . ./prepare_exe_dir.sh 
    219219        set_valid_dir 
    … …  
    240240#  LOCK_EXCHANGE 
    241241# -------------- 
    242 if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
    243     ## Restartability tests for LOCK_EXCHANGE 
     242if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
    244243    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    245244    then 
    … …  
    249248    fi 
    250249    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     250    cd ${MAIN_DIR} 
     251    # 
     252    # syncronisation if target directory/file exist (not done by makenemo) 
     253    # 
     254    clean_config LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
     255    # 
     256    sync_config  LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
     257    # 
     258    . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     259fi 
     260if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
     261    ## Restartability tests for LOCK_EXCHANGE 
    251262    export TEST_NAME="LONG" 
    252     cd ${MAIN_DIR} 
    253     # 
    254     # syncronisation if target directory/file exist (not done by makenemo) 
    255     . ${SETTE_DIR}/all_functions.sh 
    256     # 
    257     clean_config LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
    258     # 
    259     sync_config  LOCK_EXCHANGE LOCK_EXCHANGE_ST 'tests' 
    260     # 
    261     . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    262     cd ${SETTE_DIR} 
    263     . ./all_functions.sh 
     263    cd ${SETTE_DIR} 
    264264    . ./prepare_exe_dir.sh 
    265265    set_valid_dir 
    … …  
    323323        ##   
    324324        cd ${SETTE_DIR} 
    325         . ./all_functions.sh 
    326325        . ./prepare_exe_dir.sh 
    327326        set_valid_dir 
    … …  
    349348# VORTEX 
    350349# --------- 
    351 if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
    352 ## Restartability tests for VORTEX 
     350if [ ${config} == "VORTEX" ] ;  then 
    353351    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    354352    then 
    … …  
    359357    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
    360358    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
     359    cd ${MAIN_DIR} 
     360    # 
     361    # syncronisation if target directory/file exist (not done by makenemo) 
     362    # 
     363    clean_config VORTEX VORTEX_ST 'tests' 
     364    # 
     365    sync_config  VORTEX VORTEX_ST 'tests' 
     366    # 
     367    . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     368fi 
     369if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
     370## Restartability tests for VORTEX 
    361371    export TEST_NAME="LONG" 
    362     cd ${MAIN_DIR} 
    363     # 
    364     # syncronisation if target directory/file exist (not done by makenemo) 
    365     . ${SETTE_DIR}/all_functions.sh 
    366     # 
    367     clean_config VORTEX VORTEX_ST 'tests' 
    368     # 
    369     sync_config  VORTEX VORTEX_ST 'tests' 
    370     # 
    371     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    372     cd ${SETTE_DIR} 
    373     . ./all_functions.sh 
     372    cd ${SETTE_DIR} 
    374373    . ./prepare_exe_dir.sh 
    375374    set_valid_dir 
    … …  
    445444    cd ${MAIN_DIR} 
    446445    cd ${SETTE_DIR} 
    447     . ./all_functions.sh 
    448446    . ./prepare_exe_dir.sh 
    449447    set_valid_dir 
    … …  
    519517# ICE_AGRIF 
    520518# --------- 
    521 if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    522 ## Restartability tests for ICE_AGRIF 
     519if [ ${config} == "ICE_AGRIF" ] ;  then 
    523520    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    524521    then 
    … …  
    529526    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
    530527    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
    531     export TEST_NAME="LONG" 
    532528    cd ${MAIN_DIR} 
    533529    # 
    534530    # syncronisation if target directory/file exist (not done by makenemo) 
    535     . ${SETTE_DIR}/all_functions.sh 
    536531    # 
    537532    clean_config ICE_AGRIF ICE_AGRIF_ST 'tests' 
    … …  
    541536    # ICE_AGRIF uses linssh so remove key_qco if added by default 
    542537    . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j ${CMPL_CORES}  add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    543     cd ${SETTE_DIR} 
    544     . ./all_functions.sh 
     538fi 
     539if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
     540## Restartability tests for ICE_AGRIF 
     541    export TEST_NAME="LONG" 
     542    cd ${SETTE_DIR} 
    545543    . ./prepare_exe_dir.sh 
    546544    set_valid_dir 
    … …  
    625623    cd ${MAIN_DIR} 
    626624    cd ${SETTE_DIR} 
    627     . ./all_functions.sh 
    628625    . ./prepare_exe_dir.sh 
    629626    set_valid_dir 
    … …  
    694691# ISOMIP+ 
    695692# ------ 
    696 if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
    697 ## Restartability tests 
     693if [ ${config} == "ISOMIP+" ] ;  then 
    698694    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    699695    then 
    … …  
    703699    fi 
    704700    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    705     export TEST_NAME="LONG" 
    706701    cd ${MAIN_DIR} 
    707702    # 
    708703    # syncronisation if target directory/file exist (not done by makenemo) 
    709     . ${SETTE_DIR}/all_functions.sh 
    710704    # 
    711705    clean_config ISOMIP+ ISOMIP+_ST 'tests' 
    … …  
    715709    # ISOMIP+ uses ln_hpg_isf so remove key_qco if added by default 
    716710    . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    717     cd ${SETTE_DIR} 
    718     . ./all_functions.sh 
     711fi 
     712if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
     713## Restartability tests 
     714    export TEST_NAME="LONG" 
     715    cd ${SETTE_DIR} 
    719716    . ./prepare_exe_dir.sh 
    720717    set_valid_dir 
    … …  
    778775    cd ${MAIN_DIR} 
    779776    cd ${SETTE_DIR} 
    780     . ./all_functions.sh 
    781777    . ./prepare_exe_dir.sh 
    782778    set_valid_dir 
    … …  
    827823# SWG 
    828824# --------- 
    829 if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes" ] ;  then 
    830 ## Restartability tests for SWG 
     825if [ ${config} == "SWG" ] && [ ${USING_QCO} == "yes" ] ;  then 
    831826    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    832827    then 
    … …  
    836831    fi 
    837832    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
     833    cd ${MAIN_DIR} 
     834    # 
     835    # syncronisation if target directory/file exist (not done by makenemo) 
     836    # 
     837    clean_config SWG SWG_ST 'tests' 
     838    # 
     839    sync_config  SWG SWG_ST 'tests' 
     840    # 
     841    . ./makenemo -m ${CMP_NAM} -n SWG_ST -a SWG -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     842fi 
     843if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes" ] ;  then 
     844## Restartability tests for SWG 
    838845    export TEST_NAME="LONG" 
    839     cd ${MAIN_DIR} 
    840     # 
    841     # syncronisation if target directory/file exist (not done by makenemo) 
    842     . ${SETTE_DIR}/all_functions.sh 
    843     # 
    844     clean_config SWG SWG_ST 'tests' 
    845     # 
    846     sync_config  SWG SWG_ST 'tests' 
    847     # 
    848     . ./makenemo -m ${CMP_NAM} -n SWG_ST -a SWG -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    849     cd ${SETTE_DIR} 
    850     . ./all_functions.sh 
     846    cd ${SETTE_DIR} 
    851847    . ./prepare_exe_dir.sh 
    852848    set_valid_dir 
    … …  
    905901    cd ${MAIN_DIR} 
    906902    cd ${SETTE_DIR} 
    907     . ./all_functions.sh 
    908903    . ./prepare_exe_dir.sh 
    909904    set_valid_dir 
Note: See TracChangeset for help on using the changeset viewer.