Changeset 9776


Ignore:
Timestamp:
2018-06-11T16:05:50+02:00 (2 years ago)
Author:
clem
Message:

change sette accordingly to the previous commit

Location:
utils/CI/sette
Files:
3 edited

Legend:

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

    r9663 r9776  
    11ORCA2_ICE_v4.0.tar ORCA2_ICE_v4.0 
    2 AGRIF_ICE_v4.0.tar AGRIF_ICE_v4.0 
     2AGRIF_DEMO_v4.0.tar AGRIF_DEMO_v4.0 
  • utils/CI/sette/sette.sh

    r9756 r9776  
    138138# SAS               :  5 
    139139# ORCA2_ICE_OBS     :  6 
    140 # AGRIF             :  7 & 8  test AGRIF in a double zoom configuration (AGRIF_ICE) 
     140# AGRIF             :  7 & 8  test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific (AGRIF_DEMO) 
    141141#                               and check that key_agrif without zoom = no key_agrif 
    142142# SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen) 
     
    949949    export TEST_NAME="LONG" 
    950950    cd ${MAIN_DIR} 
    951     . ./makenemo -m ${CMP_NAM} -n AGRIF_ICE_ST -r AGRIF_ICE -j 8 del_key "key_top" 
    952     cd ${SETTE_DIR} 
    953     . ./param.cfg 
    954     . ./all_functions.sh 
    955     . ./prepare_exe_dir.sh 
    956     JOB_FILE=${EXE_DIR}/run_job.sh 
    957     NPROC=32 
     951    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j 8 del_key ${DEL_KEYS} 
     952    cd ${SETTE_DIR} 
     953    . ./param.cfg 
     954    . ./all_functions.sh 
     955    . ./prepare_exe_dir.sh 
     956    JOB_FILE=${EXE_DIR}/run_job.sh 
     957    NPROC=16 
    958958    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    959959    cd ${EXE_DIR} 
     
    964964    set_namelist 1_namelist_cfg cn_exp \"AGRIF_LONG\" 
    965965    set_namelist 1_namelist_cfg nn_it000 1 
    966     set_namelist 1_namelist_cfg nn_itend 80 
    967     set_namelist 1_namelist_cfg nn_stock 40 
     966    set_namelist 1_namelist_cfg nn_itend 20 
     967    set_namelist 1_namelist_cfg nn_stock 10 
    968968    set_namelist 2_namelist_cfg cn_exp \"AGRIF_LONG\" 
    969969    set_namelist 2_namelist_cfg nn_it000 1 
    970     set_namelist 2_namelist_cfg nn_itend 240 
    971     set_namelist 2_namelist_cfg nn_stock 120 
     970    set_namelist 2_namelist_cfg nn_itend 80 
     971    set_namelist 2_namelist_cfg nn_stock 40 
     972    set_namelist 3_namelist_cfg cn_exp \"AGRIF_LONG\" 
     973    set_namelist 3_namelist_cfg nn_it000 1 
     974    set_namelist 3_namelist_cfg nn_itend 240 
     975    set_namelist 3_namelist_cfg nn_stock 120 
    972976 
    973977    if [ ${USING_MPMD} == "yes" ] ; then 
     
    990994    set_namelist namelist_cfg nn_rstctl 2 
    991995    set_namelist 1_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    992     set_namelist 1_namelist_cfg nn_it000 41 
    993     set_namelist 1_namelist_cfg nn_itend 80 
    994     set_namelist 1_namelist_cfg nn_stock 40 
     996    set_namelist 1_namelist_cfg nn_it000 11 
     997    set_namelist 1_namelist_cfg nn_itend 20 
     998    set_namelist 1_namelist_cfg nn_stock 10 
    995999    set_namelist 1_namelist_cfg ln_rstart .true. 
    9961000    set_namelist 1_namelist_cfg nn_rstctl 2 
    9971001    set_namelist 2_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    998     set_namelist 2_namelist_cfg nn_it000 121 
    999     set_namelist 2_namelist_cfg nn_itend 240 
    1000     set_namelist 2_namelist_cfg nn_stock 120 
     1002    set_namelist 2_namelist_cfg nn_it000 41 
     1003    set_namelist 2_namelist_cfg nn_itend 80 
     1004    set_namelist 2_namelist_cfg nn_stock 40 
    10011005    set_namelist 2_namelist_cfg ln_rstart .true. 
    10021006    set_namelist 2_namelist_cfg nn_rstctl 2 
     1007    set_namelist 3_namelist_cfg cn_exp \"AGRIF_SHORT\" 
     1008    set_namelist 3_namelist_cfg nn_it000 121 
     1009    set_namelist 3_namelist_cfg nn_itend 240 
     1010    set_namelist 3_namelist_cfg nn_stock 120 
     1011    set_namelist 3_namelist_cfg ln_rstart .true. 
     1012    set_namelist 3_namelist_cfg nn_rstctl 2 
    10031013    set_namelist namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000010_restart\" 
    10041014    set_namelist namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000010_restart_ice\" 
    1005     set_namelist 1_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000040_restart\" 
    1006     set_namelist 1_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000040_restart_ice\" 
    1007     set_namelist 2_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000120_restart\" 
    1008     set_namelist 2_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000120_restart_ice\" 
     1015    set_namelist 1_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000010_restart\" 
     1016    set_namelist 1_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000010_restart_ice\" 
     1017    set_namelist 2_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000040_restart\" 
     1018    set_namelist 2_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000040_restart_ice\" 
     1019    set_namelist 3_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000120_restart\" 
     1020    set_namelist 3_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000120_restart_ice\" 
    10091021 
    10101022    for (( i=1; i<=$NPROC; i++)) ; do 
     
    10131025        ln -sf ../LONG/AGRIF_LONG_00000010_restart_${L_NPROC}.nc . 
    10141026        ln -sf ../LONG/AGRIF_LONG_00000010_restart_ice_${L_NPROC}.nc . 
    1015         ln -sf ../LONG/1_AGRIF_LONG_00000040_restart_${L_NPROC}.nc . 
    1016         ln -sf ../LONG/1_AGRIF_LONG_00000040_restart_ice_${L_NPROC}.nc . 
    1017         ln -sf ../LONG/2_AGRIF_LONG_00000120_restart_${L_NPROC}.nc . 
    1018         ln -sf ../LONG/2_AGRIF_LONG_00000120_restart_ice_${L_NPROC}.nc . 
     1027        ln -sf ../LONG/1_AGRIF_LONG_00000010_restart_${L_NPROC}.nc . 
     1028        ln -sf ../LONG/1_AGRIF_LONG_00000010_restart_ice_${L_NPROC}.nc . 
     1029        ln -sf ../LONG/2_AGRIF_LONG_00000040_restart_${L_NPROC}.nc . 
     1030        ln -sf ../LONG/2_AGRIF_LONG_00000040_restart_ice_${L_NPROC}.nc . 
     1031        ln -sf ../LONG/3_AGRIF_LONG_00000120_restart_${L_NPROC}.nc . 
     1032        ln -sf ../LONG/3_AGRIF_LONG_00000120_restart_ice_${L_NPROC}.nc . 
    10191033    done 
    10201034    if [ ${USING_MPMD} == "yes" ] ; then 
     
    10451059    set_namelist namelist_cfg jpnj 8 
    10461060    set_namelist namelist_cfg jpnij 32 
     1061    set_namelist 1_namelist_cfg cn_exp \"AGRIF_48\" 
    10471062    set_namelist 1_namelist_cfg nn_it000 1 
    1048     set_namelist 1_namelist_cfg nn_itend 80 
     1063    set_namelist 1_namelist_cfg nn_itend 20 
    10491064    set_namelist 1_namelist_cfg jpni 4 
    10501065    set_namelist 1_namelist_cfg jpnj 8 
    10511066    set_namelist 1_namelist_cfg jpnij 32 
     1067    set_namelist 2_namelist_cfg cn_exp \"AGRIF_48\" 
    10521068    set_namelist 2_namelist_cfg nn_it000 1 
    1053     set_namelist 2_namelist_cfg nn_itend 240 
     1069    set_namelist 2_namelist_cfg nn_itend 80 
    10541070    set_namelist 2_namelist_cfg jpni 4 
    10551071    set_namelist 2_namelist_cfg jpnj 8 
    10561072    set_namelist 2_namelist_cfg jpnij 32 
     1073    set_namelist 3_namelist_cfg cn_exp \"AGRIF_48\" 
     1074    set_namelist 3_namelist_cfg nn_it000 1 
     1075    set_namelist 3_namelist_cfg nn_itend 240 
     1076    set_namelist 3_namelist_cfg jpni 4 
     1077    set_namelist 3_namelist_cfg jpnj 8 
     1078    set_namelist 3_namelist_cfg jpnij 32 
    10571079 
    10581080    if [ ${USING_MPMD} == "yes" ] ; then 
     
    10791101    set_namelist namelist_cfg jpnj 4 
    10801102    set_namelist namelist_cfg jpnij 32 
     1103    set_namelist 1_namelist_cfg cn_exp \"AGRIF_84\" 
    10811104    set_namelist 1_namelist_cfg nn_it000 1 
    1082     set_namelist 1_namelist_cfg nn_itend 80 
     1105    set_namelist 1_namelist_cfg nn_itend 20 
    10831106    set_namelist 1_namelist_cfg jpni 8 
    10841107    set_namelist 1_namelist_cfg jpnj 4 
    10851108    set_namelist 1_namelist_cfg jpnij 32 
     1109    set_namelist 2_namelist_cfg cn_exp \"AGRIF_84\" 
    10861110    set_namelist 2_namelist_cfg nn_it000 1 
    1087     set_namelist 2_namelist_cfg nn_itend 240 
     1111    set_namelist 2_namelist_cfg nn_itend 80 
    10881112    set_namelist 2_namelist_cfg jpni 8 
    10891113    set_namelist 2_namelist_cfg jpnj 4 
    10901114    set_namelist 2_namelist_cfg jpnij 32 
     1115    set_namelist 3_namelist_cfg cn_exp \"AGRIF_84\" 
     1116    set_namelist 3_namelist_cfg nn_it000 1 
     1117    set_namelist 3_namelist_cfg nn_itend 240 
     1118    set_namelist 3_namelist_cfg jpni 8 
     1119    set_namelist 3_namelist_cfg jpnj 4 
     1120    set_namelist 3_namelist_cfg jpnij 32 
    10911121 
    10921122    if [ ${USING_MPMD} == "yes" ] ; then 
     
    11311161 
    11321162 
    1133 ## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_ICE_ST/ORCA2) 
     1163## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 
    11341164if [ ${config} -eq 8 ] ;  then 
    11351165    export TEST_NAME="ORCA2" 
    11361166    cd ${MAIN_DIR} 
    1137     . ./makenemo -m ${CMP_NAM} -n AGRIF_ICE_NOAGRIF_ST -r AGRIF_ICE -j 8 del_key "key_top key_agrif" 
     1167    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 del_key "key_agrif" 
    11381168    cd ${SETTE_DIR} 
    11391169    . ./param.cfg 
     
    11591189 
    11601190fi 
    1161  
    11621191 
    11631192# ------- 
  • utils/CI/sette/sette_rpt.sh

    r9756 r9776  
    424424 echo "" 
    425425 echo "   !----restart----!   " 
    426  for restart_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_ICE_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WSAS_BIPER_ST  
     426 for restart_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WSAS_BIPER_ST  
    427427 do 
    428428   resttest $NEMO_VALID $restart_test $pass 
     
    433433 echo "" 
    434434 echo "   !----repro----!   " 
    435  for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WORCA2_ICE_OBS_ST WAGRIF_ICE_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WSAS_BIPER_ST 
     435 for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WORCA2_ICE_OBS_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WSAS_BIPER_ST 
    436436 do 
    437437   reprotest $NEMO_VALID $repro_test $pass 
     
    442442 echo "" 
    443443 echo "   !----agrif check----!   " 
    444  dir1=WAGRIF_ICE_NOAGRIF_ST 
    445  dir2=WAGRIF_ICE_ST 
     444 dir1=WAGRIF_DEMO_NOAGRIF_ST 
     445 dir2=WAGRIF_DEMO_ST 
    446446 identictest $NEMO_VALID $dir1 $dir2 $pass  
    447447 
Note: See TracChangeset for help on using the changeset viewer.