Changeset 10698


Ignore:
Timestamp:
2019-02-19T16:23:31+01:00 (18 months ago)
Author:
mathiot
Message:

check exit code from NEMO (do not copy anything if it failed on exit code other than 0/123456/999) + rename run.stat/tracer.stat/ocean.output to *_old in the current validation dir (ticket #2239)

Location:
NEMO/branches/2019/fix_sette_ticket2239
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-IBM_EKMAN_INGV

    r9576 r10698  
    8282  fi 
    8383# 
    84   post_test_tidyup 
     84# 
     85# run post processing of sette only is run normally or expected error 
     86  NEMOEXIT=$? 
     87  case $NEMOEXIT in 
     88      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     89      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     90  esac 
    8591 
    8692# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-PW6_CALYPSO

    r9576 r10698  
    7474  fi 
    7575# 
    76   post_test_tidyup 
     76# 
     77# run post processing of sette only is run normally or expected error 
     78  NEMOEXIT=$? 
     79  case $NEMOEXIT in 
     80      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     81      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     82  esac 
    7783 
    7884# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-PW7_METO

    r9576 r10698  
    8484 
    8585# 
    86   post_test_tidyup 
     86# 
     87# run post processing of sette only is run normally or expected error 
     88  NEMOEXIT=$? 
     89  case $NEMOEXIT in 
     90      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     91      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     92  esac 
    8793 
    8894# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-PW7_MONSOON

    r9576 r10698  
    8383 
    8484# 
    85   post_test_tidyup 
     85# 
     86# run post processing of sette only is run normally or expected error 
     87  NEMOEXIT=$? 
     88  case $NEMOEXIT in 
     89      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     90      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     91  esac 
    8692 
    8793# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-X64_ADA

    r9696 r10698  
    7676 
    7777# 
    78   post_test_tidyup 
     78# 
     79# run post processing of sette only is run normally or expected error 
     80  NEMOEXIT=$? 
     81  case $NEMOEXIT in 
     82      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     83      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     84  esac 
    7985 
    8086# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-X64_IRENE

    r10427 r10698  
    6666 
    6767# 
    68   post_test_tidyup 
     68# 
     69# run post processing of sette only is run normally or expected error 
     70  NEMOEXIT=$? 
     71  case $NEMOEXIT in 
     72      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     73      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     74  esac 
    6975 
    7076# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-X64_IRENE_DEBUG

    r10427 r10698  
    6666 
    6767# 
    68   post_test_tidyup 
     68# 
     69# run post processing of sette only is run normally or expected error 
     70  NEMOEXIT=$? 
     71  case $NEMOEXIT in 
     72      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     73      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     74  esac 
    6975 
    7076# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-X64_MOBILIS

    r10632 r10698  
    8888  fi 
    8989# 
    90   post_test_tidyup 
     90# 
     91# run post processing of sette only is run normally or expected error 
     92  NEMOEXIT=$? 
     93  case $NEMOEXIT in 
     94      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     95      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     96  esac 
     97 
    9198# END_BODY 
    9299# Don't remove neither change the previous line 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-XC40_METO

    r9988 r10698  
    8484 
    8585# 
    86   post_test_tidyup 
     86# 
     87# run post processing of sette only is run normally or expected error 
     88  NEMOEXIT=$? 
     89  case $NEMOEXIT in 
     90      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     91      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     92  esac 
     93 
    8794# END_BODY 
    8895# Don't remove neither change the previous line 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL

    r9576 r10698  
    9090  fi 
    9191# 
    92   post_test_tidyup 
     92# 
     93# run post processing of sette only is run normally or expected error 
     94  NEMOEXIT=$? 
     95  case $NEMOEXIT in 
     96      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     97      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     98  esac 
     99 
    93100# END_BODY 
    94101# Don't remove neither change the previous line 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-ifort_athena

    r9576 r10698  
    7474  fi 
    7575# 
    76   post_test_tidyup 
     76# 
     77# run post processing of sette only is run normally or expected error 
     78  NEMOEXIT=$? 
     79  case $NEMOEXIT in 
     80      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     81      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     82  esac 
    7783 
    7884# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-ifort_athena_xios

    r9576 r10698  
    100100  fi 
    101101# 
    102   post_test_tidyup 
     102# 
     103# run post processing of sette only is run normally or expected error 
     104  NEMOEXIT=$? 
     105  case $NEMOEXIT in 
     106      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     107      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     108  esac 
    103109 
    104110# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-macport_osx

    r9576 r10698  
    7575 
    7676# 
    77   post_test_tidyup 
     77# 
     78# run post processing of sette only is run normally or expected error 
     79  NEMOEXIT=$? 
     80  case $NEMOEXIT in 
     81      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     82      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     83  esac 
    7884 
    7985# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-macport_osx_debug

    r9576 r10698  
    7575 
    7676# 
    77   post_test_tidyup 
     77# 
     78# run post processing of sette only is run normally or expected error 
     79  NEMOEXIT=$? 
     80  case $NEMOEXIT in 
     81      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     82      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     83  esac 
    7884 
    7985# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-openmpi_KARA_MERCATOR_XIOS

    r9576 r10698  
    6767 
    6868# 
    69   post_test_tidyup 
     69# 
     70# run post processing of sette only is run normally or expected error 
     71  NEMOEXIT=$? 
     72  case $NEMOEXIT in 
     73      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     74      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     75  esac 
    7076 
    7177# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/batch-openmpi_NAVITI_MERCATOR

    r9576 r10698  
    6767 
    6868# 
    69   post_test_tidyup 
     69# 
     70# run post processing of sette only is run normally or expected error 
     71  NEMOEXIT=$? 
     72  case $NEMOEXIT in 
     73      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     74      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     75  esac 
    7076 
    7177# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/BATCH_TEMPLATE/sette_batch_template

    r9576 r10698  
    7575 
    7676# 
    77   post_test_tidyup 
     77# 
     78# run post processing of sette only is run normally or expected error 
     79  NEMOEXIT=$? 
     80  case $NEMOEXIT in 
     81      0|123456|999) echo " NEMO finished with exit code $NEMOEXIT " ; post_test_tidyup ;; 
     82      *) echo " NEMO abort on an unexpected error (segmentation fault or whatever) $NEMOEXIT " 
     83  esac 
    7884 
    7985# END_BODY 
  • NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

    r10687 r10698  
    9090usage=" Usage : set_namelist input_namelist variable_name value" 
    9191usage=" if value is a string ths is neede syntax : ./set_namelist namelist_name var_name \"new_value\" " 
     92 
     93# define validation dir 
     94set_valid_dir () { 
     95    LANG=en_US 
     96    REVISION_NB=`LC_MESSAGES=${LANG} svn info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` 
     97    if [ ${#REVISION_NB} -eq 0 ] 
     98    then 
     99        echo "some problems with svn info command" 
     100        echo "some problems with svn info command" >> ${SETTE_DIR}/output.sette 
     101        REVISION_NB=`date +%Y%m%d` 
     102        echo "put in ${REVISION_NB} date" 
     103        echo "put in ${REVISION_NB} date" >> ${SETTE_DIR}/output.sette 
     104    else 
     105    echo "value of revision number of NEMOGCM: ${REVISION_NB}" 
     106    fi 
     107    NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
     108} 
     109 
     110# clean valid dir (move old ocean_output/run.stat and tracer to avoid checking them in case something wrong happen. 
     111clean_valid_dir () { 
     112   set_valid_dir 
     113   echo "validation directory is : $NEMO_VALID" 
     114   if [ -d $NEMO_VALID ] ; then 
     115      [ -f ${NEMO_VALID}/ocean.output ] && mv ${NEMO_VALID}/ocean.output ${NEMO_VALID}/ocean.output_old 
     116      [ -f ${NEMO_VALID}/run.stat ]     && mv ${NEMO_VALID}/run.stat     ${NEMO_VALID}/run.stat_old 
     117      [ -f ${NEMO_VALID}/tracer.stat ]  && mv ${NEMO_VALID}/tracer.stat  ${NEMO_VALID}/tracer.stat_old 
     118   fi 
     119} 
    92120 
    93121# function to set namelists parameters 
     
    179207        then 
    180208        grep "E R R O R" ${EXE_DIR}/ocean.output && echo "Some ERRORS at execution time, see ${EXE_DIR}/ocean.output" 
    181         exit 2 
     209        # exit 2 Error now catch in the report  
    182210    fi 
    183211 
     
    186214        echo "file time.step does not exist"   >> ${SETTE_DIR}/output.sette 
    187215        echo "some problems during execution of model"  >> ${SETTE_DIR}/output.sette  
    188         exit 1 
     216        # exit 1 Error now catch in the report 
    189217    else 
    190218        echo "file time.step exists"  >> ${SETTE_DIR}/output.sette 
     
    195223 
    196224################################################################ 
     225# 
    197226# Creation of NEMO_VALIDATION tree 
    198     LANG=en_US  
    199     REVISION_NB=`LC_MESSAGES=${LANG} svn info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'` 
    200     if [ ${#REVISION_NB} -eq 0 ] 
    201     then 
    202       echo "some problems with svn info command" 
    203       echo "some problems with svn info command" >> ${SETTE_DIR}/output.sette 
    204       REVISION_NB=`date +%Y%m%d` 
    205       echo "put in ${REVISION_NB} date" 
    206       echo "put in ${REVISION_NB} date" >> ${SETTE_DIR}/output.sette 
    207     else 
    208     echo "value of revision number of NEMOGCM: ${REVISION_NB}" 
    209     fi 
    210     cd ${NEMO_VALIDATION_DIR} 
    211     `mkdir -p ${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME}` 
    212     NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
     227    set_valid_dir 
     228    mkdir -p ${NEMO_VALID} 
    213229    if [ -d ${NEMO_VALID} ] ; then 
    214230   echo "created ${NEMO_VALID} directory"   >> ${SETTE_DIR}/output.sette 
     
    218234   exit 1 
    219235    fi 
    220     # Save output & debug files in NEMO_VALIDATION tree 
     236# 
     237# Save output & debug files in NEMO_VALIDATION tree 
    221238    echo "saving ocean & ice output, run.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
    222239    echo "            " >> ${SETTE_DIR}/output.sette 
  • NEMO/branches/2019/fix_sette_ticket2239/param.cfg

    r10687 r10698  
    22# 
    33# Compiler among those in NEMOGCM/ARCH 
    4 COMPILER=X64_ADA 
     4COMPILER=XC40_METO_perso 
    55# 
    66# BATCH command 
    7 BATCH_CMD=llsubmit 
     7BATCH_CMD=qsub 
    88# 
    99#- FORCING files storing 
    10 FORCING_DIR=$WORKDIR/FORCING 
     10FORCING_DIR=/projects/jomp/pmathiot/SETTE_FORCING/v4.0 
    1111# 
    1212#- INPUT files storing 
     
    1414# 
    1515#- VALIDATION files storing 
    16 NEMO_VALIDATION_DIR=$WORKDIR/NEMO_VALIDATION 
     16NEMO_VALIDATION_DIR=/projects/jomp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/sette_ticket2239/NEMO_VALIDATION 
    1717# 
    1818# REFERENCE run.stat tracer.stat you want to compare with 
    1919# (if no change to the default, no check on result change will be done) 
    20 NEMO_VALIDATION_REF=/path/to/reference/sette/results 
    21 NEMO_REV_REF=0000 
     20NEMO_VALIDATION_REF=/projects/jomp/pmathiot/NEMO/NEMO_dev/NEMO/trunk/sette_ticket2239/NEMO_VALIDATION 
     21NEMO_REV_REF=10691 
    2222# 
    2323# CMD for svn (some people use git svn)  
  • NEMO/branches/2019/fix_sette_ticket2239/prepare_exe_dir.sh

    r10631 r10698  
    6868mkdir -p ${NEW_CONF}/${TEST_NAME} 
    6969 
     70# PREPARE EXEC_DIR 
     71#================== 
    7072export EXE_DIR=${CONFIG_DIR}/${NEW_CONF}/${TEST_NAME} 
    7173 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_cfg-ref.sh

    r10687 r10698  
    6666#                       in sette.sh. (each test in executed in its own directory) 
    6767# 
     68#  clean_valid_dir    : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
     69#                       ( not doing it could lead to false positive ) 
     70# 
    6871#  prepare_job.sh     : to generate the script run_job.sh 
    6972# 
     
    164167    . ./all_functions.sh 
    165168    . ./prepare_exe_dir.sh 
     169    clean_valid_dir 
    166170    JOB_FILE=${EXE_DIR}/run_job.sh 
    167171    NPROC=8 
     
    190194    export TEST_NAME="SHORT" 
    191195    . ./prepare_exe_dir.sh 
     196    clean_valid_dir 
    192197    cd ${EXE_DIR} 
    193198    set_namelist namelist_cfg cn_exp \"GYREPIS_SHORT\" 
     
    231236    . ./all_functions.sh 
    232237    . ./prepare_exe_dir.sh 
     238    clean_valid_dir 
    233239    JOB_FILE=${EXE_DIR}/run_job.sh 
    234240    NPROC=8 
     
    258264    export TEST_NAME="REPRO_4_2" 
    259265    . ./prepare_exe_dir.sh 
     266    clean_valid_dir 
    260267    JOB_FILE=${EXE_DIR}/run_job.sh 
    261268    NPROC=8 
     
    296303    . ./all_functions.sh 
    297304    . ./prepare_exe_dir.sh 
     305    clean_valid_dir 
    298306    JOB_FILE=${EXE_DIR}/run_job.sh 
    299307    NPROC=32 
     
    348356    export TEST_NAME="SHORT" 
    349357    . ./prepare_exe_dir.sh 
     358    clean_valid_dir 
    350359    cd ${EXE_DIR} 
    351360    set_namelist namelist_cfg cn_exp \"O2L3P_SHORT\" 
     
    421430    . ./all_functions.sh 
    422431    . ./prepare_exe_dir.sh 
     432    clean_valid_dir 
    423433    JOB_FILE=${EXE_DIR}/run_job.sh 
    424434    NPROC=32 
     
    472482    export TEST_NAME="REPRO_8_4" 
    473483    . ./prepare_exe_dir.sh 
     484    clean_valid_dir 
    474485    JOB_FILE=${EXE_DIR}/run_job.sh 
    475486    NPROC=32 
     
    533544    . ./all_functions.sh 
    534545    . ./prepare_exe_dir.sh 
     546    clean_valid_dir 
    535547    JOB_FILE=${EXE_DIR}/run_job.sh 
    536548    NPROC=32 
     
    573585    export TEST_NAME="SHORT" 
    574586    . ./prepare_exe_dir.sh 
     587    clean_valid_dir 
    575588    cd ${EXE_DIR} 
    576589    set_namelist namelist_cfg cn_exp \"OFFP_SHORT\" 
     
    623636    . ./all_functions.sh 
    624637    . ./prepare_exe_dir.sh 
     638    clean_valid_dir 
    625639    JOB_FILE=${EXE_DIR}/run_job.sh 
    626640    NPROC=32 
     
    664678    export TEST_NAME="REPRO_8_4" 
    665679    . ./prepare_exe_dir.sh 
     680    clean_valid_dir 
    666681    JOB_FILE=${EXE_DIR}/run_job.sh 
    667682    NPROC=32 
     
    715730    . ./all_functions.sh 
    716731    . ./prepare_exe_dir.sh 
     732    clean_valid_dir 
    717733    JOB_FILE=${EXE_DIR}/run_job.sh 
    718734    NPROC=32 
     
    739755    export TEST_NAME="SHORT" 
    740756    . ./prepare_exe_dir.sh 
     757    clean_valid_dir 
    741758    cd ${EXE_DIR} 
    742759    set_namelist namelist_cfg cn_exp \"AMM12_SHORT\" 
     
    774791    . ./all_functions.sh 
    775792    . ./prepare_exe_dir.sh 
     793    clean_valid_dir 
    776794    JOB_FILE=${EXE_DIR}/run_job.sh 
    777795    NPROC=32 
     
    799817    export TEST_NAME="REPRO_4_8" 
    800818    . ./prepare_exe_dir.sh 
     819    clean_valid_dir 
    801820    JOB_FILE=${EXE_DIR}/run_job.sh 
    802821    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     
    834853    . ./all_functions.sh 
    835854    . ./prepare_exe_dir.sh 
     855    clean_valid_dir 
    836856    JOB_FILE=${EXE_DIR}/run_job.sh 
    837857    NPROC=32 
     
    859879    export TEST_NAME="SHORT" 
    860880    . ./prepare_exe_dir.sh 
     881    clean_valid_dir 
    861882    cd ${EXE_DIR} 
    862883    set_namelist namelist_cfg cn_exp \"SAS\" 
     
    896917    . ./all_functions.sh 
    897918    . ./prepare_exe_dir.sh 
     919    clean_valid_dir 
    898920    JOB_FILE=${EXE_DIR}/run_job.sh 
    899921    NPROC=32 
     
    921943    export TEST_NAME="REPRO_8_4" 
    922944    . ./prepare_exe_dir.sh 
     945    clean_valid_dir 
    923946    JOB_FILE=${EXE_DIR}/run_job.sh 
    924947    NPROC=32 
     
    960983    . ./all_functions.sh 
    961984    . ./prepare_exe_dir.sh 
     985    clean_valid_dir 
    962986    JOB_FILE=${EXE_DIR}/run_job.sh 
    963987    NPROC=32 
     
    10121036    export TEST_NAME="REPRO_8_4" 
    10131037    . ./prepare_exe_dir.sh 
     1038    clean_valid_dir 
    10141039    JOB_FILE=${EXE_DIR}/run_job.sh 
    10151040    NPROC=32 
     
    10741099    . ./all_functions.sh 
    10751100    . ./prepare_exe_dir.sh 
     1101    clean_valid_dir 
    10761102    JOB_FILE=${EXE_DIR}/run_job.sh 
    10771103    NPROC=16 
     
    11181144    export TEST_NAME="SHORT" 
    11191145    . ./prepare_exe_dir.sh 
     1146    clean_valid_dir 
    11201147    cd ${EXE_DIR} 
    11211148    set_namelist namelist_cfg cn_exp \"AGRIF_SHORT\" 
     
    11931220    . ./all_functions.sh 
    11941221    . ./prepare_exe_dir.sh 
     1222    clean_valid_dir 
    11951223    JOB_FILE=${EXE_DIR}/run_job.sh 
    11961224    NPROC=32 
     
    12431271    export TEST_NAME="REPRO_8_4" 
    12441272    . ./prepare_exe_dir.sh 
     1273    clean_valid_dir 
    12451274    JOB_FILE=${EXE_DIR}/run_job.sh 
    12461275    NPROC=32 
     
    12971326    . ./all_functions.sh 
    12981327    . ./prepare_exe_dir.sh 
     1328    clean_valid_dir 
    12991329    JOB_FILE=${EXE_DIR}/run_job.sh 
    13001330    NPROC=32 
     
    13331363    . ./all_functions.sh 
    13341364    . ./prepare_exe_dir.sh 
     1365    clean_valid_dir 
    13351366    JOB_FILE=${EXE_DIR}/run_job.sh 
    13361367    NPROC=32 
     
    13681399    . ./all_functions.sh 
    13691400    . ./prepare_exe_dir.sh 
     1401    clean_valid_dir 
    13701402    JOB_FILE=${EXE_DIR}/run_job.sh 
    13711403    NPROC=32 
     
    13941426    export TEST_NAME="SHORT" 
    13951427    . ./prepare_exe_dir.sh 
     1428    clean_valid_dir 
    13961429    cd ${EXE_DIR} 
    13971430    set_namelist namelist_cfg cn_exp \"S12_SHORT\" 
     
    14311464    . ./all_functions.sh 
    14321465    . ./prepare_exe_dir.sh 
     1466    clean_valid_dir 
    14331467    JOB_FILE=${EXE_DIR}/run_job.sh 
    14341468    NPROC=32 
     
    14571491    export TEST_NAME="REPRO_8_4" 
    14581492    . ./prepare_exe_dir.sh 
     1493    clean_valid_dir 
    14591494    JOB_FILE=${EXE_DIR}/run_job.sh 
    14601495    NPROC=32 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

    r10687 r10698  
    287287  pass=$5 
    288288# 
     289# check if reference directory is present 
     290  if [ ! -d $vdirref/$nam/$mach/$dorvref ]; then 
     291    printf "%s\n" " REFERENCE directory $vdirref/$nam/$mach/$dorvref is MISSING" 
     292    return 
     293  fi 
     294# 
    289295  if [ -d $vdir/$nam ]; then 
    290296    dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l ` 
     
    369375    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    370376    if  [ ! -f $f1o ] ; then 
    371       if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam " ocean.output is MISSING            : " $dorv ; fi 
     377      if [ $pass == 0 ]; then printf "%-27s %s %s %s\n" $nam " ocean.output               MISSING : " $dorv " ( run did not start / finish correctly ) " ; fi 
    372378      return; 
    373379    else  
    374380      nerr=`grep 'E R R O R' $f1o | wc -l` 
    375381      if [[ $nerr > 0 ]]; then 
    376         printf "%-27s %s %s\n" $nam " run FAILED : " $dorv 
     382        printf "%-27s %s %s %s\n" $nam " run                         FAILED : " $dorv " ( E R R O R in ocean.output) "  
    377383        if [ $pass == 1 ]; then 
    378384          echo "<return> to view end of ocean.output" 
     
    385391    fi 
    386392  else 
    387     if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam  " directory is MISSING               : " $dorv ; fi 
     393    if [ $pass == 0 ]; then printf "%-27s %s %s %s\n" $nam  " directory                  MISSING : " $dorv " ( run did not start / finish correctly ) "; fi 
    388394  fi 
    389395} 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_test-cases.sh

    r10690 r10698  
    6060#                      (run.stat and ocean.output) in it after execution of test. 
    6161# 
     62#  clean_valid_dir    : rename ocean.output/run.stat and tracer.stat to avoid checking them in the report  
     63#                       ( not doing it could lead to false positive ) 
     64# 
    6265#  VALIDATION tree is: 
    6366# 
     
    166169    . ./all_functions.sh 
    167170    . ./prepare_exe_dir.sh 
     171    clean_valid_dir 
    168172    JOB_FILE=${EXE_DIR}/run_job.sh 
    169173    NPROC=1 
     
    188192    export TEST_NAME="SHORT" 
    189193    . ./prepare_exe_dir.sh 
     194    clean_valid_dir 
    190195    cd ${EXE_DIR} 
    191196    set_namelist namelist_cfg cn_exp \"OVF_SHORT\" 
     
    226231        . ./all_functions.sh 
    227232        . ./prepare_exe_dir.sh 
     233        clean_valid_dir 
    228234        JOB_FILE=${EXE_DIR}/run_job.sh 
    229235        NPROC=1 
     
    257263    . ./all_functions.sh 
    258264    . ./prepare_exe_dir.sh 
     265    clean_valid_dir 
    259266    JOB_FILE=${EXE_DIR}/run_job.sh 
    260267    NPROC=1 
     
    279286    export TEST_NAME="SHORT" 
    280287    . ./prepare_exe_dir.sh 
     288    clean_valid_dir 
    281289    cd ${EXE_DIR} 
    282290    set_namelist namelist_cfg cn_exp \"LOCK_SHORT\" 
     
    317325        . ./all_functions.sh 
    318326        . ./prepare_exe_dir.sh 
     327        clean_valid_dir 
    319328        JOB_FILE=${EXE_DIR}/run_job.sh 
    320329        NPROC=1 
     
    349358    . ./all_functions.sh 
    350359    . ./prepare_exe_dir.sh 
     360    clean_valid_dir 
    351361    JOB_FILE=${EXE_DIR}/run_job.sh 
    352362    NPROC=6 
     
    380390    export TEST_NAME="SHORT" 
    381391    . ./prepare_exe_dir.sh 
     392    clean_valid_dir 
    382393    cd ${EXE_DIR} 
    383394    set_namelist namelist_cfg cn_exp \"VORTEX_SHORT\" 
     
    431442    . ./all_functions.sh 
    432443    . ./prepare_exe_dir.sh 
     444    clean_valid_dir 
    433445    JOB_FILE=${EXE_DIR}/run_job.sh 
    434446    NPROC=6 
     
    468480    export TEST_NAME="REPRO_3_2" 
    469481    . ./prepare_exe_dir.sh 
     482    clean_valid_dir 
    470483    JOB_FILE=${EXE_DIR}/run_job.sh 
    471484    NPROC=6 
     
    518531    . ./all_functions.sh 
    519532    . ./prepare_exe_dir.sh 
     533    clean_valid_dir 
    520534    JOB_FILE=${EXE_DIR}/run_job.sh 
    521535    NPROC=6 
     
    549563    export TEST_NAME="SHORT" 
    550564    . ./prepare_exe_dir.sh 
     565    clean_valid_dir 
    551566    cd ${EXE_DIR} 
    552567    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_SHORT\" 
     
    609624    . ./all_functions.sh 
    610625    . ./prepare_exe_dir.sh 
     626    clean_valid_dir 
    611627    JOB_FILE=${EXE_DIR}/run_job.sh 
    612628    NPROC=6 
     
    646662    export TEST_NAME="REPRO_3_2" 
    647663    . ./prepare_exe_dir.sh 
     664    clean_valid_dir 
    648665    JOB_FILE=${EXE_DIR}/run_job.sh 
    649666    NPROC=6 
     
    695712    . ./all_functions.sh 
    696713    . ./prepare_exe_dir.sh 
     714    clean_valid_dir 
    697715    JOB_FILE=${EXE_DIR}/run_job.sh 
    698716    NPROC=15 
     
    719737    export TEST_NAME="SHORT" 
    720738    . ./prepare_exe_dir.sh 
     739    clean_valid_dir 
    721740    cd ${EXE_DIR} 
    722741    set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\" 
     
    755774    . ./all_functions.sh 
    756775    . ./prepare_exe_dir.sh 
     776    clean_valid_dir 
    757777    JOB_FILE=${EXE_DIR}/run_job.sh 
    758778    NPROC=21 
     
    780800    export TEST_NAME="REPRO_8_4" 
    781801    . ./prepare_exe_dir.sh 
     802    clean_valid_dir 
    782803    JOB_FILE=${EXE_DIR}/run_job.sh 
    783804    NPROC=32 
Note: See TracChangeset for help on using the changeset viewer.