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 for NEMO/branches/2019/fix_sette_ticket2239/sette_reference-configurations.sh – NEMO

Ignore:
Timestamp:
2019-03-14T17:22:12+01:00 (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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} 
Note: See TracChangeset for help on using the changeset viewer.