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 10687 – NEMO

Changeset 10687


Ignore:
Timestamp:
2019-02-15T13:05:30+01:00 (5 years ago)
Author:
mathiot
Message:

first commit on sette changes suggested in ticket2239

Location:
NEMO/branches/2019/fix_sette_ticket2239
Files:
1 added
1 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/fix_sette_ticket2239/README

    r9019 r10687  
    22 
    33principal script is sette.sh (usage: ./sette.sh)  
     4 
     5sette.sh is a simple wrapper running test on the reference configuration, test cases and generate the report at the end. 
     6sette_cfg-ref.sh, sette_test-cases.sh and the report generation can still be run separatly for debugging purposes 
    47 
    58VERY IMPORTANT : for a verbose debug do: 
    … …  
    811 
    912USER MODIFICATIONS 
    10  in sette.sh script : 
    11                COMPILER    : compiler among those available in NEMOGCM/ARCH, needed for makenemo (see below) 
    12                              can also be pass as an argument, e.g. ./sette.sh ifort_osx 
    13           BATCH_COMMAND_PAR : command for job submission in batch mode parallel (MMIÂ) 
     13 in sette_cfg-ref.sh and sette_test-cases.sh script : 
     14               OPTIONAL ARGUMENT : compiler among those available in NEMOGCM/ARCH (if nothing will use the one specified in paramd.cfg) 
     15          BATCH_COMMAND_PAR : command for job submission in batch mode parallel (MMIÂ) specified in param.cfg 
    1416          BATCH_COMMAND_SEQ : command for job submission in batch mode sequential (NB_PROC = 1) 
     17                                   default value is the BATCH_COMMAND_PAR value 
    1518          INTERACT_FLAG : "yes" if you want to run in interactive mode  
    1619                      "no" if you want to run in batch mode 
    … …  
    4245 
    4346 in param.cfg : 
     47                
     48               COMPILER    : compiler among those available in NEMOGCM/ARCH 
    4449               FORCING_DIR       : directory in which will be found input.tar file (same name in input_CONFIG_NAME.cfg) 
    4550               INPUT_DIR         : directory in which store input files (tar file) 
     51                                     reference configuration input tar file could be found here : https://zenodo.org/record/1472245 
    4652               TMPDIR            : temporary directory NEEDED ONLY FOR IBM machines (put EXP00 directory) 
    4753          NEMO_VALIDATION_DIR : directory in which create NEMO_VALIDATION tree, and store restart, run.stat, tracer.stat and ocean.output files in 
    4854                            tree NEMO_VALIDATION_DIR/WCONFIG_NAME/WCOMPILER_NAME/TEST_NAME/REVISION_NUMBER(or DATE) 
     55               BATCH_CMD           : command for job submission in batch mode 
     56               SVN_CMD             : svn command use to do svn info (default svn). Could be useful if you are using git svn 
     57               NEMO_VALIDATION_REF : reference directory 
     58               NEMO_REV_REF        : reference revision 
     59                                   : Reference directory for result comparison will be NEMO_VALIDATION_REF/COMPILER/NEMO_REV_REF 
     60               ADD_NODIGNEDZERO    : set "yes" if you need key_nosignedzero to run nemo 
     61 
    4962 in fcm_job.sh : 
    5063               IMPORTANT : control that name of tar file in FORCING directory 
    … …  
    79921. see in SETTE/BATCH_TEMPLATE directory existing examples 
    80932. create you own batch file like: batch-${COMPILER} 
    81 (note: sette.sh will copy it in job_batch_template if you run tests in INTERACT_FLAG="no") 
     94(note: sette_test-cases.sh and sette_cfg-ref.sh will copy it in job_batch_template if you run tests in INTERACT_FLAG="no") 

  • NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

    r10632 r10687  
    141141   fi 
    142142 
    143         sed -e "s:${VAR_NAME}.*:${VAR_NAME}:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
     143        ARGS_LST="${@:3}" 
     144        sed -e "s;${VAR_NAME}.*;${VAR_NAME};" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
    144145        mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 
    145         sed -e "s:${VAR_NAME}:$2=$3:"  ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
     146        sed -e "s;${VAR_NAME};$2=${ARGS_LST};"  ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
    146147        mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 
    147148 
    … …  
    195196################################################################ 
    196197# Creation of NEMO_VALIDATION tree 
    197     export LANG=en_US  
    198     REVISION_NB=`svn info ${SETTE_DIR}/../.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
     198    LANG=en_US  
     199    REVISION_NB=`LC_MESSAGES=${LANG} svn info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` 
    199200    if [ ${#REVISION_NB} -eq 0 ] 
    200201    then 

  • NEMO/branches/2019/fix_sette_ticket2239/param.cfg

    r10632 r10687  
    1 #- forcing files storing 
     1# Computer dependant variable needed to run sette 
     2# 
     3# Compiler among those in NEMOGCM/ARCH 
     4COMPILER=X64_ADA 
     5# 
     6# BATCH command 
     7BATCH_CMD=llsubmit 
     8# 
     9#- FORCING files storing 
    210FORCING_DIR=$WORKDIR/FORCING 
    3 #- input files storing 
     11# 
     12#- INPUT files storing 
    413INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     14# 
     15#- VALIDATION files storing 
     16NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION 
     17# 
     18# REFERENCE run.stat tracer.stat you want to compare with 
     19# (if no change to the default, no check on result change will be done) 
     20NEMO_VALIDATION_REF=/path/to/reference/sette/results 
     21NEMO_REV_REF=0000 
     22# 
     23# CMD for svn (some people use git svn)  
     24# used in sette_rpt and in all_function to display revision and build correct repository name 
     25SVN_CMD=svn 
     26# 
    527#- only for IBM 
    628#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    7 #- VALIDATION files storing 
    8 NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION 
     29# 
     30#- key_nosignedzero 
     31ADD_NOSIGNEDZERO="yes" 

  • NEMO/branches/2019/fix_sette_ticket2239/sette_cfg-ref.sh

    r10686 r10687  
    8787######################################################################################### 
    8888# 
    89 # Compiler among those in NEMOGCM/ARCH 
    90 COMPILER=X64_ADA 
    91  
    92 export BATCH_COMMAND_PAR="llsubmit" 
    93 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR  
     89# LOAD param value 
     90. ./param.cfg 
     91 
     92export BATCH_COMMAND_PAR=${BATCH_CMD} 
     93export BATCH_COMMAND_SEQ=${BATCH_CMD} 
    9494export INTERACT_FLAG="no" 
    9595export MPIRUN_FLAG="yes" 
    … …  
    101101 then  
    102102   export DEL_KEYS="" 
     103fi 
     104# 
     105export ADD_KEYS="" 
     106if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
     107 then 
     108   export ADD_KEYS="key_nosignedzero" 
    103109fi 
    104110# 
    … …  
    153159    export TEST_NAME="LONG" 
    154160    cd ${MAIN_DIR} 
    155     . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
     161    . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    156162    cd ${SETTE_DIR} 
    157163    . ./param.cfg 
    … …  
    285291    export TEST_NAME="LONG" 
    286292    cd ${MAIN_DIR} 
    287     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j 8 del_key ${DEL_KEYS} 
     293    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    288294    cd ${SETTE_DIR} 
    289295    . ./param.cfg 
    … …  
    311317    set_namelist namelist_cfg ln_stcor .true. 
    312318    set_namelist namelist_cfg ln_tauwoc .true. 
     319    set_namelist namelist_cfg nn_fsbc 5 
    313320    # 
    314321    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     322    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    315323    # 
    316324    set_namelist namelist_ice_cfg ln_icediachk .true. 
    … …  
    360368    set_namelist namelist_cfg ln_stcor .true. 
    361369    set_namelist namelist_cfg ln_tauwoc .true. 
     370    set_namelist namelist_cfg nn_fsbc 5 
    362371    # 
    363372    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     373    set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    364374    # 
    365375    set_namelist namelist_ice_cfg ln_icediachk .true. 
    … …  
    430440    set_namelist namelist_cfg ln_stcor .true. 
    431441    set_namelist namelist_cfg ln_tauwoc .true. 
     442    set_namelist namelist_cfg nn_fsbc 5 
    432443 
    433444    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     445    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
     446 
    434447    set_namelist namelist_top_cfg ln_trcdta .false. 
    435448    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    … …  
    478491    set_namelist namelist_cfg ln_stcor .true. 
    479492    set_namelist namelist_cfg ln_tauwoc .true. 
     493    set_namelist namelist_cfg nn_fsbc 5 
     494 
    480495    if [ ${USING_ICEBERGS} == "no" ] ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
     496    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
     497 
    481498    set_namelist namelist_top_cfg ln_trcdta .false. 
    482499    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    … …  
    511528    export TEST_NAME="LONG" 
    512529    cd ${MAIN_DIR} 
    513     . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
     530    . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST -r ORCA2_OFF_PISCES -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    514531    cd ${SETTE_DIR} 
    515532    . ./param.cfg 
    … …  
    693710    export TEST_NAME="LONG" 
    694711    cd ${MAIN_DIR} 
    695     . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 del_key ${DEL_KEYS} 
     712    . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    696713    cd ${SETTE_DIR} 
    697714    . ./param.cfg 
    … …  
    812829    export TEST_NAME="LONG" 
    813830    cd ${MAIN_DIR} 
    814     . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j 8 del_key ${DEL_KEYS} 
     831    . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    815832    cd ${SETTE_DIR} 
    816833    . ./param.cfg 
    … …  
    938955    export TEST_NAME="REPRO_4_8" 
    939956    cd ${MAIN_DIR} 
    940     . ./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" 
     957    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc ${ADD_KEYS}" del_key "key_top" 
    941958    cd ${SETTE_DIR} 
    942959    . ./param.cfg 
    … …  
    10521069    export TEST_NAME="LONG" 
    10531070    cd ${MAIN_DIR} 
    1054     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j 8 del_key ${DEL_KEYS} 
     1071    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    10551072    cd ${SETTE_DIR} 
    10561073    . ./param.cfg 
    … …  
    13111328    export TEST_NAME="ORCA2" 
    13121329    cd ${MAIN_DIR} 
    1313     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 del_key "key_agrif" 
     1330    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 add_key ${ADD_KEYS} del_key "key_agrif" 
    13141331    cd ${SETTE_DIR} 
    13151332    . ./param.cfg 
    … …  
    13461363    export TEST_NAME="LONG" 
    13471364    cd ${MAIN_DIR} 
    1348     . ./makenemo -m ${CMP_NAM} -n SPITZ12_ST -r SPITZ12 -j 8 del_key ${DEL_KEYS} 
     1365    . ./makenemo -m ${CMP_NAM} -n SPITZ12_ST -r SPITZ12 -j 8 add_key ${ADD_KEYS} del_key ${DEL_KEYS} 
    13491366    cd ${SETTE_DIR} 
    13501367    . ./param.cfg 

  • NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

    r10517 r10687  
    275275  fi 
    276276} 
     277function runcmpres(){ 
     278# 
     279# compare *.stat file with reference file from a previous sette test or previous version 
     280# store in NEMO_VALID_REF at revision NEMO_REV_REF 
     281# Compares end of stat files from each 
     282# 
     283  vdir=$1 
     284  nam=$2 
     285  vdirref=$3 
     286  dorvref=$4 
     287  pass=$5 
     288# 
     289  if [ -d $vdir/$nam ]; then 
     290    dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l ` 
     291    dorv=`echo $dorv | sed -e 's:.*/::'` 
     292    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
     293    f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
     294    f2s=$vdirref/$nam/$mach/$dorvref/LONG/run.stat 
     295    f2t=$vdirref/$nam/$mach/$dorvref/LONG/tracer.stat 
     296    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then 
     297      printf "%-20s %s\n" $nam " incomplete test"; 
     298      return; 
     299    fi 
     300    if  [ ! -f $f2s ] && [ ! -f $f2t ] ; then 
     301      printf "%-20s %s\n" $nam " incomplete test"; 
     302      return; 
     303    fi 
     304# 
     305    done_oce=0 
     306 
     307    if  [ -f $f1s ] && [ -f $f2s ] ; then 
     308      cmp -s $f1s $f2s 
     309      if [ $? == 0 ]; then 
     310        if [ $pass == 0 ]; then 
     311          printf "%-20s %s %s\n" $nam  " run.stat    before/after are similar " 
     312        fi 
     313      else 
     314        printf "%-20s %s %s\n" $nam  " run.stat    before/after are DIFFERENT " 
     315# 
     316# Offer view of differences on the second pass 
     317# 
     318        if [ $pass == 1 ]; then 
     319          echo "<return> to view run.stat differences" 
     320          read y 
     321          sdiff f1.tmp$$ $f2s 
     322          done_oce=1 
     323          echo "<return> to continue" 
     324          read y 
     325        fi 
     326      fi 
     327    fi 
     328    # Check tracer.stat files (if they exist) 
     329# 
     330    if  [ -f $f1t ] && [ -f $f2t ] ; then 
     331      cmp -s $f1t $f2t 
     332      if [ $? == 0 ]; then 
     333        if [ $pass == 0 ]; then           
     334          printf "%-20s %s %s\n" $nam  " tracer.stat before/after are similar " 
     335        fi 
     336      else 
     337        printf "%-20s %s %s\n" $nam  " tracer.stat before/after are DIFFERENT " 
     338# 
     339# Offer view of differences on the second pass 
     340# 
     341        if [ $pass == 1 ]; then 
     342          echo "<return> to view tracer.stat differences" 
     343          read y 
     344          sdiff $f1t $f2t 
     345        fi 
     346      fi 
     347    fi 
     348  fi 
     349} 
    277350 
    278351function runtest(){ 
    … …  
    296369    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    297370    if  [ ! -f $f1o ] ; then 
    298       printf "%-27s %s %s\n" $nam " ocean.output is MISSING            : " $dorv 
     371      if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam " ocean.output is MISSING            : " $dorv ; fi 
    299372      return; 
    300373    else  
    … …  
    312385    fi 
    313386  else 
    314     printf "%-27s %s %s\n" $nam  " directory is MISSING               : " $dorv 
     387    if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam  " directory is MISSING               : " $dorv ; fi 
    315388  fi 
    316389} 
    … …  
    376449######################################################################################### 
    377450# 
    378   mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'` 
    379   NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'` 
    380   NEMO_VALID=`eval "echo $NEMO_VALID"` 
     451# LOAD param variable (COMPILER, NEMO_VALIDATION_DIR, SVN_CMD) 
     452  . ./param.cfg 
     453 
     454  mach=${COMPILER} 
     455  NEMO_VALID=${NEMO_VALIDATION_DIR} 
     456  NEMO_VALID_REF=${NEMO_VALIDATION_REF} 
     457  LANG=en_US 
    381458# 
    382459  if [ ! -d $NEMO_VALID ]; then 
    … …  
    395472# Show current revision tag and branch name 
    396473# 
    397 cmd="svn" 
    398 [ ! -d "$MAIN_DIR/.svn" ] && cmd="git $cmd" 
    399 echo $cmd  
    400 echo "$MAIN_DIR/.svn" 
    401 lastchange=`$cmd info ${MAIN_DIR} | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
    402 revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '` 
    403 branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev` 
     474echo "" 
     475lastchange=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'` 
     476revision=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'` 
     477branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` 
    404478echo "SETTE validation report : $branchname @ r$revision  ( last change @ r$lastchange )" 
    405479# 
    … …  
    450524 dir2=WAGRIF_DEMO_ST 
    451525 identictest $NEMO_VALID $dir1 $dir2 $pass  
     526# 
     527# before/after tests 
     528# 
     529 if [ $NEMO_VALID_REF != "/path/to/reference/sette/results" ]; then 
     530   echo '' 
     531   echo 'check result differences between :' 
     532   echo "$NEMO_VALID at rev $revision" 
     533   echo 'and' 
     534   echo "$NEMO_VALID_REF at rev $NEMO_REV_REF" 
     535   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 
     536   do 
     537     runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass 
     538   done 
     539 else 
     540   echo '' 
     541   echo 'Result are not compare with any other revision. To do it please fill NEMO_VALID_REF and NEMO_REV_REF in param.cfg' 
     542   echo '' 
     543 fi 
    452544 
    453545done 
    454546# 
    455  
    456547exit 

  • NEMO/branches/2019/fix_sette_ticket2239/sette_test-cases.sh

    r10575 r10687  
    1212# Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    1313# ---------------------------------------------------------------------- 
    14 # 
    1514# 
    1615############################################################# 
    … …  
    9089######################################################################################### 
    9190# 
    92 # Compiler among those in NEMOGCM/ARCH 
    93 COMPILER=X64_ADA 
    94  
    95 export BATCH_COMMAND_PAR="llsubmit" 
    96 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     91# LOAD param value 
     92. ./param.cfg 
     93 
     94export BATCH_COMMAND_PAR=${BATCH_CMD} 
     95export BATCH_COMMAND_SEQ=${BATCH_CMD} 
    9796export INTERACT_FLAG="no" 
    9897export MPIRUN_FLAG="yes" 
    … …  
    105104fi 
    106105# 
     106export ADD_KEYS="" 
     107if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
     108 then 
     109   export ADD_KEYS="key_nosignedzero" 
     110fi 
     111# 
    107112# Settings which control the use of stand alone servers (only relevant if using xios) 
    108113# 
    … …  
    118123# 
    119124# 
    120 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no"] 
     125if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    121126 then 
    122127   echo "Incompatible choices. MPMD mode requires the XIOS server" 
    … …  
    156161    export TEST_NAME="LONG" 
    157162    cd ${MAIN_DIR} 
    158     . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 del_key ${DEL_KEYS} 
     163    . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 add_keys ${ADD_KEYS} del_key ${DEL_KEYS} 
    159164    cd ${SETTE_DIR} 
    160165    . ./param.cfg 
    … …  
    247252    export TEST_NAME="LONG" 
    248253    cd ${MAIN_DIR} 
    249     . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 del_key ${DEL_KEYS} 
     254    . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 add_keys ${ADD_KEYS} del_key ${DEL_KEYS} 
    250255    cd ${SETTE_DIR} 
    251256    . ./param.cfg 
    … …  
    339344    export TEST_NAME="LONG" 
    340345    cd ${MAIN_DIR} 
    341     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  del_key ${DEL_KEYS} 
     346    . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  add_keys ${ADD_KEYS} del_key ${DEL_KEYS} 
    342347    cd ${SETTE_DIR} 
    343348    . ./param.cfg 
    … …  
    508513    export TEST_NAME="LONG" 
    509514    cd ${MAIN_DIR} 
    510     . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  del_key ${DEL_KEYS} 
     515    . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  add_keys ${ADD_KEYS} del_key ${DEL_KEYS} 
    511516    cd ${SETTE_DIR} 
    512517    . ./param.cfg 
    … …  
    685690    export TEST_NAME="LONG" 
    686691    cd ${MAIN_DIR} 
    687     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 del_key ${DEL_KEYS} 
     692    . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_keys ${ADD_KEYS} del_key ${DEL_KEYS} 
    688693    cd ${SETTE_DIR} 
    689694    . ./param.cfg 
Note: See TracChangeset for help on using the changeset viewer.