Changeset 12878


Ignore:
Timestamp:
2020-05-06T13:05:22+02:00 (7 months ago)
Author:
mathiot
Message:

ticket 2459: upgrade ISOMIP to ISOMIP+

Location:
utils/CI/sette_ticket2459
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • utils/CI/sette_ticket2459/input_ISOMIP+.cfg

    r12876 r12878  
     1ISOMIP+_v4.0.tar ISOMIP+_v4.0 
  • utils/CI/sette_ticket2459/param.cfg

    r12569 r12878  
    33# REFERENCE run.stat tracer.stat you want to compare with 
    44# (if no change to the default, no check on result change will be done) 
    5 NEMO_VALIDATION_REF=/path/to/reference/sette/results 
    6 NEMO_REV_REF=0000 
     5NEMO_VALIDATION_REF=/projects/jmmp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/NEMO_VALIDATION 
     6NEMO_REV_REF=12650 
    77# 
    88# ------------------------------------------------------------------------------------------ 
     
    7474# LIST OF CONFIGURATIONS 
    7575# to be updated if you added an new configuration in sette_test-cases.sh or sette_reference-configuration.sh 
    76 TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF SPITZ12 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP"} 
     76TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF SPITZ12 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+"} 
    7777# ------------------------------------------------------------------------------------------ 
    7878# 
  • utils/CI/sette_ticket2459/sette_list_avail_cfg.sh

    r11161 r12878  
    1616printf "%-15s \n" VORTEX 
    1717printf "%-15s \n" ICE_AGRIF 
    18 printf "%-15s \n" ISOMIP 
     18printf "%-15s \n" ISOMIP+ 
    1919echo '' 
  • utils/CI/sette_ticket2459/sette_rpt.sh

    r12569 r12878  
    489489 echo "" 
    490490 echo "   !----restart----!   " 
    491  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 WICE_AGRIF_ST  
     491 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 WICE_AGRIF_ST  
    492492 do 
    493493   resttest $NEMO_VALID $restart_test $pass 
     
    497497 echo "" 
    498498 echo "   !----repro----!   " 
    499  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 WICE_AGRIF_ST 
     499 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 WICE_AGRIF_ST 
    500500 do 
    501501   reprotest $NEMO_VALID $repro_test $pass 
     
    524524     echo "REFERENCE directory : $NEMO_VALID_REF at rev $NEMO_REV_REF" 
    525525     echo '' 
    526      for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WISOMIP_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WICE_AGRIF_ST 
     526     for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WISOMIP+_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP+_ST WVORTEX_ST WICE_AGRIF_ST 
    527527     do 
    528528       runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass 
  • utils/CI/sette_ticket2459/sette_test-cases.sh

    r12569 r12878  
    150150# VORTEX         :  
    151151# ICE_AGRIF      :  
    152 # ISOMIP         :  
     152# ISOMIP+         :  
    153153# WAD 
    154154 
     
    726726 
    727727# ------ 
    728 # ISOMIP 
     728# ISOMIP+ 
    729729# ------ 
    730 if [ ${config} == "ISOMIP" ] ;  then 
     730if [ ${config} == "ISOMIP+" ] ;  then 
    731731## Restartability tests 
    732732    export TEST_NAME="LONG" 
     
    736736    . ${SETTE_DIR}/all_functions.sh 
    737737    # 
    738     clean_config ISOMIP ISOMIP_ST 'tests' 
    739     # 
    740     sync_config  ISOMIP ISOMIP_ST 'tests' 
    741     # 
    742     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     738    clean_config ISOMIP+ ISOMIP+_ST 'tests' 
     739    # 
     740    sync_config  ISOMIP+ ISOMIP+_ST 'tests' 
     741    # 
     742    . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    743743    cd ${SETTE_DIR} 
    744744    . ./param.cfg 
     
    748748    clean_valid_dir 
    749749    JOB_FILE=${EXE_DIR}/run_job.sh 
    750     NPROC=15 
     750    NPROC=27 
    751751    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    752752    cd ${EXE_DIR} 
    753     set_namelist namelist_cfg cn_exp \"ISOMIP_LONG\" 
    754     set_namelist namelist_cfg nn_it000 1 
    755     set_namelist namelist_cfg nn_itend 96 
    756     set_namelist namelist_cfg nn_stock 48 
    757     set_namelist namelist_cfg jpni 5 
     753    set_namelist namelist_cfg cn_exp \"ISOMIP+_LONG\" 
     754    set_namelist namelist_cfg nn_it000 1 
     755    set_namelist namelist_cfg nn_itend 960 
     756    set_namelist namelist_cfg nn_stock 480 
     757    set_namelist namelist_cfg jpni 9 
    758758    set_namelist namelist_cfg jpnj 3 
    759759    set_namelist namelist_cfg sn_cfctl%l_config .true. 
     
    765765    fi 
    766766    cd ${SETTE_DIR} 
    767     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     767    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    768768 
    769769    cd ${SETTE_DIR} 
     
    773773    clean_valid_dir 
    774774    cd ${EXE_DIR} 
    775     set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\" 
    776     set_namelist namelist_cfg nn_it000 49 
    777     set_namelist namelist_cfg nn_itend 96 
    778     set_namelist namelist_cfg nn_stock 48 
     775    set_namelist namelist_cfg cn_exp \"ISOMIP+_SHORT\" 
     776    set_namelist namelist_cfg nn_it000 481 
     777    set_namelist namelist_cfg nn_itend 960 
     778    set_namelist namelist_cfg nn_stock 480 
    779779    set_namelist namelist_cfg ln_rstart .true. 
    780780    set_namelist namelist_cfg nn_rstctl 2 
    781     set_namelist namelist_cfg jpni 5 
     781    set_namelist namelist_cfg jpni 9 
    782782    set_namelist namelist_cfg jpnj 3 
    783783    set_namelist namelist_cfg sn_cfctl%l_config .true. 
    784784    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    785     set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\" 
     785    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_00000480_restart\" 
    786786    if [ ${USING_MPMD} == "yes" ] ; then 
    787787       set_xio_using_server iodef.xml true 
     
    792792        L_NPROC=$(( $i - 1 )) 
    793793        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    794         ln -sf ../LONG/ISOMIP_LONG_00000048_restart_${L_NPROC}.nc . 
     794        ln -sf ../LONG/ISOMIP+_LONG_00000480_restart_${L_NPROC}.nc . 
    795795    done 
    796796 
    797797    cd ${SETTE_DIR} 
    798     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     798    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    799799    cd ${SETTE_DIR} 
    800800    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    801801 
    802802## Reproducibility tests 
    803     export TEST_NAME="REPRO_7_3" 
     803    export TEST_NAME="REPRO_9_3" 
    804804    cd ${MAIN_DIR} 
    805805    cd ${SETTE_DIR} 
     
    810810    clean_valid_dir 
    811811    JOB_FILE=${EXE_DIR}/run_job.sh 
    812     NPROC=21 
     812    NPROC=27 
    813813    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    814814    cd ${EXE_DIR} 
    815     set_namelist namelist_cfg cn_exp \"ISOMIP_73\" 
    816     set_namelist namelist_cfg nn_it000 1 
    817     set_namelist namelist_cfg nn_itend 48 
    818     set_namelist namelist_cfg jpni 7 
     815    set_namelist namelist_cfg cn_exp \"ISOMIP+_93\" 
     816    set_namelist namelist_cfg nn_it000 1 
     817    set_namelist namelist_cfg nn_itend 480 
     818    set_namelist namelist_cfg jpni 9 
    819819    set_namelist namelist_cfg jpnj 3 
    820820    set_namelist namelist_cfg sn_cfctl%l_config .true. 
     
    826826    fi 
    827827    cd ${SETTE_DIR} 
    828     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     828    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    829829    cd ${SETTE_DIR} 
    830830    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    839839    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    840840    cd ${EXE_DIR} 
    841     set_namelist namelist_cfg cn_exp \"ISOMIP_84\" 
    842     set_namelist namelist_cfg nn_it000 1 
    843     set_namelist namelist_cfg nn_itend 48 
     841    set_namelist namelist_cfg cn_exp \"ISOMIP+_84\" 
     842    set_namelist namelist_cfg nn_it000 1 
     843    set_namelist namelist_cfg nn_itend 480 
    844844    set_namelist namelist_cfg jpni 8 
    845845    set_namelist namelist_cfg jpnj 4 
     
    852852    fi 
    853853    cd ${SETTE_DIR} 
    854     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     854    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    855855    cd ${SETTE_DIR} 
    856856    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
Note: See TracChangeset for help on using the changeset viewer.