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 14893 – NEMO

Changeset 14893


Ignore:
Timestamp:
2021-05-20T17:48:27+02:00 (3 years ago)
Author:
acc
Message:

Branch sette_ticket2673. Add -g option to supply a 1 character, alphanumeric suffix which is appended to _ST when creating configuration directories. This allows grouping of runtime directories so that chained invocations of sette.sh will not be at risk of interference. I.e. it makes possible a super-sette script such as:
#!/bin/bash
# set -vx
# Simple script to create a full suite of tests
#
./sette.sh -r -g 0 # Full tests - MAIN (using *_ST0 config dirs)
./sette.sh -e -F -t -v HALO1 -g 1 -r # Full tests - with nn_hls=1 (using *_ST1 config dirs)
./sette.sh -i -e -F -t -n ORCA2_ICE_PISCES -v NO_ICB1 -g 2 -r # ORCA2_ICE_PISCES, nn_hls=1, no icebergs (using *_ST2 config dirs)
./sette.sh -i -n ORCA2_ICE_PISCES -v NO_ICB2 -g 3 -r # ORCA2_ICE_PISCES, nn_hls=2, no icebergs (using *_ST3 config dirs)
./sette.sh -C -n ORCA2_ICE_PISCES -v NO_COLL -g 4 -r # ORCA2_ICE_PISCES, nn_hls=2, no collectives (using *_ST4 config dirs)
./sette.sh -q -v NO_QCO -g 5 # Full tests without key_qco (using *_ST5 config dirs)
#
exit

