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 11161 for utils/CI/sette/sette_test-cases.sh – NEMO

Ignore:
Timestamp:
2019-06-20T18:55:23+02:00 (5 years ago)
Author:
mathiot
Message:

merge fix_sette_ticket2239 : major simplification/improvement of SETTE (see README.rst for all the details), tested with the latest version of the trunk (r11160) (ticket #2239)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r10575 r11161  
    1212# Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    1313# ---------------------------------------------------------------------- 
    14 # 
    1514# 
    1615############################################################# 
    … …  
    6968#                       in sette_test-cases.sh. (each test in executed in its own directory) 
    7069# 
     70#  set_valid_dir       : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
     71# 
     72#  clean_valid_dir    : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
     73#                       ( not doing it could lead to false positive ) 
     74# 
    7175#  prepare_job.sh     : to generate the script run_job.sh 
    7276# 
    … …  
    9094######################################################################################### 
    9195# 
    92 # Compiler among those in NEMOGCM/ARCH 
    93 COMPILER=X64_ADA 
    94  
    95 export BATCH_COMMAND_PAR="llsubmit" 
    96 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     96# LOAD param value 
     97SETTE_DIR=$(cd $(dirname "$0"); pwd) 
     98MAIN_DIR=$(dirname $SETTE_DIR) 
     99. ./param.cfg 
     100 
     101export BATCH_COMMAND_PAR=${BATCH_CMD} 
     102export BATCH_COMMAND_SEQ=${BATCH_CMD} 
    97103export INTERACT_FLAG="no" 
    98104export MPIRUN_FLAG="yes" 
    99 export USING_XIOS="yes" 
    100105# 
    101106export DEL_KEYS="key_iomput" 
    … …  
    105110fi 
    106111# 
     112export ADD_KEYS="" 
     113if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
     114 then 
     115   export ADD_KEYS="key_nosignedzero" 
     116fi 
     117# 
    107118# Settings which control the use of stand alone servers (only relevant if using xios) 
    108119# 
    109 export USING_MPMD="no" 
    110120export NUM_XIOSERVERS=4 
    111 export JOB_PREFIX=batch-mpmd 
     121export JOB_PREFIX=${JOB_PREFIX_MPMD} 
    112122# 
    113123if [ ${USING_MPMD} == "no" ]  
    114124 then 
    115125   export NUM_XIOSERVERS=0 
    116    export JOB_PREFIX=batch 
     126   export JOB_PREFIX=${JOB_PREFIX_NOMPMD} 
    117127fi 
    118128# 
    119129# 
    120 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no"] 
     130if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    121131 then 
    122132   echo "Incompatible choices. MPMD mode requires the XIOS server" 
    … …  
    125135 
    126136# Directory to run the tests 
    127 SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    128 MAIN_DIR=$(dirname $SETTE_DIR) 
    129137CONFIG_DIR0=${MAIN_DIR}/cfgs 
    130138TOOLS_DIR=${MAIN_DIR}/tools 
    … …  
    135143cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    136144# Description of configuration tested: 
    137 # OVERFLOW       : 1  TEST s-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs  
    138 #                                        & (dynamics) advection schemes: flux form (ubs, centered), vector form (een) 
    139 #                          zps-coordinates : (tracers) Advection schemes: FCT2, FCT4, ubs 
    140 #                                        & (dynamics) advection schemes: flux form (ubs, centered), vector form (een, and een + Hollingsworth correction) 
    141 # LOCK_EXCHANGE  : 2 
    142 # VORTEX         : 3 
    143 # ICE_AGRIF      : 4 
    144 # 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         :  
    145153# WAD 
    146154 
    147155 
    148 for config in 1 2 3 4 5  
     156for config in ${TEST_CONFIGS} 
    149157do 
    150158 
    … …  
    152160#  OVERFLOW 
    153161# --------- 
    154 if [ ${config} -eq 1 ] ;  then 
     162if [ ${config} == "OVERFLOW" ] ;  then 
    155163    ## Restartability tests for OVERFLOW 
    156164    export TEST_NAME="LONG" 
    157165    cd ${MAIN_DIR} 
    158     . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 del_key ${DEL_KEYS} 
     166    . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    159167    cd ${SETTE_DIR} 
    160168    . ./param.cfg 
    161169    . ./all_functions.sh 
    162170    . ./prepare_exe_dir.sh 
     171    set_valid_dir 
     172    clean_valid_dir 
    163173    JOB_FILE=${EXE_DIR}/run_job.sh 
    164174    NPROC=1 
    … …  
    178188    fi 
    179189    cd ${SETTE_DIR} 
    180     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     190    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    181191 
    182192    cd ${SETTE_DIR} 
    183193    export TEST_NAME="SHORT" 
    184194    . ./prepare_exe_dir.sh 
     195    set_valid_dir 
     196    clean_valid_dir 
    185197    cd ${EXE_DIR} 
    186198    set_namelist namelist_cfg cn_exp \"OVF_SHORT\" 
    … …  
    202214 
    203215    cd ${SETTE_DIR} 
    204     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     216    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    205217    cd ${SETTE_DIR} 
    206218    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    221233        . ./all_functions.sh 
    222234        . ./prepare_exe_dir.sh 
     235        set_valid_dir 
     236        clean_valid_dir 
    223237        JOB_FILE=${EXE_DIR}/run_job.sh 
    224238        NPROC=1 
    … …  
    233247        fi 
    234248        cd ${SETTE_DIR} 
    235         . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     249        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    236250        cd ${SETTE_DIR} 
    237251        . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    243257#  LOCK_EXCHANGE 
    244258# -------------- 
    245 if [ ${config} -eq 2 ] ;  then 
     259if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
    246260    ## Restartability tests for LOCK_EXCHANGE 
    247261    export TEST_NAME="LONG" 
    248262    cd ${MAIN_DIR} 
    249     . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 del_key ${DEL_KEYS} 
     263    . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    250264    cd ${SETTE_DIR} 
    251265    . ./param.cfg 
    252266    . ./all_functions.sh 
    253267    . ./prepare_exe_dir.sh 
     268    set_valid_dir 
     269    clean_valid_dir 
    254270    JOB_FILE=${EXE_DIR}/run_job.sh 
    255271    NPROC=1 
    … …  
    269285    fi 
    270286    cd ${SETTE_DIR} 
    271     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     287    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    272288 
    273289    cd ${SETTE_DIR} 
    274290    export TEST_NAME="SHORT" 
    275291    . ./prepare_exe_dir.sh 
     292    set_valid_dir 
     293    clean_valid_dir 
    276294    cd ${EXE_DIR} 
    277295    set_namelist namelist_cfg cn_exp \"LOCK_SHORT\" 
    … …  
    293311 
    294312    cd ${SETTE_DIR} 
    295     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     313    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    296314    cd ${SETTE_DIR} 
    297315    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    312330        . ./all_functions.sh 
    313331        . ./prepare_exe_dir.sh 
     332        set_valid_dir 
     333        clean_valid_dir 
    314334        JOB_FILE=${EXE_DIR}/run_job.sh 
    315335        NPROC=1 
    … …  
    324344        fi 
    325345        cd ${SETTE_DIR} 
    326         . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     346        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    327347        cd ${SETTE_DIR} 
    328348        . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    335355# VORTEX 
    336356# --------- 
    337 if [ ${config} -eq 3 ] ;  then  
     357if [ ${config} == "VORTEX" ] ;  then  
    338358## Restartability tests for VORTEX 
    339359    export TEST_NAME="LONG" 
    340360    cd ${MAIN_DIR} 
    341     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  del_key ${DEL_KEYS} 
     361    . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    342362    cd ${SETTE_DIR} 
    343363    . ./param.cfg 
    344364    . ./all_functions.sh 
    345365    . ./prepare_exe_dir.sh 
     366    set_valid_dir 
     367    clean_valid_dir 
    346368    JOB_FILE=${EXE_DIR}/run_job.sh 
    347369    NPROC=6 
    … …  
    370392    fi 
    371393    cd ${SETTE_DIR} 
    372     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     394    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    373395     
    374396    cd ${SETTE_DIR} 
    375397    export TEST_NAME="SHORT" 
    376398    . ./prepare_exe_dir.sh 
     399    set_valid_dir 
     400    clean_valid_dir 
    377401    cd ${EXE_DIR} 
    378402    set_namelist namelist_cfg cn_exp \"VORTEX_SHORT\" 
    … …  
    415439    fi 
    416440    cd ${SETTE_DIR} 
    417     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     441    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    418442    cd ${SETTE_DIR} 
    419443    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    426450    . ./all_functions.sh 
    427451    . ./prepare_exe_dir.sh 
     452    set_valid_dir 
     453    clean_valid_dir 
    428454    JOB_FILE=${EXE_DIR}/run_job.sh 
    429455    NPROC=6 
    … …  
    456482    fi 
    457483    cd ${SETTE_DIR} 
    458     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     484    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    459485    cd ${SETTE_DIR} 
    460486    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    463489    export TEST_NAME="REPRO_3_2" 
    464490    . ./prepare_exe_dir.sh 
     491    set_valid_dir 
     492    clean_valid_dir 
    465493    JOB_FILE=${EXE_DIR}/run_job.sh 
    466494    NPROC=6 
    … …  
    494522    fi 
    495523    cd ${SETTE_DIR} 
    496     . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     524    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    497525    cd ${SETTE_DIR} 
    498526    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    504532# ICE_AGRIF 
    505533# --------- 
    506 if [ ${config} -eq 4 ] ;  then  
     534if [ ${config} == "ICE_AGRIF" ] ;  then  
    507535## Restartability tests for ICE_AGRIF 
    508536    export TEST_NAME="LONG" 
    509537    cd ${MAIN_DIR} 
    510     . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  del_key ${DEL_KEYS} 
     538    . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    511539    cd ${SETTE_DIR} 
    512540    . ./param.cfg 
    513541    . ./all_functions.sh 
    514542    . ./prepare_exe_dir.sh 
     543    set_valid_dir 
     544    clean_valid_dir 
    515545    JOB_FILE=${EXE_DIR}/run_job.sh 
    516546    NPROC=6 
    … …  
    539569    fi 
    540570    cd ${SETTE_DIR} 
    541     . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     571    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    542572     
    543573    cd ${SETTE_DIR} 
    544574    export TEST_NAME="SHORT" 
    545575    . ./prepare_exe_dir.sh 
     576    set_valid_dir 
     577    clean_valid_dir 
    546578    cd ${EXE_DIR} 
    547579    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_SHORT\" 
    … …  
    592624 
    593625    cd ${SETTE_DIR} 
    594     . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     626    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    595627    cd ${SETTE_DIR} 
    596628    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    604636    . ./all_functions.sh 
    605637    . ./prepare_exe_dir.sh 
     638    set_valid_dir 
     639    clean_valid_dir 
    606640    JOB_FILE=${EXE_DIR}/run_job.sh 
    607641    NPROC=6 
    … …  
    634668    fi 
    635669    cd ${SETTE_DIR} 
    636     . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     670    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    637671    cd ${SETTE_DIR} 
    638672    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    641675    export TEST_NAME="REPRO_3_2" 
    642676    . ./prepare_exe_dir.sh 
     677    set_valid_dir 
     678    clean_valid_dir 
    643679    JOB_FILE=${EXE_DIR}/run_job.sh 
    644680    NPROC=6 
    … …  
    672708    fi 
    673709    cd ${SETTE_DIR} 
    674     . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     710    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    675711    cd ${SETTE_DIR} 
    676712    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    681717# ISOMIP 
    682718# ------ 
    683 if [ ${config} -eq 5 ] ;  then 
     719if [ ${config} == "ISOMIP" ] ;  then 
    684720## Restartability tests 
    685721    export TEST_NAME="LONG" 
    686722    cd ${MAIN_DIR} 
    687     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 del_key ${DEL_KEYS} 
     723    . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    688724    cd ${SETTE_DIR} 
    689725    . ./param.cfg 
    690726    . ./all_functions.sh 
    691727    . ./prepare_exe_dir.sh 
     728    set_valid_dir 
     729    clean_valid_dir 
    692730    JOB_FILE=${EXE_DIR}/run_job.sh 
    693731    NPROC=15 
    … …  
    709747    fi 
    710748    cd ${SETTE_DIR} 
    711     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     749    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    712750 
    713751    cd ${SETTE_DIR} 
    714752    export TEST_NAME="SHORT" 
    715753    . ./prepare_exe_dir.sh 
     754    set_valid_dir 
     755    clean_valid_dir 
    716756    cd ${EXE_DIR} 
    717757    set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\" 
    … …  
    739779 
    740780    cd ${SETTE_DIR} 
    741     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     781    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    742782    cd ${SETTE_DIR} 
    743783    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    750790    . ./all_functions.sh 
    751791    . ./prepare_exe_dir.sh 
     792    set_valid_dir 
     793    clean_valid_dir 
    752794    JOB_FILE=${EXE_DIR}/run_job.sh 
    753795    NPROC=21 
    … …  
    768810    fi 
    769811    cd ${SETTE_DIR} 
    770     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     812    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    771813    cd ${SETTE_DIR} 
    772814    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    775817    export TEST_NAME="REPRO_8_4" 
    776818    . ./prepare_exe_dir.sh 
     819    set_valid_dir 
     820    clean_valid_dir 
    777821    JOB_FILE=${EXE_DIR}/run_job.sh 
    778822    NPROC=32 
    … …  
    793837    fi 
    794838    cd ${SETTE_DIR} 
    795     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     839    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    796840    cd ${SETTE_DIR} 
    797841    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
Note: See TracChangeset for help on using the changeset viewer.