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 13568 for utils/CI – NEMO

Changeset 13568 for utils/CI


Ignore:
Timestamp:
2020-10-05T17:22:12+02:00 (4 years ago)
Author:
acc
Message:

Added some new controls for SETTE.

SETTE currently carries out several types of tests: restartability, reproducibility, code
corruption (agrif-related) and, in the case of LOCK_EXCHANGE and OVERFLOW, a series of
runs with different physical options. For quick checking, such as is now the default with
a *DEBUG* arch file, a subset of these tests may be appropriate. This commit provides
that possibility by introducing a new command line option to sette.sh. Without arguments
SETTE will carry out all tests labelled as: "RESTART REPRO CORRUPT PHYOPTS". The
explicit equivalent would be:

./sette.sh -x "RESTART REPRO CORRUPT PHYOPTS"

any subset of these is allowed but RESTART is mandatory (since this compiles the code)
and will be prepended if omitted. For example:

./sette.sh

Configurations ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF WED025 GYRE_PISCES SAS
ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+ will be tested if they
are available

Carrying out the following tests: RESTART REPRO CORRUPT PHYOPTS

Or to test restartability only on one configuration:

./sette.sh -t GYRE_PISCES -x RESTART

Configuration GYRE_PISCES will be tested if it is available

Carrying out the following tests: RESTART

Or trying to test reproducibility on its own will also invoke RESTART:

./sette.sh -t GYRE_PISCES -x REPRO

Configuration GYRE_PISCES will be tested if it is available

Carrying out the following tests: RESTART REPRO

Some subtle changes to the bash scripts have been necessary to achieve
this. Notably, param.cfg is only evaluated by sette.sh and consequently the
sette_reference-configurations.sh and sette_test-cases.sh scripts must now be run within
the same shell as sette.sh. This has been tested but there remains a possibility that
different flavours of bash may behave differently. I will hold off from updating the
svn_external reference for SETTE until this has been confirmed to work elsewhere.

One other change is the addition of an internal setting for USING_EXTRA_HALO which
mimics the USING_ICEBERGS setting within sette_reference-configurations.sh and can be
used to toggle testing with the extra halo.

This commit also introduces a debug arch file for the NOC MOBILIS system. This is an
intel-based system but has a rather dated ifort compiler (17.0.4). The -init=huge
keyword was not introduced until ifort v18. In all other arguments this arch file
matches the set recommened by Seb.

