Ignore:
Timestamp:
2020-08-06T09:48:25+02:00 (3 months ago)
Author:
mathiot
Message:

sette: replace SPITZ12 and ISOMIP by ISOMIP+; Fix minor bug in sync_config() (ie sette -s option) in case MY_SRC directory does not exist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/sette_test-cases.sh

    r12931 r13382  
    150150# VORTEX         :  
    151151# ICE_AGRIF      :  
    152 # ISOMIP         :  
     152# ISOMIP+         :  
    153153# WAD 
    154154 
     
    706706 
    707707# ------ 
    708 # ISOMIP 
     708# ISOMIP+ 
    709709# ------ 
    710 if [ ${config} == "ISOMIP" ] ;  then 
     710if [ ${config} == "ISOMIP+" ] ;  then 
    711711## Restartability tests 
    712712    export TEST_NAME="LONG" 
     
    716716    . ${SETTE_DIR}/all_functions.sh 
    717717    # 
    718     clean_config ISOMIP ISOMIP_ST 'tests' 
    719     # 
    720     sync_config  ISOMIP ISOMIP_ST 'tests' 
    721     # 
    722     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     718    clean_config ISOMIP+ ISOMIP+_ST 'tests' 
     719    # 
     720    sync_config  ISOMIP+ ISOMIP+_ST 'tests' 
     721    # 
     722    . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    723723    cd ${SETTE_DIR} 
    724724    . ./param.cfg 
     
    728728    clean_valid_dir 
    729729    JOB_FILE=${EXE_DIR}/run_job.sh 
    730     NPROC=15 
     730    NPROC=27 
    731731    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    732732    cd ${EXE_DIR} 
    733     set_namelist namelist_cfg cn_exp \"ISOMIP_LONG\" 
    734     set_namelist namelist_cfg nn_it000 1 
    735     set_namelist namelist_cfg nn_itend 96 
    736     set_namelist namelist_cfg nn_stock 48 
    737     set_namelist namelist_cfg jpni 5 
     733    set_namelist namelist_cfg cn_exp \"ISOMIP+_LONG\" 
     734    set_namelist namelist_cfg nn_it000 1 
     735    set_namelist namelist_cfg nn_itend 1200 
     736    set_namelist namelist_cfg nn_stock 600 
     737    set_namelist namelist_cfg jpni 9 
    738738    set_namelist namelist_cfg jpnj 3 
    739739    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     
    744744    fi 
    745745    cd ${SETTE_DIR} 
    746     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     746    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    747747 
    748748    cd ${SETTE_DIR} 
     
    752752    clean_valid_dir 
    753753    cd ${EXE_DIR} 
    754     set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\" 
    755     set_namelist namelist_cfg nn_it000 49 
    756     set_namelist namelist_cfg nn_itend 96 
    757     set_namelist namelist_cfg nn_stock 48 
     754    set_namelist namelist_cfg cn_exp \"ISOMIP+_SHORT\" 
     755    set_namelist namelist_cfg nn_it000 601 
     756    set_namelist namelist_cfg nn_itend 1200 
     757    set_namelist namelist_cfg nn_stock 600 
    758758    set_namelist namelist_cfg ln_rstart .true. 
    759759    set_namelist namelist_cfg nn_rstctl 2 
    760     set_namelist namelist_cfg jpni 5 
     760    set_namelist namelist_cfg jpni 9 
    761761    set_namelist namelist_cfg jpnj 3 
    762762    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    763     set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\" 
     763    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_00000600_restart\" 
    764764    if [ ${USING_MPMD} == "yes" ] ; then 
    765765       set_xio_using_server iodef.xml true 
     
    770770        L_NPROC=$(( $i - 1 )) 
    771771        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    772         ln -sf ../LONG/ISOMIP_LONG_00000048_restart_${L_NPROC}.nc . 
     772        ln -sf ../LONG/ISOMIP+_LONG_00000600_restart_${L_NPROC}.nc . 
    773773    done 
    774774 
    775775    cd ${SETTE_DIR} 
    776     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     776    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    777777    cd ${SETTE_DIR} 
    778778    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    779779 
    780780## Reproducibility tests 
    781     export TEST_NAME="REPRO_7_3" 
     781    export TEST_NAME="REPRO_9_3" 
    782782    cd ${MAIN_DIR} 
    783783    cd ${SETTE_DIR} 
     
    788788    clean_valid_dir 
    789789    JOB_FILE=${EXE_DIR}/run_job.sh 
    790     NPROC=21 
     790    NPROC=27 
    791791    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    792792    cd ${EXE_DIR} 
    793     set_namelist namelist_cfg cn_exp \"ISOMIP_73\" 
    794     set_namelist namelist_cfg nn_it000 1 
    795     set_namelist namelist_cfg nn_itend 48 
    796     set_namelist namelist_cfg jpni 7 
     793    set_namelist namelist_cfg cn_exp \"ISOMIP+_93\" 
     794    set_namelist namelist_cfg nn_it000 1 
     795    set_namelist namelist_cfg nn_itend 600 
     796    set_namelist namelist_cfg jpni 9 
    797797    set_namelist namelist_cfg jpnj 3 
    798798    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     
    803803    fi 
    804804    cd ${SETTE_DIR} 
    805     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     805    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    806806    cd ${SETTE_DIR} 
    807807    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    816816    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    817817    cd ${EXE_DIR} 
    818     set_namelist namelist_cfg cn_exp \"ISOMIP_84\" 
    819     set_namelist namelist_cfg nn_it000 1 
    820     set_namelist namelist_cfg nn_itend 48 
     818    set_namelist namelist_cfg cn_exp \"ISOMIP+_84\" 
     819    set_namelist namelist_cfg nn_it000 1 
     820    set_namelist namelist_cfg nn_itend 600 
    821821    set_namelist namelist_cfg jpni 8 
    822822    set_namelist namelist_cfg jpnj 4 
     
    828828    fi 
    829829    cd ${SETTE_DIR} 
    830     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     830    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    831831    cd ${SETTE_DIR} 
    832832    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
Note: See TracChangeset for help on using the changeset viewer.