Changeset 8367


Ignore:
Timestamp:
2017-07-24T15:53:53+02:00 (3 years ago)
Author:
gm
Message:

#1918 (ENHANCE-17): PART 1.1 - create NEMO/RK3_SRC as a copy of NEMO/OPA_SRC + SETTE changes associated with HPC09

Location:
branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM
Files:
9 deleted
5 edited
49 copied

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/SETTE/README

    r7646 r8367  
    4545               INPUT_DIR         : directory in which store input files (tar file) 
    4646               TMPDIR            : temporary directory NEEDED ONLY FOR IBM machines (put EXP00 directory) 
    47           NEMO_VALIDATION_DIR : directory in which create NEMO_VALIDATION tree, and store restart, solver.stat, tracer.stat and ocean.output files in 
     47          NEMO_VALIDATION_DIR : directory in which create NEMO_VALIDATION tree, and store restart, run.stat, tracer.stat and ocean.output files in 
    4848                            tree NEMO_VALIDATION_DIR/WCONFIG_NAME/WCOMPILER_NAME/TEST_NAME/REVISION_NUMBER(or DATE) 
    4949 in fcm_job.sh : 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/SETTE/all_functions.sh

    r7715 r8367  
    219219    fi 
    220220    # Save output & debug files in NEMO_VALIDATION tree 
    221     echo "saving ocean & ice output, solver.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
     221    echo "saving ocean & ice output, run.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
    222222    echo "            " >> ${SETTE_DIR}/output.sette 
    223223    [ -f ${EXE_DIR}/ocean.output ] && cp ${EXE_DIR}/*ocean.output ${NEMO_VALID}/. 
    224     [ -f ${EXE_DIR}/solver.stat ] && cp ${EXE_DIR}/*solver.stat ${NEMO_VALID}/. 
     224    [ -f ${EXE_DIR}/run.stat ] && cp ${EXE_DIR}/*run.stat ${NEMO_VALID}/. 
    225225    [ -f ${EXE_DIR}/output.namelist.dyn ] && cp ${EXE_DIR}/*output.nam* ${NEMO_VALID}/. 
    226226    [ -f ${EXE_DIR}/tracer.stat ] && cp ${EXE_DIR}/*tracer.stat ${NEMO_VALID}/. 
    227227 
    228     if [ -n "$(ls ${NEMO_VALID}/*solver*)" ] ; then 
    229    echo "moved solver.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    230    echo "moved solver.stat in ${NEMO_VALID} directory"   
     228    if [ -n "$(ls ${NEMO_VALID}/*run*)" ] ; then 
     229   echo "moved run.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     230   echo "moved run.stat in ${NEMO_VALID} directory"   
    231231    else 
    232    echo "problem in looking for solver.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    233    echo "solver.stat IS NOT in ${NEMO_VALID} directory"  
     232   echo "problem in looking for run.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     233   echo "run.stat IS NOT in ${NEMO_VALID} directory"  
    234234    fi 
    235235    if [ -n "$(ls ${NEMO_VALID}/*ocean.output*)" ] ; then 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/SETTE/sette.sh

    r7756 r8367  
    5656#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5757#   post_test_tidyup : creates validation storage directory and copies required output files  
    58 #                      (solver.stat and ocean.output) in it after execution of test. 
     58#                      (run.stat and ocean.output) in it after execution of test. 
    5959# 
    6060#  VALIDATION tree is: 
     
    137137# ORCA2_OFF_PISCES  :  5 &  6 
    138138# AMM12             :  7 &  8  
    139 # SAS               :  9     fos SAS there is no solver so is useless to test REPRO 
     139# SAS               :  9     fos SAS there is no run.stat so is useless to test REPRO 
    140140# ISOMIP            : 10 & 11 
    141141# ORCA2_LIM3_OBS    : 12 
     
    661661    export TEST_NAME="LONG" 
    662662    cd ${CONFIG_DIR0} 
    663     . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 add_key "key_tide" del_key ${DEL_KEYS} 
     663    . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 del_key ${DEL_KEYS} 
    664664    cd ${SETTE_DIR} 
    665665    . ./param.cfg 
     
    10981098    export TEST_NAME="SHORT" 
    10991099    cd ${CONFIG_DIR0} 
    1100     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
     1100    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
    11011101    cd ${SETTE_DIR} 
    11021102    . ./param.cfg 
     
    11211121    set_namelist 1_namelist_cfg nn_it000 1 
    11221122    set_namelist 1_namelist_cfg nn_itend 150 
     1123    set_namelist 1_namelist_cfg nn_fsbc 1 
    11231124    set_namelist 1_namelist_cfg ln_ctl .false. 
    11241125    set_namelist 1_namelist_cfg ln_clobber .true. 
     
    11441145    export TEST_NAME="SHORT_NOZOOM" 
    11451146    cd ${CONFIG_DIR0} 
    1146     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
     1147    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
    11471148    cd ${SETTE_DIR} 
    11481149    . ./param.cfg 
     
    11811182    export TEST_NAME="SHORT_NOAGRIF" 
    11821183    cd ${CONFIG_DIR0} 
    1183     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_zdftmx key_top" 
     1184    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_top" 
    11841185    cd ${SETTE_DIR} 
    11851186    . ./param.cfg 
     
    12191220    export TEST_NAME="LONG" 
    12201221    cd ${CONFIG_DIR0} 
    1221     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
     1222    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
    12221223    cd ${SETTE_DIR} 
    12231224    . ./param.cfg 
     
    12451246    set_namelist 1_namelist_cfg nn_itend 300 
    12461247    set_namelist 1_namelist_cfg nn_stock 150 
     1248    set_namelist 1_namelist_cfg nn_fsbc 1 
    12471249    set_namelist 1_namelist_cfg ln_ctl .false. 
    12481250    set_namelist 1_namelist_cfg ln_clobber .true. 
     
    12831285    set_namelist 1_namelist_cfg nn_itend 300 
    12841286    set_namelist 1_namelist_cfg nn_stock 150 
     1287    set_namelist 1_namelist_cfg nn_fsbc 1 
    12851288    set_namelist 1_namelist_cfg ln_rstart .true. 
    12861289    set_namelist 1_namelist_cfg nn_rstctl 2 
     
    13161319    export TEST_NAME="REPRO_4_4" 
    13171320    cd ${CONFIG_DIR0} 
    1318     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
     1321    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
    13191322    cd ${SETTE_DIR} 
    13201323    . ./param.cfg 
     
    13391342    set_namelist 1_namelist_cfg nn_it000 1 
    13401343    set_namelist 1_namelist_cfg nn_itend 150 
     1344    set_namelist 1_namelist_cfg nn_fsbc 1 
    13411345    set_namelist 1_namelist_cfg ln_ctl .false. 
    13421346    set_namelist 1_namelist_cfg ln_clobber .true. 
     
    13781382    set_namelist 1_namelist_cfg nn_itend 150 
    13791383    set_namelist 1_namelist_cfg ln_ctl .false. 
     1384    set_namelist 1_namelist_cfg nn_fsbc 1 
    13801385    set_namelist 1_namelist_cfg ln_clobber .true. 
    13811386    set_namelist 1_namelist_cfg ln_read_cfg .true. 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/SETTE/sette_beginner.sh

    r4796 r8367  
    5555#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5656#   post_test_tidyup : creates validation storage directory and copies required output files  
    57 #                      (solver.stat and ocean.output) in it after execution of test. 
     57#                      (run.stat and ocean.output) in it after execution of test. 
    5858# 
    5959#  VALIDATION tree is: 
  • branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/SETTE/sette_xios.sh

    r4990 r8367  
    5252#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5353#   post_test_tidyup : creates validation storage directory and copies required output files  
    54 #                      (solver.stat and ocean.output) in it after execution of test. 
     54#                      (run.stat and ocean.output) in it after execution of test. 
    5555# 
    5656#  VALIDATION tree is: 
Note: See TracChangeset for help on using the changeset viewer.