New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 8226 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE – NEMO

Ignore:
Timestamp:
2017-06-28T10:02:58+02:00 (7 years ago)
Author:
clem
Message:

merge with dev_r8127_AGRIF_LIM3_GHOST@r8189 and dev_r8126_ROBUST08_no_ghost@r8196

Location:
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

    r7646 r8226  
    88module load intel/compiler/64/14.0/2013_sp1.2.144 
    99module load openmpi/intel/64/1.6.5 
    10 module load slurm/2.5.7 
     10module load slurm/16.05.8 
    1111 
    1212# 

  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE/README

    r7646 r8226  
    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_r8183_ICEMODEL/NEMOGCM/SETTE/all_functions.sh

    r7715 r8226  
    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_r8183_ICEMODEL/NEMOGCM/SETTE/sette.sh

    r7756 r8226  
    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 
    … …  
    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. 
    … …  
    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 
    … …  
    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_r8183_ICEMODEL/NEMOGCM/SETTE/sette_beginner.sh

    r4796 r8226  
    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_r8183_ICEMODEL/NEMOGCM/SETTE/sette_rpt.sh

    r7715 r8226  
    11#!/bin/bash -f 
    22# 
     3# set -vx 
    34# simple SETTE report generator. 
    45# 
    … …  
    2324    dorv=`echo $dorv | sed -e 's:.*/::'` 
    2425    f1o=$vdir/$nam/$mach/$dorv/LONG/ocean.output 
    25     f1s=$vdir/$nam/$mach/$dorv/LONG/solver.stat 
     26    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
    2627    f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
    2728    f2o=$vdir/$nam/$mach/$dorv/SHORT/ocean.output 
    28     f2s=$vdir/$nam/$mach/$dorv/SHORT/solver.stat 
     29    f2s=$vdir/$nam/$mach/$dorv/SHORT/run.stat 
    2930    f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat 
    3031 
    … …  
    4647      if [ $? == 0 ]; then 
    4748        if [ $pass == 0 ]; then  
    48           printf "%-20s %s %s\n" $nam  " solver.stat restartability  passed : " $dorv 
    49         fi 
    50       else 
    51         printf "%-20s %s %s\n" $nam  " solver.stat restartability  FAILED : " $dorv  
    52 # 
    53 # Offer view of differences on the second pass 
    54 # 
    55         if [ $pass == 1 ]; then 
    56           echo "<return> to view solver.stat differences" 
     49          printf "%-20s %s %s\n" $nam  " run.stat    restartability  passed : " $dorv 
     50        fi 
     51      else 
     52        printf "%-20s %s %s\n" $nam  " run.stat    restartability  FAILED : " $dorv  
     53# 
     54# Offer view of differences on the second pass 
     55# 
     56        if [ $pass == 1 ]; then 
     57          echo "<return> to view run.stat differences" 
    5758          read y 
    5859          sdiff f1.tmp$$ $f2s 
    … …  
    118119    rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | tail -1l` 
    119120    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    120     f1s=$vdir/$nam/$mach/$dorv/$rep1/solver.stat 
     121    f1s=$vdir/$nam/$mach/$dorv/$rep1/run.stat 
    121122    f1t=$vdir/$nam/$mach/$dorv/$rep1/tracer.stat 
    122123    f2o=$vdir/$nam/$mach/$dorv/$rep2/ocean.output 
    123     f2s=$vdir/$nam/$mach/$dorv/$rep2/solver.stat 
     124    f2s=$vdir/$nam/$mach/$dorv/$rep2/run.stat 
    124125    f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat 
    125126 
    … …  
    139140      if [ $? == 0 ]; then 
    140141        if [ $pass == 0 ]; then  
    141           printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv 
    142         fi 
    143       else 
    144         printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv  
    145 # 
    146 # Offer view of differences on the second pass 
    147 # 
    148         if [ $pass == 1 ]; then 
    149           echo "<return> to view solver.stat differences" 
     142          printf "%-20s %s %s\n" $nam  " run.stat    reproducibility passed : " $dorv 
     143        fi 
     144      else 
     145        printf "%-20s %s %s\n" $nam  " run.stat    reproducibility FAILED : " $dorv  
     146# 
     147# Offer view of differences on the second pass 
     148# 
     149        if [ $pass == 1 ]; then 
     150          echo "<return> to view run.stat differences" 
    150151          read y 
    151152          sdiff f1.tmp$$ $f2s 
    … …  
    199200  mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'` 
    200201  NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'` 
     202  NEMO_VALID=`eval "echo $NEMO_VALID"` 
    201203# 
    202204  if [ ! -d $NEMO_VALID ]; then 

  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE/sette_xios.sh

    r4990 r8226  
    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.