Changeset 9904


Ignore:
Timestamp:
2018-07-09T15:37:17+02:00 (2 years ago)
Author:
acc
Message:

Minor corrections to sette.sh to recover valid sette tests. Also added toggle for icebergs (USE_ICEBERGS) which is currently set to no

Location:
utils/CI/sette
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/input_ORCA2_OFF_PISCES.cfg

    r9579 r9904  
    1 ORCA2_OFF_v4.0.tar ORCA2_OFF_4.0 
     1ORCA2_OFF_v4.0.tar ORCA2_OFF_v4.0 
  • utils/CI/sette/sette.sh

    r9776 r9904  
    9595export MPIRUN_FLAG="yes" 
    9696export USING_XIOS="yes" 
     97export USING_ICEBERGS="no" 
    9798# 
    9899export DEL_KEYS="key_iomput" 
     
    283284    set_namelist namelist_cfg cn_exp \"O2L3P_LONG\" 
    284285    set_namelist namelist_cfg nn_it000 1 
    285     set_namelist namelist_cfg nn_itend 1000 
    286     set_namelist namelist_cfg nn_stock 500 
    287     set_namelist namelist_cfg jpni 4 
    288     set_namelist namelist_cfg jpnj 8 
    289     set_namelist namelist_cfg jpnij 32 
     286    set_namelist namelist_cfg nn_itend 990 
     287    set_namelist namelist_cfg nn_stock 495 
     288    set_namelist namelist_cfg jpni 4 
     289    set_namelist namelist_cfg jpnj 8 
     290    set_namelist namelist_cfg jpnij 32 
     291    # 
     292    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     293    # 
    290294    set_namelist namelist_ice_cfg ln_icediachk .true. 
    291295    set_namelist namelist_top_cfg ln_trcdta .false. 
     
    316320    cd ${EXE_DIR} 
    317321    set_namelist namelist_cfg cn_exp \"O2L3P_SHORT\" 
    318     set_namelist namelist_cfg nn_it000 501 
    319     set_namelist namelist_cfg nn_itend 1000 
    320     set_namelist namelist_cfg nn_stock 500 
     322    set_namelist namelist_cfg nn_it000 496 
     323    set_namelist namelist_cfg nn_itend 990 
     324    set_namelist namelist_cfg nn_stock 495 
    321325    set_namelist namelist_cfg ln_rstart .true. 
    322326    set_namelist namelist_cfg nn_rstctl 2 
     
    324328    set_namelist namelist_cfg jpnj 8 
    325329    set_namelist namelist_cfg jpnij 32 
     330    # 
     331    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     332    # 
    326333    set_namelist namelist_top_cfg ln_rsttr .true. 
    327334    set_namelist namelist_top_cfg nn_rsttr 2 
    328     set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000500_restart\" 
    329     set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000500_restart_trc\" 
    330     set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000500_restart_ice\" 
     335    set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000495_restart\" 
     336    set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000495_restart_trc\" 
     337    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000495_restart_ice\" 
    331338    # put ln_ironsed, ln_river, ln_ndepo, ln_dust 
    332339    # if not you need input files, and for tests is not necessary 
     
    345352        L_NPROC=$(( $i - 1 )) 
    346353        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    347         ln -sf ../LONG/O2L3P_LONG_00000500_restart_${L_NPROC}.nc . 
    348         ln -sf ../LONG/O2L3P_LONG_00000500_restart_trc_${L_NPROC}.nc . 
    349         ln -sf ../LONG/O2L3P_LONG_00000500_restart_ice_${L_NPROC}.nc . 
    350         ln -sf ../LONG/O2L3P_LONG_icebergs_00000500_restart_${L_NPROC}.nc O2L3P_LONG_00000500_restart_icebergs_${L_NPROC}.nc 
     354        ln -sf ../LONG/O2L3P_LONG_00000495_restart_${L_NPROC}.nc . 
     355        ln -sf ../LONG/O2L3P_LONG_00000495_restart_trc_${L_NPROC}.nc . 
     356        ln -sf ../LONG/O2L3P_LONG_00000495_restart_ice_${L_NPROC}.nc . 
     357        if [ ${USING_ICEBERGS} == "yes" ] 
     358            then 
     359             ln -sf ../LONG/O2L3P_LONG_icebergs_00000495_restart_${L_NPROC}.nc O2L3P_LONG_00000495_restart_icebergs_${L_NPROC}.nc 
     360        fi 
    351361    done 
    352362    if [ ${USING_MPMD} == "yes" ] ; then 
     
    373383    set_namelist namelist_cfg cn_exp \"O2L3P_48\" 
    374384    set_namelist namelist_cfg nn_it000 1 
    375     set_namelist namelist_cfg nn_itend 1000 
    376     set_namelist namelist_cfg jpni 4 
    377     set_namelist namelist_cfg jpnj 8 
    378     set_namelist namelist_cfg jpnij 32 
     385    set_namelist namelist_cfg nn_itend 990 
     386    set_namelist namelist_cfg jpni 4 
     387    set_namelist namelist_cfg jpnj 8 
     388    set_namelist namelist_cfg jpnij 32 
     389    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    379390    set_namelist namelist_top_cfg ln_trcdta .false. 
    380391    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    410421    set_namelist namelist_cfg cn_exp \"O2L3P_84\" 
    411422    set_namelist namelist_cfg nn_it000 1 
    412     set_namelist namelist_cfg nn_itend 1000 
     423    set_namelist namelist_cfg nn_itend 990 
    413424    set_namelist namelist_cfg jpni 8 
    414425    set_namelist namelist_cfg jpnj 4 
    415426    set_namelist namelist_cfg jpnij 32 
     427    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    416428    set_namelist namelist_top_cfg ln_trcdta .false. 
    417429    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    462474    set_namelist namelist_cfg jpnj 8 
    463475    set_namelist namelist_cfg jpnij 32 
     476    set_namelist namelist_cfg ln_qsr_rgb .true. 
    464477    set_namelist namelist_top_cfg ln_trcdta .false. 
    465478    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    495508    set_namelist namelist_cfg jpnj 8 
    496509    set_namelist namelist_cfg jpnij 32 
     510    set_namelist namelist_cfg ln_qsr_rgb .true. 
    497511    set_namelist namelist_top_cfg ln_rsttr .true. 
    498512    set_namelist namelist_top_cfg nn_rsttr 2 
     
    543557    set_namelist namelist_cfg jpnj 8 
    544558    set_namelist namelist_cfg jpnij 32 
     559    set_namelist namelist_cfg ln_qsr_rgb .true. 
    545560    set_namelist namelist_top_cfg ln_trcdta .false. 
    546561    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    580595    set_namelist namelist_cfg jpnj 4 
    581596    set_namelist namelist_cfg jpnij 32 
     597    set_namelist namelist_cfg ln_qsr_rgb .true. 
    582598    set_namelist namelist_top_cfg ln_trcdta .false. 
    583599    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
Note: See TracChangeset for help on using the changeset viewer.