Changeset 10747


Ignore:
Timestamp:
2019-03-12T18:00:52+01:00 (19 months ago)
Author:
smueller
Message:

Addition of configurability of the set of active test configurations, see comment 14 of ticket #2239

Location:
NEMO/branches/2019/fix_sette_ticket2239
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/fix_sette_ticket2239/param.cfg

    r10732 r10747  
    1919# generic sette job name 
    2020BATCH_NAME=${SETTE_BATCH_NAME:-sette} 
     21# List of test configurations 
     22TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 SAS ORCA2_ICE_OBS AGRIF SPITZ12 LOCK_EXCHANGE VORTEX ICE_AGRIF ISOMIP"} 
    2123# 
    2224#- FORCING files storing 
  • NEMO/branches/2019/fix_sette_ticket2239/sette.sh

    r10717 r10747  
    33SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    44MAIN_DIR=$(dirname $SETTE_DIR) 
     5 
     6# Parse command-line arguments 
     7# 
     8#  -t "test configurations": select active test configurations 
     9#                            (overrides selection made using 
     10#                            environment variable SETTE_TEST_CONFIGS) 
     11while getopts t: option; do [ $option == "t" ] && export SETTE_TEST_CONFIGS=$OPTARG; done 
     12shift $((OPTIND - 1)) 
     13 
    514. ./param.cfg 
    615 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_reference-configurations.sh

    r10732 r10747  
    141141cd ${SETTE_DIR} 
    142142cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    143 # Description of configuration tested: 
    144 # GYRE_PISCES       :  1  
    145 # ORCA2_ICE_PISCES  :  2  
    146 # ORCA2_OFF_PISCES  :  3  
    147 # AMM12             :  4  
    148 # SAS               :  5 
    149 # ORCA2_ICE_OBS     :  6 
    150 # AGRIF             :  7 & 8  test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific (AGRIF_DEMO) 
    151 #                               and check that key_agrif without zoom = no key_agrif 
    152 # SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen) 
    153  
    154 for config in 1 2 3 4 5 6 7 8 9 
     143# Description of available configurations: 
     144# GYRE_PISCES       : 
     145# ORCA2_ICE_PISCES  : 
     146# ORCA2_OFF_PISCES  : 
     147# AMM12             : 
     148# SAS               : 
     149# ORCA2_ICE_OBS     : 
     150# AGRIF             : test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific (AGRIF_DEMO) 
     151#                       and check that key_agrif without zoom = no key_agrif 
     152# SPITZ12           : regional configuration including sea-ice and tides (Spitzbergen) 
     153 
     154for config in ${TEST_CONFIGS} 
    155155do 
    156156 
     
    158158# GYRE_PISCES 
    159159# ----------- 
    160 if [ ${config} -eq 1 ] ;  then 
     160if [ ${config} == "GYRE_PISCES" ] ;  then 
    161161## Restartability tests for GYRE_PISCES 
    162162    export TEST_NAME="LONG" 
     
    294294# ORCA2_ICE_PISCES 
    295295# ----------------- 
    296 if [ ${config} -eq 2 ] ;  then 
     296if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
    297297## Restartability tests for ORCA2_ICE_PISCES 
    298298    export TEST_NAME="LONG" 
     
    531531# ORCA2_OFF_PISCES 
    532532# ---------------- 
    533 if [ ${config} -eq 3 ] ;  then 
     533if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
    534534## Restartability tests for ORCA2_OFF_PISCES 
    535535    export TEST_NAME="LONG" 
     
    717717# AMM12 
    718718# ----- 
    719 if [ ${config} -eq 4 ] ;  then 
     719if [ ${config} == "AMM12" ] ;  then 
    720720    ## Restartability tests for AMM12 
    721721    export TEST_NAME="LONG" 
     
    840840# ORCA2_SAS 
    841841# --------- 
    842 if [ ${config} -eq 5 ] ;  then 
     842if [ ${config} == "SAS" ] ;  then 
    843843## Restartability tests 
    844844    export TEST_NAME="LONG" 
     
    970970## Test assimilation interface code, OBS and ASM for reproducibility 
    971971## Restartability not tested (ASM code not restartable while increments are being applied) 
    972 if [ ${config} -eq 6 ] ; then 
     972if [ ${config} == "ORCA2_ICE_OBS" ] ; then 
    973973## Reproducibility tests 
    974974    export TEST_NAME="REPRO_4_8" 
     
    10861086# AGRIF ICE 
    10871087# ----------- 
    1088 if [ ${config} -eq 7 ] ;  then 
     1088if [ ${config} == "AGRIF" ] ;  then 
    10891089## Restartability tests 
    10901090    export TEST_NAME="LONG" 
     
    13511351 
    13521352## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 
    1353 if [ ${config} -eq 8 ] ;  then 
     1353if [ ${config} == "AGRIF" ] ;  then 
    13541354    export TEST_NAME="ORCA2" 
    13551355    cd ${MAIN_DIR} 
     
    13861386# SPITZ12 
    13871387# ------- 
    1388 if [ ${config} -eq 9 ] ;  then 
     1388if [ ${config} == "SPITZ12" ] ;  then 
    13891389## Restartability tests 
    13901390    export TEST_NAME="LONG" 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_test-cases.sh

    r10717 r10747  
    143143cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    144144# Description of configuration tested: 
    145 # OVERFLOW       : TEST s-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs  
    146 #                                        & (dynamics) advection schemes: flux form (ubs, centered), vector form (een) 
    147 #                          zps-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs 
    148 #                                        & (dynamics) advection schemes: flux form (ubs, centered), vector form (een, and een + Hollingsworth correction) 
    149 # LOCK_EXCHANGE  : 2 
    150 # VORTEX         : 3 
    151 # ICE_AGRIF      : 4 
    152 # ISOMIP         : 5 
     145# OVERFLOW       : TEST s-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs  
     146#                                     & (dynamics) advection schemes: flux form (ubs, centered), vector form (een) 
     147#                       zps-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs 
     148#                                     & (dynamics) advection schemes: flux form (ubs, centered), vector form (een, and een + Hollingsworth correction) 
     149# LOCK_EXCHANGE  :  
     150# VORTEX         :  
     151# ICE_AGRIF      :  
     152# ISOMIP         :  
    153153# WAD 
    154154 
    155155 
    156 for config in 1 2 3 4 5  
     156for config in ${TEST_CONFIGS} 
    157157do 
    158158 
     
    160160#  OVERFLOW 
    161161# --------- 
    162 if [ ${config} -eq 1 ] ;  then 
     162if [ ${config} == "OVERFLOW" ] ;  then 
    163163    ## Restartability tests for OVERFLOW 
    164164    export TEST_NAME="LONG" 
     
    254254#  LOCK_EXCHANGE 
    255255# -------------- 
    256 if [ ${config} -eq 2 ] ;  then 
     256if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
    257257    ## Restartability tests for LOCK_EXCHANGE 
    258258    export TEST_NAME="LONG" 
     
    349349# VORTEX 
    350350# --------- 
    351 if [ ${config} -eq 3 ] ;  then  
     351if [ ${config} == "VORTEX" ] ;  then  
    352352## Restartability tests for VORTEX 
    353353    export TEST_NAME="LONG" 
     
    522522# ICE_AGRIF 
    523523# --------- 
    524 if [ ${config} -eq 4 ] ;  then  
     524if [ ${config} == "ICE_AGRIF" ] ;  then  
    525525## Restartability tests for ICE_AGRIF 
    526526    export TEST_NAME="LONG" 
     
    703703# ISOMIP 
    704704# ------ 
    705 if [ ${config} -eq 5 ] ;  then 
     705if [ ${config} == "ISOMIP" ] ;  then 
    706706## Restartability tests 
    707707    export TEST_NAME="LONG" 
Note: See TracChangeset for help on using the changeset viewer.