Changeset 12818 for utils/CI


Ignore:
Timestamp:
2020-04-27T11:08:35+02:00 (7 months ago)
Author:
gsamson
Message:

modifications to activate ABL with ORCA2_ICE_PISCES cfg in SETTE tests; inputs files (ORCA2_ABL_v4.0.tar) not yet available on Zenodo; allow node number > 1 with mercator batch templates (ticket #2452)

Location:
utils/CI/sette_ticket2452
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette_ticket2452/input_ORCA2_ICE_PISCES.cfg

    r9663 r12818  
    11ORCA2_ICE_v4.0.tar  ORCA2_ICE_v4.0 
     2ORCA2_ABL_v4.0.tar  ORCA2_ABL_v4.0 
  • utils/CI/sette_ticket2452/prepare_job.sh

    r12798 r12818  
    9595NXIO_PROC=$6 
    9696NEMO_VALID=$7 
     97TOTAL_NPROCS=$(( $NB_PROC + $NXIO_PROC )) 
    9798 
    9899# export EXE_DIR. This directory is used to execute model  
     
    254255                                export GROUP_IDRIS=`echo ${USER} |cut -c 2-4` 
    255256                                ;; 
    256                         openmpi_KARA_MERCATOR*) 
     257                        openmpi_KARA_MERCATOR*) # Mercator local cluster 
    257258                                NB_PROC_NODE=32 
    258                                 NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % $NB_PROC_NODE }' | awk '{print $1 / $NB_PROC_NODE }' ) 
    259                                 if [ ${NB_PROC} -le 128 ] ; then 
    260                                       QUEUE=multi 
    261                                 fi 
    262                                 ;; 
    263                         ifort_beaufix_sette*) 
     259                                NB_NODES=$(awk -v NB_PROC="$TOTAL_NPROCS" -v NB_PROC_NODE="$NB_PROC_NODE" 'BEGIN{print int((NB_PROC-1)/NB_PROC_NODE)+1 }') 
     260                                if [ ${NB_PROC} -le 128 ] ; then QUEUE=multi; fi 
     261                                ;; 
     262                        ifort_beaufix_sette*)   # Mercator Beaufix 
    264263                                NB_PROC_NODE=40 
    265                                 NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % $NB_PROC_NODE }' | awk '{print $1 / $NB_PROC_NODE }' ) 
     264                                NB_NODES=$(awk -v NB_PROC="$TOTAL_NPROCS" -v NB_PROC_NODE="$NB_PROC_NODE" 'BEGIN{print int((NB_PROC-1)/NB_PROC_NODE)+1 }') 
    266265                                ;; 
    267266         *) 
     
    272271# Pass settings into job file by using sed to edit predefined strings 
    273272# 
    274         TOTAL_NPROCS=$(( $NB_PROC + $NXIO_PROC )) 
    275273        cat ${SETTE_DIR}/job_batch_template | sed -e"s/\(=\| \)NODES/\1${NB_NODES}/" \ 
    276274             -e"s/TOTAL_NPROCS/${TOTAL_NPROCS}/" \ 
  • utils/CI/sette_ticket2452/sette_reference-configurations.sh

    r12569 r12818  
    331331    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    332332    set_namelist namelist_cfg ln_use_calving .true. 
     333    set_namelist namelist_cfg nn_date0 20130101 
     334    set_namelist namelist_cfg ln_blk  .false. 
     335    set_namelist namelist_cfg ln_abl  .true.  
     336    set_namelist namelist_cfg sn_wndi " 'uwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'uwnd', .false., .false., 'monthly', '', 'U10', '' " 
     337    set_namelist namelist_cfg sn_wndj " 'vwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'vwnd', .false., .false., 'monthly', '', 'V10', '' " 
     338    set_namelist namelist_cfg sn_tair " 'tair_ERAI_L25Z10_ORCA2_ana1d', 24., 'tair', .false., .false., 'monthly', '', '', '' " 
     339    set_namelist namelist_cfg sn_humi " 'humi_ERAI_L25Z10_ORCA2_ana1d', 24., 'humi', .false., .false., 'monthly', '', '', '' " 
    333340    set_namelist namelist_cfg ln_wave .true. 
    334341    set_namelist namelist_cfg ln_cdgw .true. 
     
    378385    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    379386    set_namelist namelist_cfg nn_test_icebergs -1 
     387    set_namelist namelist_cfg nn_date0 20130101 
     388    set_namelist namelist_cfg ln_blk  .false. 
     389    set_namelist namelist_cfg ln_abl  .true.  
     390    set_namelist namelist_cfg ln_rstart_abl .true. 
     391    set_namelist namelist_cfg sn_wndi " 'uwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'uwnd', .false., .false., 'monthly', '', 'U10', '' " 
     392    set_namelist namelist_cfg sn_wndj " 'vwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'vwnd', .false., .false., 'monthly', '', 'V10', '' " 
     393    set_namelist namelist_cfg sn_tair " 'tair_ERAI_L25Z10_ORCA2_ana1d', 24., 'tair', .false., .false., 'monthly', '', '', '' " 
     394    set_namelist namelist_cfg sn_humi " 'humi_ERAI_L25Z10_ORCA2_ana1d', 24., 'humi', .false., .false., 'monthly', '', '', '' " 
    380395    set_namelist namelist_cfg ln_wave .true. 
    381396    set_namelist namelist_cfg ln_cdgw .true. 
     
    393408    set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000496_restart\" 
    394409    set_namelist namelist_cfg cn_icbrst_in \"O2L3P_LONG_00000496_restart_icb\" 
     410    set_namelist namelist_cfg cn_ablrst_in \"O2L3P_LONG_00000496_restart_abl\" 
    395411    set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000496_restart_trc\" 
    396412    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000496_restart_ice\" 
     
    446462    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    447463    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
     464    set_namelist namelist_cfg nn_date0 20130101 
     465    set_namelist namelist_cfg ln_blk  .false. 
     466    set_namelist namelist_cfg ln_abl  .true.  
     467    set_namelist namelist_cfg sn_wndi " 'uwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'uwnd', .false., .false., 'monthly', '', 'U10', '' " 
     468    set_namelist namelist_cfg sn_wndj " 'vwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'vwnd', .false., .false., 'monthly', '', 'V10', '' " 
     469    set_namelist namelist_cfg sn_tair " 'tair_ERAI_L25Z10_ORCA2_ana1d', 24., 'tair', .false., .false., 'monthly', '', '', '' " 
     470    set_namelist namelist_cfg sn_humi " 'humi_ERAI_L25Z10_ORCA2_ana1d', 24., 'humi', .false., .false., 'monthly', '', '', '' " 
    448471    set_namelist namelist_cfg ln_wave .true. 
    449472    set_namelist namelist_cfg ln_cdgw .true. 
     
    493516    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    494517    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
     518    set_namelist namelist_cfg nn_date0 20130101 
     519    set_namelist namelist_cfg ln_blk  .false. 
     520    set_namelist namelist_cfg ln_abl  .true.  
     521    set_namelist namelist_cfg sn_wndi " 'uwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'uwnd', .false., .false., 'monthly', '', 'U10', '' " 
     522    set_namelist namelist_cfg sn_wndj " 'vwnd_ERAI_L25Z10_ORCA2_ana1d', 24., 'vwnd', .false., .false., 'monthly', '', 'V10', '' " 
     523    set_namelist namelist_cfg sn_tair " 'tair_ERAI_L25Z10_ORCA2_ana1d', 24., 'tair', .false., .false., 'monthly', '', '', '' " 
     524    set_namelist namelist_cfg sn_humi " 'humi_ERAI_L25Z10_ORCA2_ana1d', 24., 'humi', .false., .false., 'monthly', '', '', '' " 
    495525    set_namelist namelist_cfg ln_wave .true. 
    496526    set_namelist namelist_cfg ln_cdgw .true. 
Note: See TracChangeset for help on using the changeset viewer.