Location:
utils/CI/sette
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • utils/CI/sette/param.cfg

    r13382 r13568  
    7474# LIST OF CONFIGURATIONS 
    7575# to be updated if you added an new configuration in sette_test-cases.sh or sette_reference-configuration.sh 
    76 TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF WED025 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+"} 
     76if [ -z "${TEST_CONFIGS}" ]; then 
     77  export TEST_CONFIGS=(${SETTE_TEST_CONFIGS[@]:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF WED025 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+"}) 
     78fi 
     79# 
     80# TYPES OF TESTS TO PERFORM 
     81export DO_RESTART=1    # The restart test is always needed because this compiles the code 
     82export DO_REPRO=0 
     83export DO_CORRUPT=0 
     84export DO_PHYOPTS=0 
     85TEST_TYPES=(${SETTE_TEST_TYPES[@]:-"RESTART REPRO PHYOPTS CORRUPT"}) 
     86if [[ ! ${TEST_TYPES[*]} =~ .*RESTART.* ]]; then export TEST_TYPES=("RESTART" ${TEST_TYPES[@]}) ;fi 
     87if [[ ${TEST_TYPES[*]} =~ .*REPRO.* ]]; then export DO_REPRO=1 ;fi 
     88if [[ ${TEST_TYPES[*]} =~ .*CORRUPT.* ]]; then export DO_CORRUPT=1 ;fi 
     89if [[ ${TEST_TYPES[*]} =~ .*PHYOPTS.* ]]; then export DO_PHYOPTS=1 ;fi 
    7790# ------------------------------------------------------------------------------------------ 
    7891# 

  • utils/CI/sette/prepare_job.sh

    r13329 r13568  
    185185  #  if [ ${MPI_FLAG} == "no" ] ; then 
    186186      case ${COMPILER} in  
    187          X64_MOBILIS) 
     187         X64_MOBILIS*) 
    188188                                NB_REM=$( echo $NB_PROC $NXIO_PROC | awk '{print ( $1 + $2 ) % 16}') 
    189189               if [ ${NB_REM} == 0 ] ; then 

  • utils/CI/sette/sette.sh

    r12569 r13568  
    66# Parse command-line arguments 
    77if [ $# -gt 0 ]; then 
    8   while getopts t:csh option; do  
     8  while getopts t:x:csh option; do  
    99     case $option in 
    1010        c) export SETTE_CLEAN_CONFIGS='yes' 
    … …  
    1717           echo "MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
    1818           echo "";; 
    19         t) export SETTE_TEST_CONFIGS=$OPTARG 
     19        t) export SETTE_TEST_CONFIGS=($OPTARG) 
    2020           echo "" 
    21            echo "Configuration $SETTE_TEST_CONFIGS will be tested if they are available" 
     21           if [ ${#SETTE_TEST_CONFIGS[@]} -gt 1 ]; then 
     22             echo "Configurations ${SETTE_TEST_CONFIGS[@]} will be tested if they are available" 
     23           else 
     24             echo "Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
     25           fi 
    2226           echo "" ;; 
    23         h | *) echo 'sette.sh allows no arguments (in this case all configuration will be tested)' 
     27        x) export SETTE_TEST_TYPES=($OPTARG) 
     28           ;; 
     29        h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested)' 
    2430               echo '-t "CFG1_to_test CFG2_to_test ..." to test some specific configurations' 
     31               echo '-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)' 
    2532               echo '-c to clean each configuration' 
    2633               echo '-s to synchronise the sette MY_SRC and EXP00 with the reference MY_SRC and EXPREF'; exit 42 ;; 
    … …  
    3239. ./param.cfg 
    3340 
     41if [ ${#SETTE_TEST_CONFIGS[@]} -eq 0 ]; then 
     42   echo "" 
     43   echo "Configurations $TEST_CONFIGS will be tested if they are available" 
     44   echo "" 
     45fi 
     46echo "" 
     47echo "Carrying out the following tests: ${TEST_TYPES[@]}" 
     48echo "" 
     49 
    3450# run sette on reference configuration 
    35 ./sette_reference-configurations.sh 
     51. ./sette_reference-configurations.sh 
    3652if [[ $? != 0 ]]; then 
    3753   echo "" 
    … …  
    4460 
    4561# run sette on test cases 
    46 ./sette_test-cases.sh 
     62. ./sette_test-cases.sh 
    4763if [[ $? != 0 ]]; then 
    4864   echo "" 
    … …  
    6985   else 
    7086      printf "%-50s\n" " " 
    71       ./sette_rpt.sh 
     87      . ./sette_rpt.sh 
    7288      exit 
    7389   fi 

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

    r13559 r13568  
    4545# 
    4646#  param.cfg : sets and loads following directories: 
     47#              This will have been run by the parent sette.sh and values exported here 
    4748# 
    4849#   FORCING_DIR         : is the directory for forcing files (tarfile) 
    … …  
    9596SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    9697MAIN_DIR=$(dirname $SETTE_DIR) 
    97 . ./param.cfg 
    9898 
    9999export BATCH_COMMAND_PAR=${BATCH_CMD} 
    … …  
    102102export MPIRUN_FLAG="yes" 
    103103export USING_ICEBERGS="yes" 
     104export USING_EXTRA_HALO="no" 
    104105# 
    105106export DEL_KEYS="key_iomput" 
    … …  
    152153# WED025           : regional configuration including sea-ice and tides (Spitzbergen) 
    153154 
    154 for config in ${TEST_CONFIGS} 
     155for config in ${TEST_CONFIGS[@]} 
    155156do 
    156157 
    … …  
    158159# GYRE_PISCES 
    159160# ----------- 
    160 if [ ${config} == "GYRE_PISCES" ] ;  then 
     161if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    161162## Restartability tests for GYRE_PISCES 
    162163    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    240241    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    241242 
     243fi 
     244 
     245if [ ${config} == "GYRE_PISCES" ] && [ ${DO_REPRO} == "1" ] ;  then 
    242246## Reproducibility tests for GYRE_PISCES 
    243247    export TEST_NAME="REPRO_2_4" 
    … …  
    303307# ORCA2_ICE_PISCES 
    304308# ----------------- 
    305 if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
     309if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    306310## Restartability tests for ORCA2_ICE_PISCES 
    307311    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    347351    set_namelist namelist_cfg ln_tauwoc .true. 
    348352    # 
    349     if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     353    if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     354    if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
     355    if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
     356    if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    350357    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    351358    # 
    … …  
    393400    set_namelist namelist_cfg ln_tauwoc .true. 
    394401    # 
    395     if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     402    if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     403    if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
     404    if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
     405    if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    396406    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    397407    # 
    … …  
    433443    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    434444 
     445fi 
     446 
     447if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_REPRO} == "1" ] ;  then 
    435448## Reproducibility tests for ORCA2_ICE_PISCES 
    436449    export TEST_NAME="REPRO_4_8" 
    … …  
    460473    set_namelist namelist_cfg ln_tauwoc .true. 
    461474 
    462     if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     475    if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     476    if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
     477    if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
     478    if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    463479    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    464480 
    … …  
    506522    set_namelist namelist_cfg ln_tauwoc .true. 
    507523 
    508     if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     524    if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     525    if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
     526    if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
     527    if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    509528    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    510529 
    … …  
    533552# ORCA2_OFF_PISCES 
    534553# ---------------- 
    535 if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
     554if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ;  then 
    536555## Restartability tests for ORCA2_OFF_PISCES 
    537556    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    630649    . ./fcm_job.sh $NPROC  ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    631650 
     651fi 
     652 
     653if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_REPRO} == "1" ] ;  then 
    632654## Reproducibility tests for ORCA2_OFF_PISCES 
    633655    export TEST_NAME="REPRO_4_8" 
    … …  
    712734# AMM12 
    713735# ----- 
    714 if [ ${config} == "AMM12" ] ;  then 
     736if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ;  then 
    715737    ## Restartability tests for AMM12 
    716738    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    787809    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    788810 
     811fi 
     812 
     813if [ ${config} == "AMM12" ] && [ ${DO_REPRO} == "1" ] ;  then 
    789814## Reproducibility tests for AMM12 
    790815    export TEST_NAME="REPRO_8_4" 
    … …  
    845870# ORCA2_SAS 
    846871# --------- 
    847 if [ ${config} == "SAS" ] ;  then 
     872if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ;  then 
    848873## Restartability tests 
    849874    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    923948    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    924949 
     950fi 
     951 
     952if [ ${config} == "SAS" ] && [ ${DO_REPRO} == "1" ] ;  then 
    925953## Reproducibility tests 
    926954    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    9911019## Test assimilation interface code, OBS and ASM for reproducibility 
    9921020## Restartability not tested (ASM code not restartable while increments are being applied) 
    993 if [ ${config} == "ORCA2_ICE_OBS" ] ; then 
     1021if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ; then 
    9941022## Reproducibility tests 
    9951023    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    11091137# AGRIF ICE 
    11101138# ----------- 
    1111 if [ ${config} == "AGRIF" ] ;  then 
     1139if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    11121140## Restartability tests 
    11131141    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    12341262    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    12351263 
     1264fi 
     1265 
     1266if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ;  then 
    12361267## Reproducibility tests 
    12371268    export TEST_NAME="REPRO_2_8" 
    … …  
    13261357    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    13271358 
     1359fi 
     1360 
     1361if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ;  then 
    13281362## test code corruption with AGRIF (phase 1) ==> Compile with key_agrif but run with no zoom 
    13291363    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    13671401 
    13681402## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 
    1369 if [ ${config} == "AGRIF" ] ;  then 
     1403if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ;  then 
    13701404    export TEST_NAME="ORCA2" 
    13711405    cd ${MAIN_DIR} 
    … …  
    14071441# WED025 
    14081442# ------- 
    1409 if [ ${config} == "WED025" ] ;  then 
     1443if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ;  then 
    14101444## Restartability tests 
    14111445    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    14851519    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    14861520 
     1521fi 
     1522 
     1523if [ ${config} == "WED025" ] && [ ${DO_REPRO} == "1" ] ;  then 
    14871524## Reproducibility tests 
    14881525    export TEST_NAME="REPRO_5_6" 
    … …  
    15441581 
    15451582done 
     1583# 
     1584# Return to SETTE_DIR (last fcm_job.sh will have moved to EXE_DIR) 
     1585cd ${SETTE_DIR} 

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

    r13559 r13568  
    4747# 
    4848#  param.cfg : sets and loads following directories: 
     49#              This will have been run by the parent sette.sh and values exported here 
    4950# 
    5051#   FORCING_DIR         : is the directory for forcing files (tarfile) 
    … …  
    9798SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    9899MAIN_DIR=$(dirname $SETTE_DIR) 
    99 . ./param.cfg 
    100100 
    101101export BATCH_COMMAND_PAR=${BATCH_CMD} 
    … …  
    153153# WAD 
    154154 
    155  
    156 for config in ${TEST_CONFIGS} 
     155for config in ${TEST_CONFIGS[@]} 
    157156do 
    158157 
    … …  
    160159#  OVERFLOW 
    161160# --------- 
    162 if [ ${config} == "OVERFLOW" ] ;  then 
     161if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ;  then 
    163162    ## Restartability tests for OVERFLOW 
    164163    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    229228 
    230229 
     230fi 
     231 
     232if [ ${config} == "OVERFLOW" ] && [ ${DO_PHYOPTS} == "1" ] ;  then 
    231233    ## Test for all advection, vert. coordinates, vector form, flux form: test runability and complete all time steps 
    232234    ## Needed namelist-xxxx for every type of run tested 
    … …  
    275277#  LOCK_EXCHANGE 
    276278# -------------- 
    277 if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
     279if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ;  then 
    278280    ## Restartability tests for LOCK_EXCHANGE 
    279281    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    344346    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    345347 
     348fi 
     349 
     350if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_PHYOPTS} == "1" ] ;  then 
    346351    ## Test for all advection, vector form, flux form: test runability and complete all time steps 
    347352    ## Needed namelist-xxxx for every type of run tested 
     353    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     354    then 
     355   ITEND=12 
     356    else 
     357   ITEND=61200 
     358    fi 
    348359    cd ${CONFIG_DIR}/${NEW_CONF}/EXP00 
    349360 
    … …  
    367378        rm namelist_*_*_*_* 
    368379        cp -pL ${CONFIG_DIR}/${NEW_CONF}/EXP00/$file namelist_cfg 
     380   set_namelist namelist_cfg nn_it000 1 
     381        set_namelist namelist_cfg nn_itend ${ITEND} 
    369382        if [ ${USING_MPMD} == "yes" ] ; then 
    370383           set_xio_using_server iodef.xml true 
    … …  
    384397# VORTEX 
    385398# --------- 
    386 if [ ${config} == "VORTEX" ] ;  then  
     399if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ;  then 
    387400## Restartability tests for VORTEX 
    388401    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    479492    cd ${SETTE_DIR} 
    480493    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     494fi 
     495 
     496if [ ${config} == "VORTEX" ] && [ ${DO_REPRO} == "1" ] ;  then 
    481497 
    482498## Reproducibility tests for VORTEX 
    … …  
    561577# ICE_AGRIF 
    562578# --------- 
    563 if [ ${config} == "ICE_AGRIF" ] ;  then  
     579if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
    564580## Restartability tests for ICE_AGRIF 
    565581    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    665681    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    666682 
     683fi 
     684 
     685if [ ${config} == "ICE_AGRIF" ] && [ ${DO_REPRO} == "1" ] ;  then 
    667686 
    668687## Reproducibility tests for ICE_AGRIF 
    … …  
    746765# ISOMIP+ 
    747766# ------ 
    748 if [ ${config} == "ISOMIP+" ] ;  then 
     767if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ;  then 
    749768## Restartability tests 
    750769    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    823842    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    824843 
     844fi 
     845 
     846if [ ${config} == "ISOMIP+" ] && [ ${DO_REPRO} == "1" ] ;  then 
    825847## Reproducibility tests 
    826848    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
    … …  
    887909#---- 
    888910done 
     911# 
     912# Return to SETTE_DIR (last fcm_job.sh will have moved to EXE_DIR) 
     913cd ${SETTE_DIR} 
Note: See TracChangeset for help on using the changeset viewer.