Location:
utils/CI/sette_ticket2673
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • utils/CI/sette_ticket2673/all_functions.sh

    r14870 r14893  
    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     export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF/%_ST/}/${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 

  • utils/CI/sette_ticket2673/sette.sh

    r14887 r14893  
    55MAIN_DIR=$(dirname $SETTE_DIR) 
    66export CMPL_CORES=8            # Number of threads to use for compiling 
     7export SETTE_STG="_ST"         # Base suffix to append to configuration name 
    78dry_run=0 
    89NO_REPORT=0 
    … …  
    3334# Parse command-line arguments 
    3435if [ $# -gt 0 ]; then 
    35   while getopts n:x:v:cdrshTqQteiACFX option; do  
     36  while getopts n:x:v:g:cdrshTqQteiACFX option; do  
    3637     case $option in 
    3738        c) export SETTE_CLEAN_CONFIGS='yes' 
    … …  
    5657             echo "-n: Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
    5758           fi 
     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} 
    5865           echo "";; 
    5966        x) export SETTE_TEST_TYPES=(${OPTARG}) 
    … …  
    109116               echo '              TEST_type choices are: RESTART REPRO CORRUPT PHYSICS - anything else will COMPILE only' 
    110117               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)' 
    111120               echo '-r to execute without waiting to run sette_rpt.sh at the end (useful for chaining sette.sh invocations)' 
    112121               echo '-d to perform a dryrun to simply report what settings will be used' 

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

    r14878 r14893  
    135135# ----------- 
    136136if [ ${config} == "GYRE_PISCES" ] ;  then 
     137    SETTE_CONFIG="GYRE_PISCES"${SETTE_STG} 
    137138    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    138139    then 
    … …  
    145146    # 
    146147    # syncronisation if target directory/file exist (not done by makenemo) 
    147     sync_config  GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
    148     clean_config GYRE_PISCES GYRE_PISCES_ST 'cfgs' 
     148    sync_config  GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 
     149    clean_config GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 
    149150    # 
    150151    # GYRE uses linssh so remove key_qco if added by default 
    151     . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     152    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    152153fi 
    153154if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    273274# ----------------- 
    274275if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
     276    SETTE_CONFIG="ORCA2_ICE_PISCES"${SETTE_STG} 
    275277    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    276278    then 
    … …  
    283285    # 
    284286    # syncronisation if target directory/file exist (not done by makenemo) 
    285     sync_config  ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    286     clean_config ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST 'cfgs' 
    287     # 
    288     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     287    sync_config  ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     288    clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     289    # 
     290    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    289291fi 
    290292if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    495497# ---------------- 
    496498if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
     499    SETTE_CONFIG="ORCA2_OFF_PISCES"${SETTE_STG} 
    497500    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    498501    then 
    … …  
    505508    # 
    506509    # syncronisation if target directory/file exist (not done by makenemo) 
    507     sync_config  ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
    508     clean_config ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST 'cfgs' 
     510    sync_config  ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 
     511    clean_config ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 
    509512    # 
    510513    # ORCA2_OFF_PISCES uses linssh so remove key_qco if added by default 
    511     . ./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}" 
     514    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_OFF_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    512515fi 
    513516if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    671674# ----- 
    672675if [ ${config} == "AMM12" ] ;  then 
     676    SETTE_CONFIG="AMM12"${SETTE_STG} 
    673677    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    674678    then 
    … …  
    681685    # 
    682686    # syncronisation if target directory/file exist (not done by makenemo) 
    683     sync_config  AMM12 AMM12_ST 'cfgs' 
    684     clean_config AMM12 AMM12_ST 'cfgs' 
    685     # 
    686     . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     687    sync_config  AMM12 ${SETTE_CONFIG} 'cfgs' 
     688    clean_config AMM12 ${SETTE_CONFIG} 'cfgs' 
     689    # 
     690    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    687691fi 
    688692if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    796800# --------- 
    797801if [ ${config} == "SAS" ] ;  then 
     802    SETTE_CONFIG="ORCA2_SAS_ICE"${SETTE_STG} 
    798803    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    799804    then 
    … …  
    806811    # 
    807812    # syncronisation if target directory/file exist (not done by makenemo) 
    808     sync_config  ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
    809     clean_config ORCA2_SAS_ICE ORCA2_SAS_ICE_ST 'cfgs' 
     813    sync_config  ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 
     814    clean_config ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 
    810815    # 
    811816    # ORCA2_SAS_ICE uses linssh so remove key_qco if added by default 
    812     . ./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}" 
     817    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_SAS_ICE -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    813818fi 
    814819if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    935940## Restartability not tested (ASM code not restartable while increments are being applied) 
    936941if [ ${config} == "ORCA2_ICE_OBS" ] ;  then 
     942    SETTE_CONFIG="ORCA2_ICE_OBS"${SETTE_STG} 
    937943## Reproducibility tests 
    938944    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    945951    # 
    946952    # syncronisation if target directory/file exist (not done by makenemo) 
    947     sync_config  ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    948     clean_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    949     # 
    950     . ./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}" 
     953    sync_config  ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     954    clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 
     955    # 
     956    . ./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}" 
    951957fi 
    952958if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    10491055# ----------- 
    10501056if [ ${config} == "AGRIF" ] ;  then 
     1057    SETTE_CONFIG="AGRIF_DEMO"${SETTE_STG} 
    10511058    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    10521059    then 
    … …  
    10621069    # 
    10631070    # syncronisation if target directory/file exist (not done by makenemo) 
    1064     sync_config  AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
    1065     clean_config AGRIF_DEMO AGRIF_DEMO_ST 'cfgs' 
     1071    sync_config  AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1072    clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
    10661073    # 
    10671074    # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 
    1068     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 
     1075    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 
    10691076fi 
    10701077if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    12941301## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 
    12951302if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ;  then 
     1303    SETTE_CONFIG="AGRIF_DEMO_NOAGRIF"${SETTE_STG} 
    12961304    export TEST_NAME="ORCA2" 
    12971305    cd ${MAIN_DIR} 
    12981306    # 
    12991307    # syncronisation if target directory/file exist (not done by makenemo) 
    1300     sync_config  AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    1301     clean_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
     1308    sync_config  AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
     1309    clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 
    13021310    # 
    13031311    # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 
    1304     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "key_agrif ${DEL_KEYS}" 
     1312    . ./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}" 
    13051313    cd ${SETTE_DIR} 
    13061314    . ./prepare_exe_dir.sh 
    … …  
    13291337# ------- 
    13301338if [ ${config} == "WED025" ] ;  then 
     1339    SETTE_CONFIG="WED025"${SETTE_STG} 
    13311340    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    13321341    then 
    … …  
    13391348    # 
    13401349    # syncronisation if target directory/file exist (not done by makenemo) 
    1341     sync_config  WED025 WED025_ST 'cfgs' 
    1342     clean_config WED025 WED025_ST 'cfgs' 
     1350    sync_config  WED025 ${SETTE_CONFIG} 'cfgs' 
     1351    clean_config WED025 ${SETTE_CONFIG} 'cfgs' 
    13431352    # 
    13441353    # WED025 uses ln_hpg_isf so remove key_qco if added by default 
    1345     . ./makenemo -m ${CMP_NAM} -n WED025_ST -r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     1354    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    13461355fi 
    13471356if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 

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

    r14879 r14893  
    135135# --------- 
    136136if [ ${config} == "OVERFLOW" ] ;  then 
     137    SETTE_CONFIG="OVERFLOW"${SETTE_STG} 
    137138    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    138139    then 
    … …  
    145146    # 
    146147    # 
    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}" 
     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}" 
    152153fi 
    153154if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    244245# -------------- 
    245246if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
     247    SETTE_CONFIG="LOCK_EXCHANGE"${SETTE_STG} 
    246248    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    247249    then 
    … …  
    255257    # syncronisation if target directory/file exist (not done by makenemo) 
    256258    # 
    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}" 
     259    clean_config LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 
     260    # 
     261    sync_config  LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 
     262    # 
     263    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    262264fi 
    263265if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    355357# --------- 
    356358if [ ${config} == "VORTEX" ] ;  then 
     359    SETTE_CONFIG="VORTEX"${SETTE_STG} 
    357360    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    358361    then 
    … …  
    367370    # syncronisation if target directory/file exist (not done by makenemo) 
    368371    # 
    369     clean_config VORTEX VORTEX_ST 'tests' 
    370     # 
    371     sync_config  VORTEX VORTEX_ST 'tests' 
    372     # 
    373     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     372    clean_config VORTEX ${SETTE_CONFIG} 'tests' 
     373    # 
     374    sync_config  VORTEX ${SETTE_CONFIG} 'tests' 
     375    # 
     376    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a VORTEX -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    374377fi 
    375378if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    532535# --------- 
    533536if [ ${config} == "ICE_AGRIF" ] ;  then 
     537    SETTE_CONFIG="ICE_AGRIF"${SETTE_STG} 
    534538    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    535539    then 
    … …  
    544548    # syncronisation if target directory/file exist (not done by makenemo) 
    545549    # 
    546     clean_config ICE_AGRIF ICE_AGRIF_ST 'tests' 
    547     # 
    548     sync_config  ICE_AGRIF ICE_AGRIF_ST 'tests' 
     550    clean_config ICE_AGRIF ${SETTE_CONFIG} 'tests' 
     551    # 
     552    sync_config  ICE_AGRIF ${SETTE_CONFIG} 'tests' 
    549553    # 
    550554    # ICE_AGRIF uses linssh so remove key_qco if added by default 
    551     . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j ${CMPL_CORES}  add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     555    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ICE_AGRIF -j ${CMPL_CORES}  add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    552556fi 
    553557if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    714718# ------ 
    715719if [ ${config} == "ISOMIP+" ] ;  then 
     720    SETTE_CONFIG="ISOMIP+"${SETTE_STG} 
    716721    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    717722    then 
    … …  
    725730    # syncronisation if target directory/file exist (not done by makenemo) 
    726731    # 
    727     clean_config ISOMIP+ ISOMIP+_ST 'tests' 
    728     # 
    729     sync_config  ISOMIP+ ISOMIP+_ST 'tests' 
     732    clean_config ISOMIP+ ${SETTE_CONFIG} 'tests' 
     733    # 
     734    sync_config  ISOMIP+ ${SETTE_CONFIG} 'tests' 
    730735    # 
    731736    # ISOMIP+ uses ln_hpg_isf so remove key_qco if added by default 
    732     . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
     737    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 
    733738fi 
    734739if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
    … …  
    850855# --------- 
    851856if [ ${config} == "SWG" ] && [ ${USING_QCO} == "yes" ] ;  then 
     857    SETTE_CONFIG="SWG"${SETTE_STG} 
    852858    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    853859    then 
    … …  
    861867    # syncronisation if target directory/file exist (not done by makenemo) 
    862868    # 
    863     clean_config SWG SWG_ST 'tests' 
    864     # 
    865     sync_config  SWG SWG_ST 'tests' 
    866     # 
    867     . ./makenemo -m ${CMP_NAM} -n SWG_ST -a SWG -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     869    clean_config SWG ${SETTE_CONFIG} 'tests' 
     870    # 
     871    sync_config  SWG ${SETTE_CONFIG} 'tests' 
     872    # 
     873    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a SWG -j ${CMPL_CORES}  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    868874fi 
    869875if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes" ] ;  then 
Note: See TracChangeset for help on using the changeset viewer.