Changeset 9663


Ignore:
Timestamp:
2018-05-28T16:41:27+02:00 (2 years ago)
Author:
clem
Message:

change the names of the configurations (1st step)

Location:
utils/CI/sette
Files:
7 edited
3 moved

Legend:

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

    r9579 r9663  
    11ORCA2_ICE_v4.0.tar ORCA2_ICE_v4.0 
    2 AGRIF_NORDIC_v4.0.tar AGRIF_NORDIC_v4.0 
     2AGRIF_ICE_v4.0.tar AGRIF_ICE_v4.0 
  • utils/CI/sette/param.cfg

    r9576 r9663  
    11#- forcing files storing 
    2 FORCING_DIR=$WORKDIR/NEMO/FORC 
     2FORCING_DIR=$WORKDIR/FORCING 
    33#- input files storing 
    44INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    66#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    77#- VALIDATION files storing 
    8 NEMO_VALIDATION_DIR=~/CNRS_merge_2017 
     8NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION 
  • utils/CI/sette/prepare_job.sh

    r9576 r9663  
    6969 
    7070usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE NUM_XIO_SERVERS" 
    71 usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE 0 2" 
     71usage=" example : ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg 8 SHORT no/yes $JOB_FILE 0 2" 
    7272 
    7373 
  • utils/CI/sette/sette.sh

    r9658 r9663  
    133133# Description of configuration tested: 
    134134# GYRE_PISCES       :  1  
    135 # ORCA2_SI3_PISCES  :  2  
     135# ORCA2_ICE_PISCES  :  2  
    136136# ORCA2_OFF_PISCES  :  3  
    137137# AMM12             :  4  
    138138# SAS               :  5 
    139 # ORCA2_SI3_OBS     :  6 
    140 # AGRIF             :  7 & 8  test AGRIF in a double zoom configuration (AGRIF_NORDIC) 
     139# ORCA2_ICE_OBS     :  6 
     140# AGRIF             :  7 & 8  test AGRIF in a double zoom configuration (AGRIF_ICE) 
    141141#                               and check that key_agrif without zoom = no key_agrif 
    142142# SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen) 
     
    271271 
    272272# ----------------- 
    273 # ORCA2_SI3_PISCES 
     273# ORCA2_ICE_PISCES 
    274274# ----------------- 
    275275if [ ${config} -eq 2 ] ;  then 
    276 ## Restartability tests for ORCA2_SI3_PISCES 
     276## Restartability tests for ORCA2_ICE_PISCES 
    277277    export TEST_NAME="LONG" 
    278278    cd ${MAIN_DIR} 
    279     . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_PISCES_ST -r ORCA2_SI3_PISCES -j 8 del_key ${DEL_KEYS} 
     279    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j 8 del_key ${DEL_KEYS} 
    280280    cd ${SETTE_DIR} 
    281281    . ./param.cfg 
     
    314314    fi 
    315315    cd ${SETTE_DIR} 
    316     . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     316    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    317317     
    318318    cd ${SETTE_DIR} 
     
    361361    fi 
    362362    cd ${SETTE_DIR} 
    363     . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    364     cd ${SETTE_DIR} 
    365     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    366  
    367 ## Reproducibility tests for ORCA2_SI3_PISCES 
     363    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     364    cd ${SETTE_DIR} 
     365    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     366 
     367## Reproducibility tests for ORCA2_ICE_PISCES 
    368368    export TEST_NAME="REPRO_4_8" 
    369369    cd ${MAIN_DIR} 
     
    402402    fi 
    403403    cd ${SETTE_DIR} 
    404     . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     404    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    405405    cd ${SETTE_DIR} 
    406406    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    439439    fi 
    440440    cd ${SETTE_DIR} 
    441     . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     441    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    442442    cd ${SETTE_DIR} 
    443443    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    728728    export TEST_NAME="LONG" 
    729729    cd ${MAIN_DIR} 
    730     . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_SI3_ST -r ORCA2_SAS_SI3 -j 8 del_key ${DEL_KEYS} 
     730    . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j 8 del_key ${DEL_KEYS} 
    731731    cd ${SETTE_DIR} 
    732732    . ./param.cfg 
     
    838838 
    839839# -------------- 
    840 # ORCA2_SI3_OBS 
     840# ORCA2_ICE_OBS 
    841841# -------------- 
    842842## Test assimilation interface code, OBS and ASM for reproducibility 
     
    846846    export TEST_NAME="REPRO_4_8" 
    847847    cd ${MAIN_DIR} 
    848     . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_OBS_ST -r ORCA2_SI3_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc" del_key "key_top" 
     848    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc" del_key "key_top" 
    849849    cd ${SETTE_DIR} 
    850850    . ./param.cfg 
     
    874874    set_namelist namelist_cfg ln_sshinc .true. 
    875875    set_namelist namelist_cfg ln_asmiau .true. 
    876     #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 
     876    #remove all useless options for pisces (due to ORCA2_ICE_PISCES reference configuration) 
    877877    set_namelist namelist_top_cfg ln_trcdta .false.  
    878878    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    893893    fi 
    894894    cd ${SETTE_DIR} 
    895     . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     895    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    896896    cd ${SETTE_DIR} 
    897897    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    923923    set_namelist namelist_cfg ln_sshinc .true. 
    924924    set_namelist namelist_cfg ln_asmiau .true. 
    925     #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 
     925    #remove all useless options for pisces (due to ORCA2_ICE_PISCES reference configuration) 
    926926    set_namelist namelist_top_cfg ln_trcdta .false. 
    927927    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    942942    fi 
    943943    cd ${SETTE_DIR} 
    944     . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     944    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    945945    cd ${SETTE_DIR} 
    946946    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    948948 
    949949# ------------ 
    950 # AGRIF NORDIC 
     950# AGRIF ICE 
    951951# ----------- 
    952952if [ ${config} -eq 7 ] ;  then 
     
    954954    export TEST_NAME="LONG" 
    955955    cd ${MAIN_DIR} 
    956     . ./makenemo -m ${CMP_NAM} -n AGRIF_NORDIC_ST -r AGRIF_NORDIC -j 8 del_key "key_top" 
     956    . ./makenemo -m ${CMP_NAM} -n AGRIF_ICE_ST -r AGRIF_ICE -j 8 del_key "key_top" 
    957957    cd ${SETTE_DIR} 
    958958    . ./param.cfg 
     
    11361136 
    11371137 
    1138 ## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_NORDIC_ST/ORCA2) 
     1138## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_ICE_ST/ORCA2) 
    11391139if [ ${config} -eq 8 ] ;  then 
    11401140    export TEST_NAME="ORCA2" 
    11411141    cd ${MAIN_DIR} 
    1142     . ./makenemo -m ${CMP_NAM} -n AGRIF_NORDIC_NOAGRIF_ST -r AGRIF_NORDIC -j 8 del_key "key_top key_agrif" 
     1142    . ./makenemo -m ${CMP_NAM} -n AGRIF_ICE_NOAGRIF_ST -r AGRIF_ICE -j 8 del_key "key_top key_agrif" 
    11431143    cd ${SETTE_DIR} 
    11441144    . ./param.cfg 
  • utils/CI/sette/sette_chk_result.sh

    r9605 r9663  
    488488# Restartability test 
    489489# 
    490  for restart_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
     490 for restart_test in WGYREPIS_ST WORCA2ICEPIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
    491491 do 
    492492   resttest $NEMO_VALID $restart_test $pass 
     
    495495# Reproducibility tests 
    496496# 
    497  for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 
     497 for repro_test in WGYREPIS_ST WORCA2ICEPIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_ICE_OBS_ST WORCA2AGR_ST 
    498498 do 
    499499   reprotest $NEMO_VALID $repro_test $pass 
     
    515515   echo 'and' 
    516516   echo "$NEMO_VALID_REF at rev $NEMO_REV_REF" 
    517    for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 
     517   for repro_test in WGYREPIS_ST WORCA2ICEPIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_ICE_OBS_ST WORCA2AGR_ST 
    518518   do 
    519519     runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass 
  • utils/CI/sette/sette_rpt.SAS.sh

    r9605 r9663  
    301301# Restartability test 
    302302# 
    303  for restart_test in WGYREPIS_LONG WORCA2SI3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
     303 for restart_test in WGYREPIS_LONG WORCA2ICEPIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
    304304 do 
    305305   resttest $NEMO_VALID $restart_test $pass 
     
    308308# Reproducibility tests 
    309309# 
    310  for repro_test in WGYREPIS_32 WORCA2SI3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_SI3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
     310 for repro_test in WGYREPIS_32 WORCA2ICEPIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_ICE_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
    311311 do 
    312312   reprotest $NEMO_VALID $repro_test $pass 
  • utils/CI/sette/sette_rpt.sh

    r9605 r9663  
    3535    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3636    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    37     ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     37    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_ICE_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3838    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    39     ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     39    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_ICE_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    4040    cd ${SAS_RESTART_DIR}/LONG 
    4141    #SF echo "COPY rebuild restart files" 
     
    386386  TOOLS_DIR=${MAIN_DIR}/tools 
    387387  NPROC=32 
    388   SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_SI3_ST 
     388  SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_ICE_ST 
    389389# 
    390390# Show current revision tag and branch name 
     
    416416# Rebuild and restartability test for SAS 
    417417# clem: not needed anymore 
    418 # for restart_file in WORCA2_SAS_SI3_ST 
     418# for restart_file in WORCA2_SAS_ICE_ST 
    419419# do 
    420420#   restfile $NEMO_VALID $restart_file $pass 
     
    424424 echo "" 
    425425 echo "   !----restart----!   " 
    426  for restart_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_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_ICE_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_ST WSAS_BIPER_ST  
    427427 do 
    428428   resttest $NEMO_VALID $restart_test $pass 
     
    432432 echo "" 
    433433 echo "   !----repro----!   " 
    434  for repro_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WORCA2_SI3_OBS_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST 
     434 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 
    435435 do 
    436436   reprotest $NEMO_VALID $repro_test $pass 
     
    441441 echo "" 
    442442 echo "   !----agrif check----!   " 
    443  dir1=WAGRIF_NORDIC_NOAGRIF_ST 
    444  dir2=WAGRIF_NORDIC_ST 
     443 dir1=WAGRIF_ICE_NOAGRIF_ST 
     444 dir2=WAGRIF_ICE_ST 
    445445 identictest $NEMO_VALID $dir1 $dir2 $pass  
    446446 
Note: See TracChangeset for help on using the changeset viewer.