Changeset 15030


Ignore:
Timestamp:
2021-06-21T10:30:49+02:00 (6 months ago)
Author:
jchanut
Message:

#2698, this restores restartability testing of Age passive tracer in AGRIF_DEMO. Added nn_hls=2 and other tests with AGRIF since there is no reason we do not succeed in making these work. Timing option is still missing with AGRIF though.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/sette_reference-configurations.sh

    r14981 r15030  
    11011101    # 
    11021102    # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 
    1103     . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 
     1103#    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 
     1104    . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    11041105fi 
    11051106if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ;  then 
     
    11191120    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    11201121    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1122    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    11211123    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    11221124    set_namelist 1_namelist_cfg cn_exp \"AGRIF_LONG\" 
     
    11361138    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    11371139 
     1140    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1141    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1142    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1143    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1144    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1145    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1146    set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1147    set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1148    set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1149    set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1150    set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1151    set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1152 
    11381153    set_xio_using_server iodef.xml ${USING_MPMD} 
    11391154    cd ${SETTE_DIR} 
     
    11511166    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    11521167    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1168    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    11531169    set_namelist namelist_cfg ln_rstart .true. 
    11541170    set_namelist namelist_cfg nn_rstctl 2 
     1171    set_namelist namelist_top_cfg ln_rsttr .true. 
     1172    set_namelist namelist_top_cfg nn_rsttr 2  
    11551173    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    11561174    set_namelist 1_namelist_cfg cn_exp \"AGRIF_SHORT\" 
     
    11611179    set_namelist 1_namelist_cfg ln_rstart .true. 
    11621180    set_namelist 1_namelist_cfg nn_rstctl 2 
     1181    set_namelist 1_namelist_top_cfg ln_rsttr .true. 
     1182    set_namelist 1_namelist_cfg ln_init_chfrpar .false. 
     1183    set_namelist 1_namelist_top_cfg nn_rsttr 2  
    11631184    set_namelist 2_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    11641185    set_namelist 2_namelist_cfg nn_it000 $(( ${ITEND} * 4 / 2 + 1 )) 
     
    11681189    set_namelist 2_namelist_cfg ln_rstart .true. 
    11691190    set_namelist 2_namelist_cfg nn_rstctl 2 
     1191    set_namelist 2_namelist_cfg ln_init_chfrpar .false. 
     1192    set_namelist 2_namelist_top_cfg ln_rsttr .true. 
     1193    set_namelist 2_namelist_top_cfg nn_rsttr 2  
    11701194    set_namelist 3_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    11711195    set_namelist 3_namelist_cfg nn_it000 $(( ${ITEND} * 4 * 3 / 2 + 1 )) 
     
    11751199    set_namelist 3_namelist_cfg ln_rstart .true. 
    11761200    set_namelist 3_namelist_cfg nn_rstctl 2 
     1201    set_namelist 3_namelist_cfg ln_init_chfrpar .false. 
     1202    set_namelist 3_namelist_top_cfg ln_rsttr .true. 
     1203    set_namelist 3_namelist_top_cfg nn_rsttr 2  
    11771204    set_namelist namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST}_restart\" 
    11781205    set_namelist namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST}_restart_ice\" 
     1206    set_namelist namelist_top_cfg cn_trcrst_in \"AGRIF_LONG_${ITRST}_restart_trc\" 
    11791207    set_namelist 1_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_1}_restart\" 
    11801208    set_namelist 1_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_1}_restart_ice\" 
     1209    set_namelist 1_namelist_top_cfg cn_trcrst_in \"AGRIF_LONG_${ITRST_1}_restart_trc\" 
    11811210    set_namelist 2_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_2}_restart\" 
    11821211    set_namelist 2_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_2}_restart_ice\" 
     1212    set_namelist 2_namelist_top_cfg cn_trcrst_in \"AGRIF_LONG_${ITRST_2}_restart_trc\" 
    11831213    set_namelist 3_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_3}_restart\" 
    11841214    set_namelist 3_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_3}_restart_ice\" 
     1215    set_namelist 3_namelist_top_cfg cn_trcrst_in \"AGRIF_LONG_${ITRST_3}_restart_trc\" 
     1216# 
     1217    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1218    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1219    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1220    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1221    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1222    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1223    set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1224    set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1225    set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
     1226    set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1227    set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1228    set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    11851229 
    11861230    for (( i=1; i<=$NPROC; i++)) ; do 
     
    11891233        ln -sf ../LONG/AGRIF_LONG_${ITRST}_restart_${L_NPROC}.nc . 
    11901234        ln -sf ../LONG/AGRIF_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
     1235        ln -sf ../LONG/AGRIF_LONG_${ITRST}_restart_trc_${L_NPROC}.nc . 
    11911236        ln -sf ../LONG/1_AGRIF_LONG_${ITRST_1}_restart_${L_NPROC}.nc . 
    11921237        ln -sf ../LONG/1_AGRIF_LONG_${ITRST_1}_restart_ice_${L_NPROC}.nc . 
     1238        ln -sf ../LONG/1_AGRIF_LONG_${ITRST_1}_restart_trc_${L_NPROC}.nc . 
    11931239        ln -sf ../LONG/2_AGRIF_LONG_${ITRST_2}_restart_${L_NPROC}.nc . 
    11941240        ln -sf ../LONG/2_AGRIF_LONG_${ITRST_2}_restart_ice_${L_NPROC}.nc . 
     1241        ln -sf ../LONG/2_AGRIF_LONG_${ITRST_2}_restart_trc_${L_NPROC}.nc . 
    11951242        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_${L_NPROC}.nc . 
    11961243        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_ice_${L_NPROC}.nc . 
     1244        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_trc_${L_NPROC}.nc . 
    11971245    done 
    11981246    set_xio_using_server iodef.xml ${USING_MPMD} 
     
    12221270    set_namelist namelist_cfg jpnj 8 
    12231271    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1272    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
     1273    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1274    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1275    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12241276    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    12251277    set_namelist 1_namelist_cfg cn_exp \"AGRIF_28\" 
     
    12291281    set_namelist 1_namelist_cfg jpnj 8 
    12301282    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
     1283    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1284    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1285    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12311286    set_namelist 2_namelist_cfg cn_exp \"AGRIF_28\" 
    12321287    set_namelist 2_namelist_cfg nn_it000 1 
     
    12351290    set_namelist 2_namelist_cfg jpnj 8 
    12361291    set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true. 
     1292    set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1293    set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1294    set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12371295    set_namelist 3_namelist_cfg cn_exp \"AGRIF_28\" 
    12381296    set_namelist 3_namelist_cfg nn_it000 1 
     
    12411299    set_namelist 3_namelist_cfg jpnj 8 
    12421300    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
     1301    set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1302    set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1303    set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12431304 
    12441305    set_xio_using_server iodef.xml ${USING_MPMD} 
     
    12631324    set_namelist namelist_cfg jpnj 4 
    12641325    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1326    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
     1327    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1328    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1329    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12651330    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
    12661331    set_xio_using_server iodef.xml ${USING_MPMD} 
     
    12711336    set_namelist 1_namelist_cfg jpnj 4 
    12721337    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
     1338    set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1339    set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1340    set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12731341    set_namelist 2_namelist_cfg cn_exp \"AGRIF_44\" 
    12741342    set_namelist 2_namelist_cfg nn_it000 1 
     
    12771345    set_namelist 2_namelist_cfg jpnj 4 
    12781346    set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true. 
     1347    set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1348    set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1349    set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12791350    set_namelist 3_namelist_cfg cn_exp \"AGRIF_44\" 
    12801351    set_namelist 3_namelist_cfg nn_it000 1 
     
    12831354    set_namelist 3_namelist_cfg jpnj 4 
    12841355    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
     1356    set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1357    set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1358    set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    12851359 
    12861360    cd ${SETTE_DIR} 
     
    13131387    set_namelist namelist_cfg nn_itend ${ITEND} 
    13141388    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1389    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    13151390    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1391    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1392    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1393    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    13161394 
    13171395#   Set the number of fine grids to zero:     
     
    13511429    set_namelist namelist_cfg nn_itend ${ITEND} 
    13521430    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1431    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    13531432    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1433    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     1434    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     1435    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    13541436# 
    13551437    set_xio_using_server iodef.xml ${USING_MPMD} 
Note: See TracChangeset for help on using the changeset viewer.