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 8841 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE – NEMO

Ignore:
Timestamp:
2017-11-29T05:08:05+01:00 (6 years ago)
Author:
deazer
Message:

Bring in Trunk Changes at version 8814
This revision wont run as is, requires next revision with merged changes
This revision serves as a reference point to what changes from the trunk at brought in by the merge
in the next revision

Location:
branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE
Files:
2 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT

    r3631 r8841  
    6565  export INPUT_DIR=DEF_INPUT_DIR 
    6666  export CONFIG_DIR=DEF_CONFIG_DIR 
     67  export TOOLS_DIR=DEF_TOOLS_DIR 
    6768  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    6869  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-IBM_EKMAN_INGV

    r5301 r8841  
    4747  export INPUT_DIR=DEF_INPUT_DIR 
    4848  export CONFIG_DIR=DEF_CONFIG_DIR 
     49  export TOOLS_DIR=DEF_TOOLS_DIR 
    4950  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    5051  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_CALYPSO

    r3294 r8841  
    4343  export INPUT_DIR=DEF_INPUT_DIR 
    4444  export CONFIG_DIR=DEF_CONFIG_DIR 
     45  export TOOLS_DIR=DEF_TOOLS_DIR 
    4546  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4647  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_METO

    r4285 r8841  
    4848  export INPUT_DIR=DEF_INPUT_DIR 
    4949  export CONFIG_DIR=DEF_CONFIG_DIR 
     50  export TOOLS_DIR=DEF_TOOLS_DIR 
    5051  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    5152  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_MONSOON

    r5029 r8841  
    4747  export INPUT_DIR=DEF_INPUT_DIR 
    4848  export CONFIG_DIR=DEF_CONFIG_DIR 
     49  export TOOLS_DIR=DEF_TOOLS_DIR 
    4950  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    5051  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA

    r7715 r8841  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 1:30:00 
     13# @ wall_clock_limit = 00:59:00 
    1414# @ queue 
    1515 
    … …  
    4444  export INPUT_DIR=DEF_INPUT_DIR 
    4545  export CONFIG_DIR=DEF_CONFIG_DIR 
     46  export TOOLS_DIR=DEF_TOOLS_DIR 
    4647  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4748  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_DEBUG

    r7715 r8841  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 1:30:00 
     13# @ wall_clock_limit = 00:59:00 
    1414# @ queue 
    1515 
    … …  
    4444  export INPUT_DIR=DEF_INPUT_DIR 
    4545  export CONFIG_DIR=DEF_CONFIG_DIR 
     46  export TOOLS_DIR=DEF_TOOLS_DIR 
    4647  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4748  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0

    r7715 r8841  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 1:30:00 
     13# @ wall_clock_limit = 00:59:00 
    1414# @ queue 
    1515 
    … …  
    4545  export INPUT_DIR=DEF_INPUT_DIR 
    4646  export CONFIG_DIR=DEF_CONFIG_DIR 
     47  export TOOLS_DIR=DEF_TOOLS_DIR 
    4748  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4849  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_CURIE

    r5407 r8841  
    4545  export INPUT_DIR=DEF_INPUT_DIR 
    4646  export CONFIG_DIR=DEF_CONFIG_DIR 
     47  export TOOLS_DIR=DEF_TOOLS_DIR 
    4748  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4849  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

    r7646 r8841  
    4242  export INPUT_DIR=DEF_INPUT_DIR 
    4343  export CONFIG_DIR=DEF_CONFIG_DIR 
     44  export TOOLS_DIR=DEF_TOOLS_DIR 
    4445  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4546  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO

    r6140 r8841  
    4040  export INPUT_DIR=DEF_INPUT_DIR 
    4141  export CONFIG_DIR=DEF_CONFIG_DIR 
     42  export TOOLS_DIR=DEF_TOOLS_DIR 
    4243  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4344  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL

    r4814 r8841  
    5050  export INPUT_DIR=DEF_INPUT_DIR 
    5151  export CONFIG_DIR=DEF_CONFIG_DIR 
     52  export TOOLS_DIR=DEF_TOOLS_DIR 
    5253  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    5354  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena

    r7646 r8841  
    4343  export INPUT_DIR=DEF_INPUT_DIR 
    4444  export CONFIG_DIR=DEF_CONFIG_DIR 
     45  export TOOLS_DIR=DEF_TOOLS_DIR 
    4546  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4647  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios

    r7646 r8841  
    4949  export INPUT_DIR=DEF_INPUT_DIR 
    5050  export CONFIG_DIR=DEF_CONFIG_DIR 
     51  export TOOLS_DIR=DEF_TOOLS_DIR 
    5152  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    5253  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx

    r4147 r8841  
    4444  export INPUT_DIR=DEF_INPUT_DIR 
    4545  export CONFIG_DIR=DEF_CONFIG_DIR 
     46  export TOOLS_DIR=DEF_TOOLS_DIR 
    4647  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4748  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx_debug

    r7646 r8841  
    4444  export INPUT_DIR=DEF_INPUT_DIR 
    4545  export CONFIG_DIR=DEF_CONFIG_DIR 
     46  export TOOLS_DIR=DEF_TOOLS_DIR 
    4647  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4748  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-mpmd-ALTIX_NAUTILUS_MPT

    r3736 r8841  
    6868  export INPUT_DIR=DEF_INPUT_DIR 
    6969  export CONFIG_DIR=DEF_CONFIG_DIR 
     70  export TOOLS_DIR=DEF_TOOLS_DIR 
    7071  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    7172  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_NAVITI_MERCATOR

    r5559 r8841  
    4040  export INPUT_DIR=DEF_INPUT_DIR 
    4141  export CONFIG_DIR=DEF_CONFIG_DIR 
     42  export TOOLS_DIR=DEF_TOOLS_DIR 
    4243  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4344  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template

    r3608 r8841  
    4444  export INPUT_DIR=DEF_INPUT_DIR 
    4545  export CONFIG_DIR=DEF_CONFIG_DIR 
     46  export TOOLS_DIR=DEF_TOOLS_DIR 
    4647  export NEMO_VALIDATION_DIR=DEF_NEMO_VALIDATION 
    4748  export NEW_CONF=DEF_NEW_CONF 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/all_functions.sh

    r7715 r8841  
    172172echo "COMPILER is : ${CMP_NAM}" 
    173173echo "TEST is : ${TEST_NAME}" 
     174echo "TOOLS directory is : ${TOOLS_DIR}" 
    174175################################################################ 
    175176# SMALL DEBUG 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/prepare_job.sh

    r7753 r8841  
    151151fi 
    152152################################################################ 
    153  
    154 ########################################################################## 
    155 # COPY RESTART FILES (if needed; i.e. only for SHORT job in RESTART TESTS) 
    156 # get the input tarfile if needed 
    157 # SF : not ok for the moment because at this point is needed cn_exp variable, 
    158 # SF : here it it not known. 
    159 #\cd ${EXE_DIR} 
    160 #if [ "$(echo ${TEST_NAME} | grep -c "SHORT" )" -ne 0 ] ; then 
    161 #    for (( i=1; i<=${NB_PROC}; ${NB_PROC}++)) ; do 
    162 #        L_NPROC=`printf "%04d\n" $i` 
    163 #        ln -sf ../LONG/${NEW_CONF}_00000060_restart_${L_NPROC-1}.nc . 
    164 #    done 
    165 #fi 
    166 ## SF : other way 
    167 ##      for file in ../LONG/${NEW_CONF}_*restart_0*.nc ; do 
    168 ##              ncpu=`echo $file | awk -F '_' '{print $NF}' | cut -f 1 -d '.'` 
    169 ##              ln -sf ${file}  . 
    170 ##      done 
    171 ##fi 
    172 ########################################################################## 
    173153 
    174154################################################################ 
    … …  
    309289             -e"s:DEF_EXE_DIR:${EXE_DIR}:" \ 
    310290             -e"s:DEF_CONFIG_DIR:${CONFIG_DIR}:" \ 
     291             -e"s:DEF_TOOLS_DIR:${TOOLS_DIR}:" \ 
    311292             -e"s:MPI_FLAG:${MPI_FLAG}:" \ 
    312293             -e"s:DEF_NEMO_VALIDATION:${NEMO_VALIDATION_DIR}:" -e"s:DEF_NEW_CONF:${NEW_CONF}:" \ 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/sette.sh

    r7756 r8841  
    144144 
    145145for config in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
    146  
    147146do 
    148147 
    … …  
    661660    export TEST_NAME="LONG" 
    662661    cd ${CONFIG_DIR0} 
    663     . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 add_key "key_tide" del_key ${DEL_KEYS} 
     662    . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 del_key ${DEL_KEYS} 
    664663    cd ${SETTE_DIR} 
    665664    . ./param.cfg 
    … …  
    800799    set_namelist namelist_cfg cn_exp \"SAS\" 
    801800    set_namelist namelist_cfg nn_it000 1 
    802     set_namelist namelist_cfg nn_itend 100 
    803     set_namelist namelist_cfg nn_stock 50 
     801    set_namelist namelist_cfg nn_itend 240 
     802    set_namelist namelist_cfg nn_stock 120 
    804803    set_namelist namelist_cfg ln_ctl .false. 
    805804    set_namelist namelist_cfg ln_clobber .true. 
    … …  
    823822    cd ${EXE_DIR} 
    824823    set_namelist namelist_cfg cn_exp \"SAS\" 
    825     set_namelist namelist_cfg nn_it000 51 
    826     set_namelist namelist_cfg nn_itend 100 
     824    set_namelist namelist_cfg nn_it000 121 
     825    set_namelist namelist_cfg nn_itend 240 
    827826    set_namelist namelist_cfg ln_ctl .false. 
    828827    set_namelist namelist_cfg ln_clobber .true. 
    … …  
    835834    set_namelist namelist_cfg ln_rstart .true. 
    836835    set_namelist namelist_cfg nn_rstctl 2 
    837     set_namelist namelist_ice_cfg cn_icerst_in \"SAS_00000050_restart_ice\" 
     836    set_namelist namelist_cfg nn_date0 010106 
     837    set_namelist namelist_cfg cn_ocerst_in \"SAS_00000120_restart\" 
     838    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_00000120_restart_ice\" 
    838839    if [ ${USING_MPMD} == "yes" ] ; then 
    839840       set_xio_using_server iodef.xml true 
    … …  
    844845        L_NPROC=$(( $i - 1 )) 
    845846        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    846         ln -sf ../LONG/SAS_00000050_restart_ice_${L_NPROC}.nc . 
     847        ln -sf ../LONG/SAS_00000120_restart_${L_NPROC}.nc . 
     848        ln -sf ../LONG/SAS_00000120_restart_ice_${L_NPROC}.nc . 
    847849    done 
    848850    cd ${SETTE_DIR} 
    … …  
    12191221    export TEST_NAME="LONG" 
    12201222    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" 
     1223    . ./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 key_zdftmx" del_key "key_zdftmx_new key_top" 
    12221224    cd ${SETTE_DIR} 
    12231225    . ./param.cfg 
    … …  
    12451247    set_namelist 1_namelist_cfg nn_itend 300 
    12461248    set_namelist 1_namelist_cfg nn_stock 150 
     1249    set_namelist 1_namelist_cfg nn_fsbc 1 
    12471250    set_namelist 1_namelist_cfg ln_ctl .false. 
    12481251    set_namelist 1_namelist_cfg ln_clobber .true. 
    … …  
    12831286    set_namelist 1_namelist_cfg nn_itend 300 
    12841287    set_namelist 1_namelist_cfg nn_stock 150 
     1288    set_namelist 1_namelist_cfg nn_fsbc 1 
    12851289    set_namelist 1_namelist_cfg ln_rstart .true. 
    12861290    set_namelist 1_namelist_cfg nn_rstctl 2 
    … …  
    12931297    set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
    12941298    set_namelist 1_namelist_cfg cn_ocerst_in \"O2LP_LONG_00000150_restart\" 
     1299    set_namelist 1_namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000150_restart_ice\" 
    12951300 
    12961301    for (( i=1; i<=$NPROC; i++)) ; do 
    … …  
    13001305        ln -sf ../LONG/O2LP_LONG_00000075_restart_ice_${L_NPROC}.nc . 
    13011306        ln -sf ../LONG/1_O2LP_LONG_00000150_restart_${L_NPROC}.nc . 
     1307        ln -sf ../LONG/1_O2LP_LONG_00000150_restart_ice_${L_NPROC}.nc . 
    13021308    done 
    13031309    if [ ${USING_MPMD} == "yes" ] ; then 
    … …  
    13161322    export TEST_NAME="REPRO_4_4" 
    13171323    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" 
     1324    . ./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 key_zdftmx" del_key "key_zdftmx_new key_top" 
    13191325    cd ${SETTE_DIR} 
    13201326    . ./param.cfg 
    … …  
    13391345    set_namelist 1_namelist_cfg nn_it000 1 
    13401346    set_namelist 1_namelist_cfg nn_itend 150 
     1347    set_namelist 1_namelist_cfg nn_fsbc 1 
    13411348    set_namelist 1_namelist_cfg ln_ctl .false. 
    13421349    set_namelist 1_namelist_cfg ln_clobber .true. 
    … …  
    13771384    set_namelist 1_namelist_cfg nn_it000 1 
    13781385    set_namelist 1_namelist_cfg nn_itend 150 
     1386    set_namelist 1_namelist_cfg nn_fsbc 1 
    13791387    set_namelist 1_namelist_cfg ln_ctl .false. 
    13801388    set_namelist 1_namelist_cfg ln_clobber .true. 

  • branches/UKMO/ROMS_WAD_7832/NEMOGCM/SETTE/sette_rpt.sh

    r7715 r8841  
    11#!/bin/bash -f 
     2#set -vx 
    23# 
    34# simple SETTE report generator. 
    … …  
    1011######################### Start of function definitions ################################# 
    1112## 
     13 
     14function restfile() { 
     15# Rebuild ice restart for SAS CONFIG, and restartability checks. Expects LONG and SHORT run directories. 
     16# For Stand Alone Surface configuration ocean is not running, just run ice model; so no outputs ocean files. 
     17# Compares LONG rebuild restart ice file with equivalent entry from the SHORT rebuild restart ice file. 
     18# 
     19  vdir=$1 
     20  nam=$2 
     21  pass=$3 
     22# 
     23  if [ -d $vdir/$nam ]; then 
     24    dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l ` 
     25    dorv=`echo $dorv | sed -e 's:.*/::'` 
     26    rep1=`ls -1rt $vdir/$nam/$mach/$dorv/ | tail -2l | head -1 ` 
     27    rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | tail -1l` 
     28    cd ${SAS_RESTART_DIR}/LONG 
     29    #SF add here compilation of rebuild_tools to rebuild restart files, and add comparison of restart files 
     30    cd ${TOOLS_DIR} 
     31    ./maketools -n REBUILD_NEMO -m ${mach} > /dev/null 2>&1 
     32    cd ${TOOLS_DIR}/REBUILD_NEMO 
     33    #SF echo "REBUILD LONG restart SAS files, without standard output" 
     34    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000100_restart_ice  $NPROC > /dev/null 2>&1 
     35    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
     36    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&- 
     37    cd ${SAS_RESTART_DIR}/LONG 
     38    #SF echo "COPY rebuild restart files" 
     39    cp SAS_00000100_restart_ice.nc $vdir/$nam/$mach/$dorv/LONG/. 
     40    cp ../SHORT/SAS_00000100_restart_ice.nc $vdir/$nam/$mach/$dorv/SHORT/. 
     41 
     42    f1o=$vdir/$nam/$mach/$dorv/LONG/SAS_00000100_restart_ice.nc 
     43    f2o=$vdir/$nam/$mach/$dorv/SHORT/SAS_00000100_restart_ice.nc 
     44    if  [ ! -f $f1o ] &&  [ ! -f $f2o ] ; then 
     45      printf "%-20s %s\n" $nam " REBUILD SAS restart ice DOES NOT exists; incomplete test"; 
     46      return; 
     47    fi 
     48    # 
     49    done_oce=0 
     50    # 
     51    if  [  -f $f1o ] && [  -f $f2o ]; then 
     52      cmp -s $f1o $f2o  
     53      #SF  cmp SAS_00000100_restart_ice.nc  ../SHORT/SAS_00000100_restart_ice.nc  > diff_restart.txt 
     54      if [ $? == 0 ]; then 
     55        if [ $pass == 0 ]; then 
     56          printf "%-20s %s %s\n" $nam  " SAS restart files are IDENTICAL :  passed : " $dorv 
     57        fi 
     58      else 
     59        printf "%-20s %s %s\n" $nam  " SAS restart files are DIFFERENT : FAILED : " $dorv  
     60        # 
     61   # Offer view of differences on the second pass 
     62   # 
     63        if [ $pass == 1 ]; then 
     64          echo "BE CAREFUL:  NEED cdo to see differences!!!!! " 
     65          echo "DO which cdo and replace cdo PATH to the cdo command in SETTE_rpt.sh " 
     66          echo "IF cdo is not available you need to do difference of netcdf file by hand" 
     67          echo "<return> to view restart_ice.nc differences" 
     68          read y 
     69          cdo -diffv $f1o $f2o 
     70          done_oce=1 
     71          #echo "<return> to continue" 
     72          #read y 
     73        fi 
     74      fi 
     75    fi 
     76# 
     77fi 
     78} 
     79 
    1280function resttest() {  
    1381# 
    … …  
    199267  mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'` 
    200268  NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'` 
     269# Directory to run the tests 
     270 SETTE_DIR=$(cd $(dirname "$0"); pwd) 
     271 MAIN_DIR=$(dirname $SETTE_DIR) 
     272 CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     273 TOOLS_DIR=${MAIN_DIR}/TOOLS 
     274 COMPIL_DIR=${TOOLS_DIR}/COMPILE 
     275 NPROC=32 
     276 
     277  SAS_RESTART_DIR=${CONFIG_DIR0}/SAS_LONG 
    201278# 
    202279  if [ ! -d $NEMO_VALID ]; then 
    … …  
    205282  fi 
    206283# 
     284 
    207285# The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory 
    208286#   
    … …  
    212290 if [ $pass == 1 ]; then echo "---------------2nd pass------------------";fi 
    213291# 
     292 
     293# Rebuild and restartability test for SAS 
     294# 
     295 for restart_file in WSAS_LONG 
     296 do 
     297 #  restfile $SAS_RESTART_DIR LONG $pass 
     298   restfile $NEMO_VALID $restart_file $pass 
     299 done 
     300# 
    214301# Restartability test 
    215302# 
    216  for restart_test in WGYREPIS_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WSAS_LONG WISOMIP_LONG WORCA2AGUL_LONG 
     303 for restart_test in WGYREPIS_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
    217304 do 
    218305   resttest $NEMO_VALID $restart_test $pass 
Note: See TracChangeset for help on using the changeset viewer.