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

Changeset 10755


Ignore:
Timestamp:
2019-03-14T17:22:12+01:00 (6 years ago)
Author:
mathiot
Message:

changes to avoid messup the validation directory revision number in case revision of the src is changed between the start and the end of the sette job + change order of the config in param to start the slowest config first

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

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

    r10704 r10755  
    110110# clean valid dir (move old ocean_output/run.stat and tracer to avoid checking them in case something wrong happen. 
    111111clean_valid_dir () { 
    112    set_valid_dir 
     112#   set_valid_dir # already done in sette_ref/sette_test 
    113113   echo "validation directory is : $NEMO_VALID" 
    114114   if [ -d $NEMO_VALID ] ; then 
    … …  
    200200echo "EXECUTION directory is : ${EXE_DIR}" 
    201201echo "CONFIG directory is : ${CONFIG_DIR}" 
    202 echo "VALIDATION directory is : ${NEMO_VALIDATION_DIR}" 
     202echo "VALIDATION directory is : ${NEMO_VALID}" 
    203203echo "NEW CONFIGURATION is : ${NEW_CONF}" 
    204204echo "COMPILER is : ${CMP_NAM}" 
    … …  
    231231# 
    232232# Creation of NEMO_VALIDATION tree 
    233     set_valid_dir 
    234     mkdir -p ${NEMO_VALID} 
    235     if [ -d ${NEMO_VALID} ] ; then 
    236    echo "created ${NEMO_VALID} directory"   >> ${SETTE_DIR}/output.sette 
     233#    set_valid_dir already done in sette_reference_config 
     234    mkdir -p ${NEMO_VALIDATION_DIR} 
     235    if [ -d ${NEMO_VALIDATION_DIR} ] ; then 
     236   echo "created ${NEMO_VALIDATION_DIR} directory"   >> ${SETTE_DIR}/output.sette 
    237237    else  
    238    echo "problems in creating ${NEMO_VALID} directory"   >> ${SETTE_DIR}/output.sette 
     238   echo "problems in creating ${NEMO_VALIDATION_DIR} directory"   >> ${SETTE_DIR}/output.sette 
    239239   echo "EXIT," 
    240240   exit 1 
    … …  
    254254    echo "saving ocean & ice output, run.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
    255255    echo "            " >> ${SETTE_DIR}/output.sette 
    256     [ -f ${EXE_DIR}/ocean.output ] && cp ${EXE_DIR}/*ocean.output ${NEMO_VALID}/. 
    257     [ -f ${EXE_DIR}/run.stat ] && cp ${EXE_DIR}/*run.stat ${NEMO_VALID}/. 
    258     [ -f ${EXE_DIR}/output.namelist.dyn ] && cp ${EXE_DIR}/*output.nam* ${NEMO_VALID}/. 
    259     [ -f ${EXE_DIR}/tracer.stat ] && cp ${EXE_DIR}/*tracer.stat ${NEMO_VALID}/. 
    260  
    261     if [ -n "$(ls ${NEMO_VALID}/*run*)" ] ; then 
    262    echo "moved run.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    263    echo "moved run.stat in ${NEMO_VALID} directory"   
     256    [ -f ${EXE_DIR}/ocean.output ] && cp ${EXE_DIR}/*ocean.output ${NEMO_VALIDATION_DIR}/. 
     257    [ -f ${EXE_DIR}/run.stat ] && cp ${EXE_DIR}/*run.stat ${NEMO_VALIDATION_DIR}/. 
     258    [ -f ${EXE_DIR}/output.namelist.dyn ] && cp ${EXE_DIR}/*output.nam* ${NEMO_VALIDATION_DIR}/. 
     259    [ -f ${EXE_DIR}/tracer.stat ] && cp ${EXE_DIR}/*tracer.stat ${NEMO_VALIDATION_DIR}/. 
     260 
     261    if [ -n "$(ls ${NEMO_VALIDATION_DIR}/*run*)" ] ; then 
     262   echo "moved run.stat in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     263   echo "moved run.stat in ${NEMO_VALIDATION_DIR} directory"   
    264264    else 
    265    echo "problem in looking for run.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    266    echo "run.stat IS NOT in ${NEMO_VALID} directory"  
    267     fi 
    268     if [ -n "$(ls ${NEMO_VALID}/*ocean.output*)" ] ; then 
    269    echo "moved ocean.output in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    270    echo "moved ocean.output in ${NEMO_VALID} directory"  
     265   echo "problem in looking for run.stat file in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     266   echo "run.stat IS NOT in ${NEMO_VALIDATION_DIR} directory"  
     267    fi 
     268    if [ -n "$(ls ${NEMO_VALIDATION_DIR}/*ocean.output*)" ] ; then 
     269   echo "moved ocean.output in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     270   echo "moved ocean.output in ${NEMO_VALIDATION_DIR} directory"  
    271271    else 
    272    echo "problem in looking for ocean.output file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    273    echo "ocean.output IS NOT in ${NEMO_VALID} directory"  
    274     fi 
    275     if [ -n "$(ls ${NEMO_VALID}/*tracer.stat*)" ] ; then 
    276         echo "moved tracer.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    277         echo "moved tracer.stat in ${NEMO_VALID} directory" 
     272   echo "problem in looking for ocean.output file in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     273   echo "ocean.output IS NOT in ${NEMO_VALIDATION_DIR} directory"  
     274    fi 
     275    if [ -n "$(ls ${NEMO_VALIDATION_DIR}/*tracer.stat*)" ] ; then 
     276        echo "moved tracer.stat in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     277        echo "moved tracer.stat in ${NEMO_VALIDATION_DIR} directory" 
    278278    else 
    279         echo "problem in looking for tracer.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    280         echo "tracer.stat IS NOT in ${NEMO_VALID} directory" 
     279        echo "problem in looking for tracer.stat file in ${NEMO_VALIDATION_DIR} directory"  >> ${SETTE_DIR}/output.sette 
     280        echo "tracer.stat IS NOT in ${NEMO_VALIDATION_DIR} directory" 
    281281    fi 
    282282} 

  • NEMO/branches/2019/fix_sette_ticket2239/param.cfg

    r10750 r10755  
    2020BATCH_NAME=${SETTE_BATCH_NAME:-sette} 
    2121# List of test configurations 
    22 TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 SAS ORCA2_ICE_OBS AGRIF SPITZ12 OVERFLOW LOCK_EXCHANGE VORTEX ICE_AGRIF ISOMIP"} 
     22TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF SPITZ12 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP"} 
    2323# 
    2424#- FORCING files storing 

  • NEMO/branches/2019/fix_sette_ticket2239/prepare_job.sh

    r9663 r10755  
    9494JOB_FILE=$5 
    9595NXIO_PROC=$6 
     96NEMO_VALID=$7 
    9697 
    9798# export EXE_DIR. This directory is used to execute model  
    … …  
    303304             -e"s:DEF_TOOLS_DIR:${TOOLS_DIR}:" \ 
    304305             -e"s:MPI_FLAG:${MPI_FLAG}:" \ 
    305              -e"s:DEF_NEMO_VALIDATION:${NEMO_VALIDATION_DIR}:" -e"s:DEF_NEW_CONF:${NEW_CONF}:" \ 
     306             -e"s:DEF_NEMO_VALIDATION:${NEMO_VALID}:" -e"s:DEF_NEW_CONF:${NEW_CONF}:" \ 
    306307             -e"s:DEF_CMP_NAM:${CMP_NAM}:" -e"s:DEF_TEST_NAME:${TEST_NAME}:" > run_sette_test.job 
    307308 

  • NEMO/branches/2019/fix_sette_ticket2239/sette_reference-configurations.sh

    r10750 r10755  
    6666#                       in sette.sh. (each test in executed in its own directory) 
    6767# 
     68#  set_valid_dir       : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
     69# 
    6870#  clean_valid_dir    : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
    6971#                       ( not doing it could lead to false positive ) 
    … …  
    167169    . ./all_functions.sh 
    168170    . ./prepare_exe_dir.sh 
     171    set_valid_dir 
    169172    clean_valid_dir 
    170173    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    189192    fi 
    190193    cd ${SETTE_DIR} 
    191     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     194    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    192195 
    193196    cd ${SETTE_DIR} 
    194197    export TEST_NAME="SHORT" 
    195198    . ./prepare_exe_dir.sh 
     199    set_valid_dir 
    196200    clean_valid_dir 
    197201    cd ${EXE_DIR} 
    … …  
    225229    done 
    226230    cd ${SETTE_DIR} 
    227     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     231    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    228232    cd ${SETTE_DIR} 
    229233    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    236240    . ./all_functions.sh 
    237241    . ./prepare_exe_dir.sh 
     242    set_valid_dir 
    238243    clean_valid_dir 
    239244    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    257262    fi 
    258263    cd ${SETTE_DIR} 
    259     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     264    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    260265    cd ${SETTE_DIR} 
    261266    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    264269    export TEST_NAME="REPRO_4_2" 
    265270    . ./prepare_exe_dir.sh 
     271    set_valid_dir 
    266272    clean_valid_dir 
    267273    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    285291    fi 
    286292    cd ${SETTE_DIR} 
    287     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     293    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    288294    cd ${SETTE_DIR} 
    289295    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    303309    . ./all_functions.sh 
    304310    . ./prepare_exe_dir.sh 
     311    set_valid_dir 
    305312    clean_valid_dir 
    306313    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    350357    fi 
    351358    cd ${SETTE_DIR} 
    352     . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     359    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    353360     
    354361    cd ${SETTE_DIR} 
    355362    export TEST_NAME="SHORT" 
    356363    . ./prepare_exe_dir.sh 
     364    set_valid_dir 
    357365    clean_valid_dir 
    358366    cd ${EXE_DIR} 
    … …  
    417425    fi 
    418426    cd ${SETTE_DIR} 
    419     . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     427    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    420428    cd ${SETTE_DIR} 
    421429    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    428436    . ./all_functions.sh 
    429437    . ./prepare_exe_dir.sh 
     438    set_valid_dir 
    430439    clean_valid_dir 
    431440    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    472481    fi 
    473482    cd ${SETTE_DIR} 
    474     . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     483    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    475484    cd ${SETTE_DIR} 
    476485    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    479488    export TEST_NAME="REPRO_8_4" 
    480489    . ./prepare_exe_dir.sh 
     490    set_valid_dir 
    481491    clean_valid_dir 
    482492    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    523533    fi 
    524534    cd ${SETTE_DIR} 
    525     . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     535    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    526536    cd ${SETTE_DIR} 
    527537    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    540550    . ./all_functions.sh 
    541551    . ./prepare_exe_dir.sh 
     552    set_valid_dir 
    542553    clean_valid_dir 
    543554    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    576587    fi 
    577588    cd ${SETTE_DIR} 
    578     . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     589    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    579590     
    580591    cd ${SETTE_DIR} 
    581592    export TEST_NAME="SHORT" 
    582593    . ./prepare_exe_dir.sh 
     594    set_valid_dir 
    583595    clean_valid_dir 
    584596    cd ${EXE_DIR} 
    … …  
    621633    fi 
    622634    cd ${SETTE_DIR} 
    623     . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME}  ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     635    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME}  ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    624636    cd ${SETTE_DIR} 
    625637    . ./fcm_job.sh $NPROC  ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    632644    . ./all_functions.sh 
    633645    . ./prepare_exe_dir.sh 
     646    set_valid_dir 
    634647    clean_valid_dir 
    635648    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    667680    fi 
    668681    cd ${SETTE_DIR} 
    669     . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     682    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    670683    cd ${SETTE_DIR} 
    671684    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    674687    export TEST_NAME="REPRO_8_4" 
    675688    . ./prepare_exe_dir.sh 
     689    set_valid_dir 
    676690    clean_valid_dir 
    677691    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    709723    fi 
    710724    cd ${SETTE_DIR} 
    711     . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     725    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    712726    cd ${SETTE_DIR} 
    713727    . ./fcm_job.sh $NPROC  ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    726740    . ./all_functions.sh 
    727741    . ./prepare_exe_dir.sh 
     742    set_valid_dir 
    728743    clean_valid_dir 
    729744    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    746761    fi 
    747762    cd ${SETTE_DIR} 
    748     . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     763    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    749764 
    750765    cd ${SETTE_DIR} 
    751766    export TEST_NAME="SHORT" 
    752767    . ./prepare_exe_dir.sh 
     768    set_valid_dir 
    753769    clean_valid_dir 
    754770    cd ${EXE_DIR} 
    … …  
    776792    fi 
    777793    cd ${SETTE_DIR} 
    778     . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     794    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    779795    cd ${SETTE_DIR} 
    780796    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    787803    . ./all_functions.sh 
    788804    . ./prepare_exe_dir.sh 
     805    set_valid_dir 
    789806    clean_valid_dir 
    790807    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    806823    fi 
    807824    cd ${SETTE_DIR} 
    808     . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     825    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    809826    cd ${SETTE_DIR} 
    810827    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    813830    export TEST_NAME="REPRO_4_8" 
    814831    . ./prepare_exe_dir.sh 
     832    set_valid_dir 
    815833    clean_valid_dir 
    816834    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    831849    fi 
    832850    cd ${SETTE_DIR} 
    833     . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     851    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    834852    cd ${SETTE_DIR} 
    835853    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    849867    . ./all_functions.sh 
    850868    . ./prepare_exe_dir.sh 
     869    set_valid_dir 
    851870    clean_valid_dir 
    852871    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    870889    fi 
    871890    cd ${SETTE_DIR} 
    872     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     891    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    873892 
    874893    cd ${SETTE_DIR} 
    875894    export TEST_NAME="SHORT" 
    876895    . ./prepare_exe_dir.sh 
     896    set_valid_dir 
    877897    clean_valid_dir 
    878898    cd ${EXE_DIR} 
    … …  
    902922    done 
    903923    cd ${SETTE_DIR} 
    904     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     924    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    905925    cd ${SETTE_DIR} 
    906926    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    913933    . ./all_functions.sh 
    914934    . ./prepare_exe_dir.sh 
     935    set_valid_dir 
    915936    clean_valid_dir 
    916937    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    932953    fi 
    933954    cd ${SETTE_DIR} 
    934     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     955    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    935956    cd ${SETTE_DIR} 
    936957    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    939960    export TEST_NAME="REPRO_8_4" 
    940961    . ./prepare_exe_dir.sh 
     962    set_valid_dir 
    941963    clean_valid_dir 
    942964    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    958980    fi 
    959981    cd ${SETTE_DIR} 
    960     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     982    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    961983    cd ${SETTE_DIR} 
    962984    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    9791001    . ./all_functions.sh 
    9801002    . ./prepare_exe_dir.sh 
     1003    set_valid_dir 
    9811004    clean_valid_dir 
    9821005    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    10251048    fi 
    10261049    cd ${SETTE_DIR} 
    1027     . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1050    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    10281051    cd ${SETTE_DIR} 
    10291052    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    10321055    export TEST_NAME="REPRO_8_4" 
    10331056    . ./prepare_exe_dir.sh 
     1057    set_valid_dir 
    10341058    clean_valid_dir 
    10351059    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    10781102    fi 
    10791103    cd ${SETTE_DIR} 
    1080     . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1104    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    10811105    cd ${SETTE_DIR} 
    10821106    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    10951119    . ./all_functions.sh 
    10961120    . ./prepare_exe_dir.sh 
     1121    set_valid_dir 
    10971122    clean_valid_dir 
    10981123    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    11351160    fi 
    11361161    cd ${SETTE_DIR} 
    1137     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1162    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    11381163     
    11391164    cd ${SETTE_DIR} 
    11401165    export TEST_NAME="SHORT" 
    11411166    . ./prepare_exe_dir.sh 
     1167    set_valid_dir 
    11421168    clean_valid_dir 
    11431169    cd ${EXE_DIR} 
    … …  
    12051231    fi 
    12061232    cd ${SETTE_DIR} 
    1207     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1233    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    12081234    cd ${SETTE_DIR} 
    12091235    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    12161242    . ./all_functions.sh 
    12171243    . ./prepare_exe_dir.sh 
     1244    set_valid_dir 
    12181245    clean_valid_dir 
    12191246    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    12601287    fi 
    12611288    cd ${SETTE_DIR} 
    1262     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1289    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    12631290    cd ${SETTE_DIR} 
    12641291    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    12671294    export TEST_NAME="REPRO_8_4" 
    12681295    . ./prepare_exe_dir.sh 
     1296    set_valid_dir 
    12691297    clean_valid_dir 
    12701298    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    13111339    fi 
    13121340    cd ${SETTE_DIR} 
    1313     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1341    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    13141342    cd ${SETTE_DIR} 
    13151343    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    13221350    . ./all_functions.sh 
    13231351    . ./prepare_exe_dir.sh 
     1352    set_valid_dir 
    13241353    clean_valid_dir 
    13251354    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    13431372    fi 
    13441373    cd ${SETTE_DIR} 
    1345     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1374    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    13461375    cd ${SETTE_DIR} 
    13471376    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    13591388    . ./all_functions.sh 
    13601389    . ./prepare_exe_dir.sh 
     1390    set_valid_dir 
    13611391    clean_valid_dir 
    13621392    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    13771407    fi 
    13781408    cd ${SETTE_DIR} 
    1379     . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1409    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    13801410    cd ${SETTE_DIR} 
    13811411    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    13951425    . ./all_functions.sh 
    13961426    . ./prepare_exe_dir.sh 
     1427    set_valid_dir 
    13971428    clean_valid_dir 
    13981429    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    14171448    fi 
    14181449    cd ${SETTE_DIR} 
    1419     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1450    . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    14201451     
    14211452    cd ${SETTE_DIR} 
    14221453    export TEST_NAME="SHORT" 
    14231454    . ./prepare_exe_dir.sh 
     1455    set_valid_dir 
    14241456    clean_valid_dir 
    14251457    cd ${EXE_DIR} 
    … …  
    14491481    fi 
    14501482    cd ${SETTE_DIR} 
    1451     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1483    . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    14521484    cd ${SETTE_DIR} 
    14531485    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    14601492    . ./all_functions.sh 
    14611493    . ./prepare_exe_dir.sh 
     1494    set_valid_dir 
    14621495    clean_valid_dir 
    14631496    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    14801513    fi 
    14811514    cd ${SETTE_DIR} 
    1482     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1515    . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    14831516    cd ${SETTE_DIR} 
    14841517    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    14871520    export TEST_NAME="REPRO_8_4" 
    14881521    . ./prepare_exe_dir.sh 
     1522    set_valid_dir 
    14891523    clean_valid_dir 
    14901524    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    15071541    fi 
    15081542    cd ${SETTE_DIR} 
    1509     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1543    . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    15101544    cd ${SETTE_DIR} 
    15111545    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 

  • NEMO/branches/2019/fix_sette_ticket2239/sette_test-cases.sh

    r10747 r10755  
    169169    . ./all_functions.sh 
    170170    . ./prepare_exe_dir.sh 
     171    set_valid_dir 
    171172    clean_valid_dir 
    172173    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    187188    fi 
    188189    cd ${SETTE_DIR} 
    189     . ./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} 
    190191 
    191192    cd ${SETTE_DIR} 
    192193    export TEST_NAME="SHORT" 
    193194    . ./prepare_exe_dir.sh 
     195    set_valid_dir 
    194196    clean_valid_dir 
    195197    cd ${EXE_DIR} 
    … …  
    212214 
    213215    cd ${SETTE_DIR} 
    214     . ./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} 
    215217    cd ${SETTE_DIR} 
    216218    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    231233        . ./all_functions.sh 
    232234        . ./prepare_exe_dir.sh 
     235        set_valid_dir 
    233236        clean_valid_dir 
    234237        JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    244247        fi 
    245248        cd ${SETTE_DIR} 
    246         . ./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} 
    247250        cd ${SETTE_DIR} 
    248251        . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    263266    . ./all_functions.sh 
    264267    . ./prepare_exe_dir.sh 
     268    set_valid_dir 
    265269    clean_valid_dir 
    266270    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    281285    fi 
    282286    cd ${SETTE_DIR} 
    283     . ./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} 
    284288 
    285289    cd ${SETTE_DIR} 
    286290    export TEST_NAME="SHORT" 
    287291    . ./prepare_exe_dir.sh 
     292    set_valid_dir 
    288293    clean_valid_dir 
    289294    cd ${EXE_DIR} 
    … …  
    306311 
    307312    cd ${SETTE_DIR} 
    308     . ./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} 
    309314    cd ${SETTE_DIR} 
    310315    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    325330        . ./all_functions.sh 
    326331        . ./prepare_exe_dir.sh 
     332        set_valid_dir 
    327333        clean_valid_dir 
    328334        JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    338344        fi 
    339345        cd ${SETTE_DIR} 
    340         . ./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} 
    341347        cd ${SETTE_DIR} 
    342348        . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    358364    . ./all_functions.sh 
    359365    . ./prepare_exe_dir.sh 
     366    set_valid_dir 
    360367    clean_valid_dir 
    361368    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    385392    fi 
    386393    cd ${SETTE_DIR} 
    387     . ./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} 
    388395     
    389396    cd ${SETTE_DIR} 
    390397    export TEST_NAME="SHORT" 
    391398    . ./prepare_exe_dir.sh 
     399    set_valid_dir 
    392400    clean_valid_dir 
    393401    cd ${EXE_DIR} 
    … …  
    431439    fi 
    432440    cd ${SETTE_DIR} 
    433     . ./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} 
    434442    cd ${SETTE_DIR} 
    435443    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    442450    . ./all_functions.sh 
    443451    . ./prepare_exe_dir.sh 
     452    set_valid_dir 
    444453    clean_valid_dir 
    445454    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    473482    fi 
    474483    cd ${SETTE_DIR} 
    475     . ./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} 
    476485    cd ${SETTE_DIR} 
    477486    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    480489    export TEST_NAME="REPRO_3_2" 
    481490    . ./prepare_exe_dir.sh 
     491    set_valid_dir 
    482492    clean_valid_dir 
    483493    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    512522    fi 
    513523    cd ${SETTE_DIR} 
    514     . ./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} 
    515525    cd ${SETTE_DIR} 
    516526    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    531541    . ./all_functions.sh 
    532542    . ./prepare_exe_dir.sh 
     543    set_valid_dir 
    533544    clean_valid_dir 
    534545    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    558569    fi 
    559570    cd ${SETTE_DIR} 
    560     . ./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} 
    561572     
    562573    cd ${SETTE_DIR} 
    563574    export TEST_NAME="SHORT" 
    564575    . ./prepare_exe_dir.sh 
     576    set_valid_dir 
    565577    clean_valid_dir 
    566578    cd ${EXE_DIR} 
    … …  
    612624 
    613625    cd ${SETTE_DIR} 
    614     . ./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} 
    615627    cd ${SETTE_DIR} 
    616628    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    624636    . ./all_functions.sh 
    625637    . ./prepare_exe_dir.sh 
     638    set_valid_dir 
    626639    clean_valid_dir 
    627640    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    655668    fi 
    656669    cd ${SETTE_DIR} 
    657     . ./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} 
    658671    cd ${SETTE_DIR} 
    659672    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    662675    export TEST_NAME="REPRO_3_2" 
    663676    . ./prepare_exe_dir.sh 
     677    set_valid_dir 
    664678    clean_valid_dir 
    665679    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    694708    fi 
    695709    cd ${SETTE_DIR} 
    696     . ./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} 
    697711    cd ${SETTE_DIR} 
    698712    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    712726    . ./all_functions.sh 
    713727    . ./prepare_exe_dir.sh 
     728    set_valid_dir 
    714729    clean_valid_dir 
    715730    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    732747    fi 
    733748    cd ${SETTE_DIR} 
    734     . ./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} 
    735750 
    736751    cd ${SETTE_DIR} 
    737752    export TEST_NAME="SHORT" 
    738753    . ./prepare_exe_dir.sh 
     754    set_valid_dir 
    739755    clean_valid_dir 
    740756    cd ${EXE_DIR} 
    … …  
    763779 
    764780    cd ${SETTE_DIR} 
    765     . ./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} 
    766782    cd ${SETTE_DIR} 
    767783    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    774790    . ./all_functions.sh 
    775791    . ./prepare_exe_dir.sh 
     792    set_valid_dir 
    776793    clean_valid_dir 
    777794    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    793810    fi 
    794811    cd ${SETTE_DIR} 
    795     . ./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} 
    796813    cd ${SETTE_DIR} 
    797814    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    800817    export TEST_NAME="REPRO_8_4" 
    801818    . ./prepare_exe_dir.sh 
     819    set_valid_dir 
    802820    clean_valid_dir 
    803821    JOB_FILE=${EXE_DIR}/run_job.sh 
    … …  
    819837    fi 
    820838    cd ${SETTE_DIR} 
    821     . ./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} 
    822840    cd ${SETTE_DIR} 
    823841    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
Note: See TracChangeset for help on using the changeset viewer.