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 5286 for branches – NEMO

Changeset 5286 for branches


Ignore:
Timestamp:
2015-05-21T20:28:58+02:00 (9 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Major update with clear partition of architecture & user configuration

Location:
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE
Files:
5 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/cfg/X64_CURIE.cfg

    r5283 r5286  
    1 #  
     1# Curie super-computer configuration 
     2 
     3# Available softwares: 
     4CDO=cdo  
    25COMPILER=ifort 
    3 MPI_NAME=bullxmpi 
     6MPI=bullxmpi 
     7NETCDF=netcdf 
    48 
    59# Job commands: ccc_* 
     
    913JOB_DELE=ccc_mdel                           
    1014 
    11 # Directories ($HOME/$WORKDIR/$SCRATCHDIR/$STOREDIR) 
    12 DIR_WORK=$CCCWORKDIR 
    13 DIR_SCRA=$SCRATCHDIR/trusting 
    14 DIR_STOR=$CCCSTOREDIR/trusting_sav 
     15# 
     16[ -z "$NPROC"     ] && NPROC=1 
     17[ -z "$TIME_LIMI" ] && TIME_LIMI=10800 # 3h 
    1518 
    16 # Loading environment architecture 
    17 . ${DIR_XIOS}/arch/arch-${ARCH}.env 
     19# Architecture environment (be careful with compliance with XIOS) 
     20ARCH_ENV=${DIR_XIOS}/arch/arch-${ARCH}.env 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/cfg/arch_template.cfg

    r5283 r5286  
    1 # 
    2 COMPILER=          # ifort/gfortran/pgfortran/$FC/... (to get compiler version with `$COMPILER --version`) 
    3 MPI_NAME=          # MPI libraries                    (directory name in $LOADEDMODULES or $PATH variable) 
     1# Copy to ./$ARCH.cfg, fill in according to your installation 
     2 
     3# Super-computer configuration 
     4 
     5# Available softwares: 
     6CDO=''                  # CDO (Climate Data Operators)     (to get application version with `$CDO      --version`) 
     7COMPILER=''             # ifort/gfortran/pgfortran/$FC/... ("" " " compiler      " "    ""  `$COMPILER --version`) 
     8MPI=''                  # MPI    libraries                 (root directory name in $LOADEDMODULES or $PATH variable) 
     9NETCDF=''               # NetCDF    " "                    ( ""     " "     ""  ""       ""       ""  " "     ""   ) 
    410 
    511# Job commands: 
    6 JOB_SUBM=          # Command to submit a job 
    7 JOB_LIST=          #   " "   to list submitted jobs  (to know if the job still running) 
    8 JOB_VIEW=          #   " "   to get job informations (to increment a log during computing) 
    9 JOB_DELE=          #   " "   to stop a job           (not used currently) 
     12JOB_SUBM=''             # Command to submit a job && get his ID in return 
     13JOB_LIST=''                #   " "   to list submitted jobs  (to know if the job is in progress with his ID) 
     14JOB_VIEW=''             #   " "   to get job informations (to increment a log during computing from job ID) 
     15JOB_DELE=''             #   " "   to stop a job           (not used currently) 
    1016 
    11 # Directories 
    12 DIR_WORK=          # Directory of testing   configuration for compilation 
    13 DIR_SCRA=          #    " "    ""   " "          " "      " " computation to increase perfs on some super-computers 
    14                    #            (will copy into it all requested input files forcing & ".*(cfg|opa|ref|xml)" files) 
    15 DIR_STOR=          #    " "    "" reference      " "      (output & restart files to compare) 
     17#  
     18[ -z "$NPROC"     ] && NPROC=1          # Number of processing units for compilation 
     19[ -z "$TIME_LIMI" ] && TIME_LIMI=''     # Timeout in s for computation (pending & running) 
    1620 
    17 # External softs directories 
    18 #DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0      # Uncomment if necessary 
    19 #DIR_OASI=${DIR_WORK}/OASIS              # Uncomment if necessary 
    20 # Loading environment architecture (compliance with XIOS) 
    21 #. ${DIR_XIOS}/arch/arch-${ARCH}.env     # Uncomment if necessary 
     21# Architecture environment (be careful with compliance with XIOS) 
     22ARCH_ENV=''                             # ${DIR_WORK}/XIOS/arch/arch-${ARCH}.env 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/cfg/user.cfg

    r5283 r5286  
    1 # NEMO root directory 
     1# User configuration 
     2 
     3# Global Directories ($HOME/$WORKDIR/$SCRATCHDIR/$STOREDIR) 
     4DIR_WORK=$CCCWORKDIR 
     5DIR_SCRA=$SCRATCHDIR/trusting               
     6DIR_STOR=$CCCSTOREDIR/trusting_sav             
     7 
     8# NEMO overall configuration: 
     9[ -z "${NEMO_BRAN}" ] && NEMO_BRAN=trunk 
     10[ -z "${CONF_REFE}" ] && CONF_REFE=ORCA2_LIM_PISCES 
     11[ -z "${CONF_TEST}" ] && CONF_TEST=${CONF_REFE}_trust 
    212NEMO_HOME=${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM 
    313 
    4 # NEMO inputs (comment if necessary) 
    5 NEMO_FORC=${DIR_WORK}/NEMO/FORC       # Directory synchronized with 
    6 FORC_TARF=ORCA2_LIM_nemo_v3.6.tar     # Requested archive name  
     14# Comparatives directories localization: 
     15DIR_REFE=${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN} 
     16DIR_TEST=${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATE_STR} 
     17 
     18# External softs directories: 
     19DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0 
     20DIR_OASI=${DIR_WORK}/OASIS 
     21 
     22# NEMO inputs 
     23NEMO_FORC=${DIR_WORK}/NEMO/FORC 
     24FORC_TARF=ORCA2_LIM_nemo_v3.6.tar 
     25 
     26# Mailing list to inform of a failure, -p|--publish option required 
     27[ -z "$MAIL"] && MAIL=ntmlod@locean-ipsl.upmc.fr 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/cfg/user_template.cfg

    r5283 r5286  
    1 # NEMO root directory 
    2 NEMO_HOME=${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM 
     1# Copy to ./user.cfg, fill in according to your installation 
    32 
    4 # NEMO inputs (comment if necessary) 
    5 NEMO_FORC=${DIR_WORK}/NEMO/FORC       # Directory synchronized with 
    6 FORC_TARF=ORCA2_LIM_nemo_v3.6.tar     # Requested archive name  
     3# User configuration 
     4 
     5# Global Directories: 
     6DIR_WORK=''               # Directory for compilation 
     7DIR_SCRA=''                  #    " "    " " computation to increase perfs on some super-computers 
     8                          # (will copy into it all requested forcing input & ".*(cfg|opa|ref|xml)" files) 
     9DIR_STOR=''                  #    " "     for comparison (ASCII output & restart files of reference config) 
     10 
     11# NEMO overall configuration: 
     12[ -z "${NEMO_BRAN}" ] && NEMO_BRAN=''     # trunk, dev_v3_4_STABLE_2012, ... 
     13[ -z "${CONF_REFE}" ] && CONF_REFE=''     # ORCA2_LIM_PISCES, GYRE, ... 
     14[ -z "${CONF_TEST}" ] && CONF_TEST=''     # ${CONF_REFE}_trust, ... 
     15NEMO_HOME=''                              # NEMOGCM equivalent root directory 
     16                                          # (${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM, ...) 
     17 
     18# Comparatives directories localization: 
     19DIR_REFE=''                  # ${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN} 
     20DIR_TEST=''                  # ${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATE_STR} 
     21 
     22# External softs directories: 
     23DIR_XIOS=''                  # ${DIR_WORK}/XIOS/xios-1.0 
     24DIR_OASI=''                  # ${DIR_WORK}/OASIS         
     25 
     26# NEMO inputs (fill in if necessary) 
     27NEMO_FORC=''                              # Directory synchronized with DODS server of IDRIS 
     28                                          # (${DIR_WORK}/NEMO/FORC, ...) 
     29FORC_TARF=''                              # Archive name (ORCA2_LIM_nemo_v3.6.tar, ...) 
     30 
     31# Mailing list to inform of a failure, -p|--publish option required 
     32[ -z "$MAIL"] && MAIL='' 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.env

    r5283 r5286  
    66export DATE_STR=$( LC_ALL=C date -d"${date_test}" +%Y%m%dT%H%M ) 
    77 
     8# Sourcing user configuration 
     9. cfg/user.cfg 
     10export DIR_WORK  DIR_SCRA  DIR_STOR 
     11export NEMO_HOME NEMO_BRAN CONF_REFE CONF_TEST 
     12export DIR_REFE  DIR_TEST 
     13export DIR_XIOS  DIR_OASI 
     14export NEMO_FORC FORC_TARF 
    815 
    9 # Sourcing super-computer running configuration 
    10 . cfg/$ARCH.cfg 
    11  
    12 export COMPILER MPI_NAME 
    13 export JOB_SUBM JOB_LIST JOB_VIEW JOB_DELE 
    14 export DIR_WORK DIR_SCRA DIR_STOR 
    15 export DIR_XIOS DIR_OASI 
    16  
    17  
    18 # Sourcing NEMO configuration 
    19 . cfg/nemo.cfg 
    20  
    21 export NEMO_HOME NEMO_FORC FORC_TARF 
    2216NEMO_ARCH=${NEMO_HOME}/ARCH         ; NEMO_CONF=${NEMO_HOME}/CONFIG         ; NEMO_ENGI=${NEMO_HOME}/NEMO 
    2317NEMO_EFCM=${NEMO_HOME}/EXTERNAL/fcm ; NEMO_IPSL=${NEMO_HOME}/EXTERNAL/IOIPSL; NEMO_SETT=${NEMO_HOME}/SETTE 
    2418NEMO_TCMP=${NEMO_HOME}/TOOLS/COMPILE 
    25 export NEMO_ARCH NEMO_CONF NEMO_EFCM NEMO_ENGI NEMO_IPSL NEMO_SETT NEMO_TCMP 
     19export NEMO_ARCH NEMO_CONF NEMO_EFCM 
     20export NEMO_ENGI NEMO_IPSL NEMO_SETT 
     21export NEMO_TCMP 
    2622 
     23# Sourcing super-computer configuration 
     24. cfg/$ARCH.cfg 
     25export CDO      COMPILER  MPI      NETCDF 
     26export JOB_SUBM JOB_LIST  JOB_VIEW JOB_DELE 
     27export NPROC    TIME_LIMI 
     28export ARCH_ENV 
    2729 
    28 # Comparatives directories localization 
    29 DIR_REFE=${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN} 
    30 DIR_TEST=${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATE_STR} 
    31 export DIR_REFE DIR_TEST 
     30[ ! find ${NEMO_ARCH} -name arch-$ARCH.fcm ] && exit 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.sh

    r5283 r5286  
    11#!/bin/bash 
     2# 
     3# Author: Patrick Brockmann 
     4# Contact: Patrick.Brockmann@cea.fr 
     5# History: 
     6# Modification: Nicolas-thierry.Martin@locean-ipsl.upmc.fr 
     7# 
    28 
    39 
    410# Set defaults 
    511DEBUG=0; PUBLISH=0; status='OK' 
    6 NEMO_BRAN=trunk; # dev_r5092_CNRS_SETTE dev_v3_4_STABLE_2012 
    7 ARCH=              # arch-${ARCH}.env to be sourced in ${DIR_XIOS} or leave blank without file 
    8 CONF_REFE=ORCA2_LIM_PISCES 
    9 CONF_TEST=${CONF_REFE}_trust 
    10 #COMPILER=ifort gfortran f95 f90 pgfortran pgf95 pgf90 mpifort mpif90 mpiifort 
    11 #MPI=bullxmpi openmpi mpich intel mpxlf 
    1212 
    13  
     13# Get options && replace some initials settings 
    1414while [ $# -ne 0 ]; do 
    1515    case $1 in 
    16         -b|--branch    ) NEMO_BRAN=$2         ; shift 2;; 
    17         -d|--debug     ) set -vx; DEBUG=1     ; shift  ;; 
    18         -h|--help|-help) cat trusting_help.txt; exit   ;; 
    19         -m|--machine   ) ARCH=$2              ; shift 2;; 
    20         -n|--newconf   ) CONF_TEST=$2         ; shift 2;; 
    21         -r|--refconf   ) CONF_REFE=$2         ; shift 2;; 
    22         -p|--publish   ) PUBLISH=1            ; shift  ;; 
    23    *)                                      break  ;; 
     16        -b|--branch ) NEMO_BRAN=$2         ; shift 2;; -d|--debug  ) set -vx; DEBUG=1     ; shift  ;; 
     17   -e|--email  ) MAIL=$2              ; shift 2;; -j|--job    ) NPROC=$2             ; shift 2;; 
     18   -h|--help   ) cat trusting_help.txt; exit   ;; -m|--machine) ARCH=$2              ; shift 2;; 
     19   -n|--newconf) CONF_TEST=$2         ; shift 2;; -r|--refconf) CONF_REFE=$2         ; shift 2;; 
     20   -t|--time   ) TIME_LIMI=$2         ; shift 2;; -p|--publish) PUBLISH=1            ; shift  ;; 
     21                   *) cat trusting_help.txt; exit   ;; 
    2422    esac 
    2523done 
    26 export ARCH CONF_REFE CONF_TEST DEBUG NEMO_BRAN PUBLISH 
    2724 
    28 #[ $# -ne 1 ] && { ./trusting.sh -h && exit; } 
    29 # suspend debug mode (too verbose) 
    30 #[ $debug -eq 1 ] && set +vx 
     25# Set super-computer & user environment 
     26[[ ! -z "$ARCH" && . trusting.env ]] || { ./trusting.sh -h && exit; } 
     27export DEBUG PUBLISH 
    3128 
    3229# Initialization 
    3330#============================================= 
    3431 
    35 . trusting.env 
    3632echo ${DIR_TEST} 
    3733mkdir -p ${DIR_TEST} ${DIR_REFE} 
    3834cd ${DIR_TEST} 
    39 datestr1=$( LC_ALL=C date -d"$DATESTR" +%Y-%m-%dT%H:%M ) 
     35datestr1=$( LC_ALL=C date -d"$DATE_STR" +%Y-%m-%dT%H:%M ) 
    4036printf "Date\n%s\n"       $datestr1 > mesg_01_date.txt 
    4137 
     
    4844#  
    4945#============================================= 
    50 for rel in $COMPILER $MPI_NAME $NETCDFF; do 
     46for rel in $CDO $COMPILER $MPI $NETCDF; do 
    5147    printf "Step......................\nGet $rel release\n" > mesg_03_step.txt 
    52     arch_rel=$( echo $LOADEDMODULES | sed "s#.*:$rel/\([^:]*\).*#\1#" ) 
    53     [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH | sed "s#.*$rel/\([^/]*\).*#\1#" ) 
    54     [ $rel == $COMPILER ] && arch_rel=$( $FC --version | grep -m1 -o ' [0-9.]* ' ) 
     48                             arch_rel=$( echo $LOADEDMODULES | sed "s#.*:$rel/\([^:]*\).*#\1#" ) 
     49    [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH          | sed "s#.*$rel/\([^/]*\).*#\1#" ) 
     50    [ $( echo $rel | grep "$CDO\|$COMPILER" ) ] && arch_rel=$( $rel --version | grep -m1 -o ' [0-9.]* ' ) 
    5551    echo $rel ${arch_rel} >> model.log 
    5652done 
     
    6460printf "Step......................\nCheckout XIOS, FCM-make(/EXTERNAL/fcm), NEMO engines (/NEMO) & configuration (/CONFIG)\n" > mesg_03_step.txt 
    6561rev=0 
    66 for dir in ${DIR_XIOS} ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_EFCM} ${NEMO_ENGI} ${NEMO_IPSL} ${NEMO_TCMP}; do 
     62for dir in ${DIR_XIOS} ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_EFCM} ${NEMO_ENGI} ${NEMO_IPSL} ${NEMO_SETT} ${NEMO_TCMP}; do 
    6763    svn up $dir 
    6864    rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' ) 
     
    7672printf "Step......................\nCompilation NEMO configuration %s\n" ${CONF_REF} > mesg_03_step.txt 
    7773cd ${NEMO_CONF} 
     74. ${ARCH_ENV}     # Sourcing architecture environment 
    7875#[ -d ${CONF_TEST} ] && ./makenemo -n ${CONF_TEST} clean 
    79 ./makenemo -n ${CONF_TEST} -r ${CONF_REFE} -m $ARCH -j 16 #> /dev/null 2>&1 
     76./makenemo -n ${CONF_TEST} -r ${CONF_REFE} -m $ARCH -j $NPROC #> /dev/null 2>&1 
    8077[ ! -e ${CONF_TEST}/BLD/bin/nemo.exe ] && getout 
    8178 
     
    8582cd ${DIR_TEST} 
    8683find ${NEMO_CONF}/${CONF_TEST}/EXP00 -regex '.*\(cfg\|opa\|ref\|xml\)' -exec cp {} . \; 
    87 cp ${NEMO_FORC}/${FORC_TAR} . && tar -tvf ${FORC_TAR} > inputs_list.txt && tar -vxf ${FORC_TAR} 
    88 [ $? -ne 0 ] && getout 
    89 gunzip *.gz 
     84 
     85if [ ! -z "${NEMO_FORC}" ]; then 
     86    cp ${NEMO_FORC}/${FORC_TAR} . 
     87    tar -tvf ${FORC_TAR} > inputs_list.txt && tar -vxf ${FORC_TAR} 
     88    [ $? -ne 0 ] && getout 
     89    gunzip *.gz 
     90else 
     91    touch inputs_list.txt 
     92fi 
    9093 
    9194 
     
    9699[ $? -ne 0 ] && getout 
    97100 
    98 output_test=ocean.output   ; output_refe=${DIR_REFE}/ocean.output 
    99 solver_test=solver.stat    ; solver_refe=${DIR_REFE}/solver.stat 
    100 tracer_test=tracer.stat    ; tracer_refe=${DIR_REFE}/tracer.stat 
    101 inputs_test=inputs_list.txt; inputs_refe=${DIR_REFE}/inputs_list.txt 
    102  
    103 #time_elapsed=0; time_limit=10800; time_increment=300 
    104 time_elapsed=0; time_limit=1080; time_increment=30 
     101time_elapsed=0; time_increment=300 
    105102sleep ${time_increment} 
    106 while [[ $( ${JOB_LIST} | grep $job_num ) && ${time_elapsed} -lt ${time_limit} ]] ; do 
    107 #while [[ ! -f ${solver_test} && ${time_elapsed} -lt ${time_limit} ]] ; do 
    108     printf "\n####################################################" >> ${DIR_TEST}/mpp.log 
    109     ${JOB_VIEW} $job_num >> mpp.log 
    110 #   ${JOB_VIEW} $id >> mpp.log 
     103while [[ $( ${JOB_LIST} | grep $job_num ) && ${time_elapsed} -lt ${TIME_LIMI} ]] ; do 
     104    printf "\n####################################################" >> computation.log 
     105    ${JOB_VIEW} $job_num                                            >> computation.log 
    111106    sleep ${time_increment} 
    112     let time_elapsed+=time_increment 
     107    let time_elapsed+=${time_increment} 
    113108done 
    114109 
    115110 
    116111#--------------------------------------------- 
    117 printf "Step......................\nTest if solver exists\n"   > mesg_03_step.txt 
    118 #if [ ! -f ${solver_test} ]; then 
    119 #    grep 'E R R O R' ocean.output    >> mesg_11_comments.txt 
    120 #    sed 's/^/Time step :/' time.step >> mesg_11_comments.txt 
    121 #    getout 
    122 #fi 
     112printf "Step......................\nTest if ASCII output files exist\n"   > mesg_03_step.txt 
     113if      [ ! -f ${output_test} ]; then 
     114 
     115    getout 
     116else if [  ] 
     117 
     118    grep 'E R R O R' ocean.output    >> mesg_11_comments.txt 
     119    sed 's/^/Time step :/' time.step >> mesg_11_comments.txt 
     120fi 
    123121 
    124122 
    125123#--------------------------------------------- 
    126 printf "Step......................\nTest solvers difference\n" > mesg_03_step.txt 
    127 diff ${output_refe} ${output_test} 
    128 [ $? -ne 0 ] && status='FAILED' 
    129 diff ${solver_refe} ${solver_test} 
    130 [ $? -ne 0 ] && status='FAILED' 
    131 diff ${tracer_refe} ${tracer_test} 
     124printf "Step......................\nTest ASCII output files difference\n" > mesg_03_step.txt 
     125for file in ocean.output solver.stat tracer.stat; do 
     126    diff $file ${DIR_REFE}/$file 
     127    [ $? -ne 0 ] && status='FAILED' 
     128done 
     129 
     130 
     131#--------------------------------------------- 
     132printf "Step......................\nTest last restart files difference\n" > mesg_03_step.txt 
     133diff_trusting 2>/dev/null 
    132134[ $? -ne 0 ] && status='FAILED' 
    133135 
    134136 
    135137#--------------------------------------------- 
    136 printf "Step......................\nTest outputs difference\n" > mesg_03_step.txt 
    137 #diff_trusting 2>/dev/null 
    138 #[ $? -ne 0 ] && status='FAILED' 
    139  
    140  
    141 #--------------------------------------------- 
    142 printf "Comments\n\n"              >  mesg_11_comments.txt 
     138echo 'Comments'                    >  mesg_11_comments.txt 
    143139grep 'W A R N I N G:' ocean.output >> mesg_11_comments.txt 
    144140 
     
    148144    printf "Step......................\nGet Real CPU time\n" > mesg_03_step.txt 
    149145    real_cpu_time=$( ${JOB_VIEW} $job_num | awk 'END{print $9}') 
    150     [ $? -ne 0 ] && getout 
    151146    printf "Real CPU time\n%s\n" ${real_cpu_time} > mesg_08_realcputime.txt 
    152147else 
    153148    printf "Step......................\nTest InputFiles difference\n" > mesg_03_step.txt 
    154     diff ${inputs_refe} ${inputs_test} 
    155     { [ $? -ne 0 ] && printf "InputFiles\n%s\n" "Different" > mesg_09_inputfiles.txt } || printf "InputFiles\n%s\n" "Same" > mesg_09_inputfiles.txt 
    156     getout 
     149    diff inputs_list.txt ${DIR_REFE}/inputs_list.txt 
     150    [ $? -ne 0 ] && getout 
     151    [[ $? -ne 0 && printf "InputFiles\n%s\n" "Different" > mesg_09_inputfiles.txt ]] || printf "InputFiles\n%s\n" "Same" > mesg_09_inputfiles.txt 
    157152fi 
    158153 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting_func.sh

    r5283 r5286  
    22 
    33function mesg_make {  
    4     paste -d ';' mesg_*.txt > trusting_${DATESTR}.txt 
    5     cat trusting_${DATESTR}.txt 
     4    paste -d ';' mesg_*.txt > trusting_${DATE_STR}.txt 
     5    cat trusting_${DATE_STR}.txt 
    66} 
    77 
     
    1212 
    1313  if [ -f ${DIR_TEST}/trusting.txt ] ; then 
    14       tail -1 trusting_${DATESTR}.txt >> ${DIR_TEST}/trusting.txt 
     14      tail -1 trusting_${DATE_STR}.txt >> ${DIR_TEST}/trusting.txt 
    1515  else 
    16       cp      trusting_${DATESTR}.txt    ${DIR_TEST}/trusting.txt 
     16      cp      trusting_${DATE_STR}.txt    ${DIR_TEST}/trusting.txt 
    1717  fi 
    1818 
    19   cp trusting_${DATESTR}.txt ${DIR_TEST} 
    20 #  chmod o+r ${DIR_TEST}/trusting_${DATESTR}.txt 
     19  cp trusting_${DATE_STR}.txt ${DIR_TEST} 
     20#  chmod o+r ${DIR_TEST}/trusting_${DATE_STR}.txt 
    2121   
    2222#  rm -rf              ${DIR_WORK}/../../dods/public/${LOGNAME}/trusting/${CONF_REF} 
     
    2525   
    2626  # Send mail only when FAILED 
    27   if [ grep 'FAILED' mesg_02_status.txt ]; then 
     27  if [[ grep 'FAILED' mesg_02_status.txt && ! -z $MAIL ]]; then 
    2828      cat << END_MAIL > ${DIR_TEST}/trusting.mail 
    2929XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 
     
    3939 
    4040END_MAIL 
    41       mail -s "[trusting ${CONF_REF}] FAILED" ntmlod@locean-ipsl.upmc.fr < ${DIR_TEST}/trusting.mail 
     41      mail -s "[trusting ${CONF_REF}] FAILED" $MAIL < ${DIR_TEST}/trusting.mail 
    4242  fi 
    4343 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting_help.txt

    r5283 r5286  
    11---------------------------------------------------------------------------- 
    22Usage: trusting [-h] [-d] [-p] configuration 
     3 
     4# ($ARCH & ./cfg/$ARCH.cfg file and at least arch-$ARCH.fcm file in NEMO ARCH dir are mandatory) 
    35 
    46Options: 
Note: See TracChangeset for help on using the changeset viewer.