Changeset 8843


Ignore:
Timestamp:
2017-11-29T12:20:30+01:00 (3 years ago)
Author:
nicolasmartin
Message:

Review forcing inputs management + cosmetic changes

Location:
branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_ADA.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
    r8826 r8843  
    11## Curie configuration 
    2 ##--------------------------------------------------- 
     2##-------------------------------------------------------------------------------- 
     3 
     4## Compilation 
     5##------------ 
     6 
     7TRUST_COMPILE_FORTRAN='ifort' 
     8TRUST_COMPILE_MPI='bullxmpi/' 
     9TRUST_COMPILE_NETCDF='netcdf-[0-9]' 
    310 
    411 
    5 ## Default settings 
    6 ##--------------------------------------------------- 
    7 TRUST_JOB_ENV=${TRUST_IO_XIOS}/arch/arch-${TRUST_MAIN_HPCC} 
     12## Inputs/Outputs 
     13## -------------- 
    814 
    9 ='cdo diffn' 
    10  
    11 [ -z "${TRUST_COMPILE_NPROC}" ] && TRUST_COMPILE_NPROC='4' 
    12 [ -z "${TRUST_JOB_TIMEOUT}" ] && TRUST_JOB_TIMEOUT='10800' 
     15TRUST_IO_CDO='cdo' 
    1316 
    1417 
    15 ## (Super)computer environment 
    16 ##--------------------------------------------------- 
    17 TRUST_JOB_SCRIPT=${TRUST_MAIN_HPCC}.sh 
    18 TRUST_JOB_SUBMIT="ccc_msub ${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'" 
    19 TRUST_JOB_INFO="ccc_macct \${TRUST_JOB_ID}" 
     18## Running 
     19##-------- 
     20 
     21TRUST_JOB_SUBMIT="ccc_msub \${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'" 
    2022TRUST_JOB_STATE="ccc_mpp  | grep \${TRUST_JOB_ID}" 
    21 TRUST_JOB_KILL="ccc_mdel        \${TRUST_JOB_ID}" 
     23TRUST_JOB_INFO="ccc_macct        \${TRUST_JOB_ID}" 
     24TRUST_JOB_KILL="ccc_mdel         \${TRUST_JOB_ID}" 
    2225 
    23 TRUST_JOB_TIME="ccc_macct \${TRUST_JOB_ID} | grep     \"\${TRUST_JOB_ID}.0 *opa\" | awk '{print               \$9      }'" 
    24 TRUST_JOB_RAM_P="ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      | awk '{printf \"%d Mo\n\", \$2; exit}'" 
    25 TRUST_JOB_RAM_V="ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      | awk '{printf \"%d Go\n\", \$7; exit}'" 
    26  
    27 TRUST_COMPILE_FORTRAN='ifort' 
    28 TRUST_IO_CDO='netcdf-utils-' 
    29 TRUST_COMPILE_MPI='bullxmpi/' 
    30 TRUST_COMPILE_NETCDF='netcdf-' 
    31  
    32 PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH 
     26TRUST_JOB_TIME=" 
     27ccc_macct \${TRUST_JOB_ID} | grep     \"\${TRUST_JOB_ID}.0 *opa\" \ 
     28    | awk '{print               \$9      }'                 \ 
     29" 
     30TRUST_JOB_RAM_P=" 
     31ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      \ 
     32    | awk '{printf \"%d Mo\n\", \$2; exit}'                 \ 
     33" 
     34TRUST_JOB_RAM_V=" 
     35ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      \ 
     36    | awk '{printf \"%d Go\n\", \$7; exit}'                 \ 
     37" 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE_trust.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
    r8840 r8843  
    11## Curie configuration 
    2 ##--------------------------------------------------- 
     2##-------------------------------------------------------------------------------- 
    33 
     4## Compilation 
     5##------------ 
    46 
    5 ## Default settings 
    6 ##--------------------------------------------------- 
    77TRUST_COMPILE_FORTRAN='ifort' 
    88TRUST_COMPILE_MPI='bullxmpi/' 
    99TRUST_COMPILE_NETCDF='netcdf-[0-9]' 
    1010 
     11 
     12## Inputs/Outputs 
     13## -------------- 
     14 
    1115TRUST_IO_CDO='cdo' 
     16 
     17## Running 
     18##-------- 
    1219 
    1320TRUST_JOB_SUBMIT="ccc_msub \${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'" 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/arch_template.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/martin.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
    r8826 r8843  
    1 ## Settings for  
     1## Regular trusting tests on Curie 
    22##-------------------------------------------------------------------------------- 
    3  
    43 
    54## Trusting installation 
    65## --------------------- 
     6 
    77   TRUST_DIR_WORK=$CCCWORKDIR/NEMO 
    88TRUST_DIR_SCRATCH=$CCCSCRATCHDIR/NEMO/trusting 
     
    1010 
    1111 
    12 ## Branch checkout 
    13 ## --------------- 
    14  
    15  
    1612## NEMO configuration 
    1713## ------------------ 
     14 
    1815[ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust' 
    1916[ ${TRUST_CFG_REF} == 'ORCA2_LIM3_PISCES' ] && TRUST_CFG_NEW='O2L3P_trust' 
     
    2320## Inputs/Outputs 
    2421## -------------- 
     22 
    2523TRUST_IO_FORC_PATH=$CCCWORKDIR/NEMO/FORC 
    2624     TRUST_IO_XIOS=$CCCWORKDIR/XIOS 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/romr005.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
    r8826 r8843  
    1 ## Installation for trusting tests on Ada Supercomputer 
    2 ##--------------------------------------------------- 
     1## Regular trusting tests on Ada 
     2##-------------------------------------------------------------------------------- 
     3 
     4## Trusting installation 
     5## --------------------- 
     6 
     7   TRUST_DIR_WORK=$WORKDIR/NEMO 
     8TRUST_DIR_SCRATCH=$WORKDIR/NEMO/trusting 
     9  TRUST_DIR_STORE=$WORKDIR/NEMO/trusting_sav 
    310 
    411 
    5 ## Default settings 
    6 ##--------------------------------------------------- 
    7 [ -z "${TRUST_SVN_BRANCH}" ] && TRUST_SVN_BRANCH='trunk' 
    8 TRUST_SVN_CO=( 'ARCH           CONFIG          NEMO               \ 
    9              EXTERNAL/AGRIF EXTERNAL/fcm    EXTERNAL/IOIPSL    \ 
    10              TOOLS/COMPILE  TOOLS/maketools TOOLS/REBUILD_NEMO  ' ) 
     12## NEMO configuration 
     13## ------------------ 
    1114 
    12 [ -z "${TRUST_CFG_REF}" ] && TRUST_CFG_REF='ORCA2_LIM_PISCES' 
    13 TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust' 
    14  
    15 [ -z "${TRUST_IO_FORC_TAR}" ] && TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.6.tar' 
    16 [ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_IO_FORC_TAR='INPUTS_ORCA1_LIM3_PISCES_V6.tar' 
    17 [ ${TRUST_CFG_REF} == 'AMM12'             ] && TRUST_IO_FORC_TAR='AMM12_v3.6.tar' 
    18  
    19 TRUST_CFG_KEY_ADD=''; TRUST_CFG_KEY_DEL='' 
    20 [ ${TRUST_CFG_REF} == 'ORCA2_LIM' ] && TRUST_CFG_KEY_ADD='key_add key_agrif' && TRUST_CFG_KEY_DEL='key_del key_zdftmx' 
     15[ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust' 
     16[ ${TRUST_CFG_REF} == 'ORCA2_LIM3_PISCES' ] && TRUST_CFG_NEW='O2L3P_trust' 
     17[ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_CFG_NEW='O1L3P_trust' 
    2118 
    2219 
    23 ## User environment 
    24 ##--------------------------------------------------- 
    25 TRUST_DIR_WORK=$WORKDIR/NEMO 
    26 TRUST_DIR_SCRATCH=$WORKDIR/NEMO/trusting/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH}/${TRUST_TEST_DATE} 
    27 TRUST_DIR_STORE=$WORKDIR/NEMO/trusting_sav/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH} 
    28 TRUST_IO_FORC_PATH=$WORKDIR/NEMO/FORC 
    29 TRUST_IO_XIOS=$WORKDIR/XIOS/xios-1.0 
     20## Inputs/Outputs 
     21## -------------- 
    3022 
    31 [ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust' 
    32 [ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_CFG_NEW='O1L3P_trust' 
    33 [ ${TRUST_CFG_REF} == 'ORCA2_LIM'         ] && TRUST_CFG_NEW='O2LA_trust' 
     23TRUST_IO_FORC_PATH=$COMMONDIR/NEMO/Online_forcing_archives 
     24     TRUST_IO_XIOS=$WORKDIR/XIOS 
    3425 
    35 [ -z "${TRUST_TEST_MAILING}" ] && TRUST_TEST_MAILING='ntmlod@locean-ipsl.upmc.fr' 
     26if   [ ${TRUST_SVN_BRANCH} == 'nemo_v3_6_STABLE'  ]; then 
     27    TRUST_IO_XIOS+='/xios-1.0' 
     28elif [ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES'    ]; then 
     29    TRUST_IO_XIOS+='/XIOS_DEV_CMIP6' 
     30else 
     31    TRUST_IO_XIOS+='/trunk' 
     32fi 
     33 
     34 
     35## Trusting test 
     36##-------------- 
     37 
     38TRUST_TEST_MAILING=$( cat ./cfg/mailing_list.txt ) 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/user_template.cfg

    • Property mime-type deleted
    • Property svn:mime-type changed from application/x-shellscript to text/x-shellscript
    r8826 r8843  
    5959##  2 variables to handle 4 different cases: TRUST_IO_FORC_PATH for path to the forcing directory 
    6060##+ and TRUST_IO_FORC_TAR for potential archive(s) to extract 
    61 ##o TRUST_IO_FORC_PATH unset & TRUST_IO_FORC_TAR unset => No files needed at all 
     61##o TRUST_IO_FORC_PATH unset                           => No files needed at all 
    6262##o TRUST_IO_FORC_PATH set   & TRUST_IO_FORC_TAR empty => All inside files will be copied 
    6363##o TRUST_IO_FORC_PATH set   & TRUST_IO_FORC_TAR   set => Files will be extracted from archives list 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env

    r8834 r8843  
    1212##------------------------------------------------------------------- 
    1313 
    14 if [ ${TRUST_FLAG_DEBUG} == 'true' ]; then 
     14if [ ${TRUST_FLAG_DEBUG} == 'false' ]; then 
     15    ## std mode (merge stdout & stderr to /dev/null, XIOS compilation from scratch) 
     16    TRUST_IO_XIOS_MODE='--full' 
     17    TRUST_MAIN_STDOUT='>& /dev/null' 
     18else 
    1519    ## debug mode (verbose output and skip XIOS compilation) 
    1620    TRUST_IO_XIOS_MODE='' 
    1721    TRUST_MAIN_STDOUT='1> /dev/null' 
    18 else 
    19     ## std mode (merge stdout & stderr to /dev/null, XIOS compilation from scratch) 
    20     TRUST_IO_XIOS_MODE='--full' 
    21     TRUST_MAIN_STDOUT='>& /dev/null' 
    2222fi 
    2323 
     
    101101##------------------- 
    102102 
    103 ## Forcing archive unset 
    104 if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then 
    105  
    106     ## Forcing directory set 
    107     if [ ${TRUST_IO_FORC_PATH} ]; then 
     103[ -z "${TRUST_CFG_NEW}" ] && TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust' 
     104export TRUST_CFG_NEW TRUST_CFG_REF 
     105export TRUST_CFG_KEY_ADD TRUST_CFG_KEY_DEL 
     106 
     107 
     108## Inputs/Outputs 
     109## -------------- 
     110 
     111[ -z "${TRUST_IO_XIOS}" ] && get_out A 
     112export TRUST_IO_XIOS 
     113 
     114## Forcing directory set and not empty 
     115if [ ${TRUST_IO_FORC_PATH} ]; then 
     116 
     117    ## Forcing archive unset 
     118    if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then 
     119 
    108120   ## Default forcing archive from trunk 
    109121   TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.7.tar INPUTS_PISCES_v3.6st.tar' 
     
    126138fi 
    127139 
    128 [ -z "${TRUST_CFG_NEW}" ] && TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust' 
    129 export TRUST_CFG_NEW TRUST_CFG_REF 
    130 export TRUST_CFG_KEY_ADD TRUST_CFG_KEY_DEL 
    131  
    132  
    133 ## Inputs/Outputs 
    134 ## -------------- 
    135  
    136 [ -z "${TRUST_IO_XIOS}" ] && get_out A 
    137 export TRUST_IO_XIOS 
    138140export TRUST_IO_FORC_PATH TRUST_IO_FORC_TAR 
    139141export TRUST_IO_CDO 
    140142 
    141143 
    142 ## Compilation & Running 
    143 ##---------------------- 
     144## Compilation 
     145##------------ 
    144146 
    145147## Assuming the sourcing of XIOS arch .env file (modules) for setting  
     
    156158## Not mandatory 
    157159export TRUST_COMPILE_FORTRAN TRUST_COMPILE_MPI TRUST_COMPILE_NETCDF 
     160 
     161 
     162## Running 
     163##-------- 
    158164 
    159165## Assuming the job submit script is in './batch', if not  
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

    r8834 r8843  
    2222    local outline=$( printf "%${char_nb}s" ) 
    2323 
    24     printf "\nStep.....\n%s\n%s\n" "$1" ${outline// /-} 
     24    printf "\n\nStep.....\n%s\n%s\n\n" "$1" ${outline// /-} 
    2525} 
    2626 
     
    3434    echo     ${TRUST_TEST_DIR} 
    3535 
    36     echo 'Date'             > ${file_date}; echo 'Result'       > ${file_rslt} 
    37     echo 'Status'           > ${file_stat}; echo 'NEMOGCM'      > ${file_nemo} 
    38     echo 'XIOS'          > ${file_xios}; echo 'Fortran'      > ${file_cmpf} 
    39     echo 'MPI'           > ${file_lmpi}; echo 'NetCDF'       > ${file_ncdf} 
    40     echo 'Inputs'        > ${file_inpt}; echo 'Elapsed time' > ${file_time} 
    41     echo 'RAM (Phy./Virt.)' > ${file_memy}; echo 'Comments'     > ${file_note} 
     36    echo 'Date'             > ${file_date}; echo 'Result'   > ${file_rslt} 
     37    echo 'Status'           > ${file_stat}; echo 'NEMOGCM'  > ${file_nemo} 
     38    echo 'XIOS'          > ${file_xios}; echo 'Fortran'  > ${file_cmpf} 
     39    echo 'MPI'           > ${file_lmpi}; echo 'NetCDF'   > ${file_ncdf} 
     40    echo 'Inputs'        > ${file_inpt}; echo 'Time'    > ${file_time} 
     41    echo 'RAM (Phy./Virt.)' > ${file_memy}; echo 'Comments' > ${file_note} 
    4242 
    4343    ## 'FAILED' status with 'Unknown error' by default 
     
    6666 
    6767   echo $dir && ${TRUST_SVN_ACTION} ${TRUST_SVN_NEMOGCM}/$dir || get_out C 
    68    rev_loc=$( svn info ${TRUST_SVN_NEMOGCM}/$dir     \ 
    69               | awk '/Last Changed Rev/ {print $NF}'   ) 
     68   rev_loc=$( svn info ${TRUST_SVN_NEMOGCM}/$dir         \ 
     69                  | awk '/Last Changed Rev/ {print $NF}'   ) 
    7070 
    7171   ## Keep last rev. nb 
     
    8787 
    8888    ## Sourcing environment 
    89     . ${TRUST_JOB_ENV} 
     89    . ${TRUST_JOB_ENV} >& /dev/null 
    9090 
    9191    for str in ${TRUST_COMPILE_FORTRAN}                         \ 
     
    101101   if [[ $str =~ ${TRUST_COMPILE_FORTRAN}|${TRUST_IO_CDO} ]]; then 
    102102       ver=$( $str --version 2>&1 | grep -m1 -oe '\<[0-9. ]*\>' \ 
    103          | xargs echo $str                                   ) 
     103             | xargs echo $str                               ) 
    104104   fi 
    105105 
     
    107107   ver=$( echo $ver | sed 's|[/-]| |g' ) 
    108108 
    109    echo $ver \ 
     109   echo $ver        \ 
    110110       >> model.log 
    111111    done 
     
    130130 
    131131    rev=$( svn info | awk '/Last Changed Rev/ {print $NF}' ) 
    132     echo 'XIOS '$rev \ 
    133    >> ${TRUST_TEST_DIR}/model.log 
     132    printf 'XIOS                 branch %s rev. %s\n' \ 
     133   $( basename ${TRUST_IO_XIOS} ) $rev           \ 
     134   | tee -a ${TRUST_TEST_DIR}/model.log 
    134135    echo "<a href=\"${TRUST_SVN_REPO}/ioserver/changeset/$rev target=\"_blank\">$rev</a>" \ 
    135136   >> ${TRUST_TEST_DIR}/${file_xios} 
     
    174175 
    175176get_inputs() { 
    176      # List archive content & extract it by default 
    177     local inputs_list=" 
    178         for archive in \${TRUST_IO_FORC_TAR}; do 
    179             tar -tvf \${TRUST_IO_FORC_PATH}/\$archive >> inputs_list.txt; 
    180          done 
    181          " 
    182     local inputs_get=" 
    183         for archive in \${TRUST_IO_FORC_TAR}; do 
    184             tar -vxf \${TRUST_IO_FORC_PATH}/\$archive  >       /dev/null; 
    185          done 
    186          " 
    187  
    188     ## List & copy files without archive 
    189     if [ -z "${TRUST_IO_FORC_TAR}" ]; then 
    190         inputs_list=" ls -lh \${TRUST_IO_FORC_PATH}/* >> inputs_list.txt" 
    191         inputs_get=" \cp     \${TRUST_IO_FORC_PATH}/* .                 " 
    192     fi 
    193  
    194177    cd ${TRUST_TEST_DIR} 
     178 
     179    ## Test forcing directory 
     180    if [[ ! ${TRUST_IO_FORC_PATH} && ${TRUST_IO_FORC_PATH-_} ]]; then 
     181 
     182   echo 'No forcing files needed' 
     183 
     184    else 
     185 
     186   ## Test forcing archive 
     187   if [ -n "${TRUST_IO_FORC_TAR}" ]; then 
     188 
     189       echo 'Forcing archive(s): '${TRUST_IO_FORC_TAR} 
     190 
     191       # List archive content & extract it by default 
     192       local inputs_list=" 
     193            for archive in \${TRUST_IO_FORC_TAR}; do 
     194      tar -tvf \${TRUST_IO_FORC_PATH}/\$archive >> inputs_list.txt; 
     195            done 
     196            " 
     197       local inputs_get=" 
     198            for archive in \${TRUST_IO_FORC_TAR}; do 
     199      tar -vxf \${TRUST_IO_FORC_PATH}/\$archive  >       /dev/null; 
     200            done 
     201            " 
     202 
     203   else 
     204 
     205       echo 'Forcing directory: '${TRUST_IO_FORC_PATH} 
     206 
     207       ## List & copy files without archive 
     208            local inputs_list=" ls -lh \${TRUST_IO_FORC_PATH}/* >> inputs_list.txt" 
     209            local inputs_get=" \cp     \${TRUST_IO_FORC_PATH}/* .                 " 
     210   fi 
     211 
     212    fi 
     213 
    195214    eval ${inputs_list} 
    196     echo ${inputs_get}; eval ${inputs_get} 
     215    eval ${inputs_get} 
    197216 
    198217    if [ $( find -name '*.gz' -print -quit ) ]; then 
     
    299318   local time_cpu=$( eval ${TRUST_JOB_TIME} ) 
    300319 
    301    printf "Elapsed time: " 
     320   printf "Time: " 
    302321   echo ${time_cpu} | tee -a ${file_time} 
    303322 
     
    310329   local memory_vmax=$( eval ${TRUST_JOB_RAM_V} ) 
    311330 
    312    printf "Memory max usage (physical/virtual): " 
     331   printf "Max memory usage (physical/virtual): " 
    313332   echo ${memory_pmax}' / '${memory_vmax} | tee -a ${file_memy} 
    314333    fi 
     
    375394   ############################################################### 
    376395   filebases=$( find -regextype sed -regex ".*${TRUST_CFG_NEW}.*_[0-9]\{4\}\.nc" \ 
    377                 | sed 's/\(.*\)_.*/\1/' | sort -u                                  ) 
     396                    | sed 's/\(.*\)_.*/\1/' | sort -u                              ) 
    378397 
    379398   for filebase in $filebases; do 
    380399 
    381400       ndomain=$( find -regex ".*${filebase}_[0-9]*.nc" \ 
    382              | wc -l | awk '{print $1}'              ) 
     401                 | wc -l | awk '{print $1}'          ) 
    383402 
    384403            ##################################################### 
     
    486505 
    487506        ## Send mail only when FAILED 
    488    if [[ ! -z "${TRUST_TEST_MAILING}"        \ 
     507   if [[ -n "${TRUST_TEST_MAILING}"          \ 
    489508         && ${TRUST_FLAG_RESULT} == 'FAILED'   ]]; then 
    490509 
     
    576595   comments 'E R R O R' 
    577596   [ -e time.step ] && time_step=$( cat time.step ) 
    578    TRUST_FLAG_ERROR+=' '$time_step 
     597   TRUST_FLAG_ERROR+=' '${time_step:=0} 
    579598    else 
    580599   comments 'W A R N I N G' 
     
    587606 
    588607    ## Last messenger files 
    589     sed -i "2 s/.*/$TRUST_FLAG_RESULT=/" ${file_rslt} 
    590     sed -i "2 s/.*/$TRUST_FLAG_ERROR/"   ${file_stat} 
     608    sed -i "2 s/.*/$TRUST_FLAG_RESULT/" ${file_rslt} 
     609    sed -i "2 s/.*/$TRUST_FLAG_ERROR/"  ${file_stat} 
    591610 
    592611    ## Save tested configuration if trusting failed in production mode (-p|--prod) 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

    r8840 r8843  
    8383echo '****************************************************************************************************' 
    8484echo 
    85 printf "\t§ (Super)Computer\t\t%s\n"             ${TRUST_MAIN_HPCC} 
    86 printf "\t§ User installation\t\t%s\n\n"         ${TRUST_MAIN_USER} 
     85printf "\t§ Testing configuration\t\t%s on branch %s\n" \ ${TRUST_CFG_REF} ${TRUST_SVN_BRANCH} 
     86printf "\t§ (Super)Computer\t\t%s\n"                ${TRUST_MAIN_HPCC} 
     87printf "\t§ User installation\t\t%s\n\n"            ${TRUST_MAIN_USER} 
    8788echo 
    88 printf "\t§ Testing configuration\t\t%s based on %s\n" \ 
    89     ${TRUST_CFG_NEW} ${TRUST_CFG_REF} 
    90 printf "\t§ SVN working copy\t\t%s/%s\n"               \ 
    91     ${TRUST_DIR_WORK} ${TRUST_SVN_BRANCH} 
    9289if [ ${TRUST_TEST_BENCHMARK} ]; then 
    93 printf "\t§ Benchmark folder\t\t%s\n"               ${TRUST_TEST_BENCHMARK} 
     90printf "\t§ Benchmark folder\n\t\t\t%s\n"                 ${TRUST_TEST_BENCHMARK} 
    9491fi 
    9592 
     
    106103 
    107104print_step 'SVN action on NEMO directories' 
    108 echo "${TRUST_SVN_ACTION} on ${TRUST_SVN_NEMOGCM}:" 
     105printf "${TRUST_SVN_ACTION} on ${TRUST_SVN_NEMOGCM}:\n\n"   
    109106get_nemo_rev 
    110107 
     
    123120compile_xios 
    124121 
    125 print_step "Compile ${TRUST_CFG_REF} configuration" 
     122print_step "Compile ${TRUST_CFG_NEW} cfg from ${TRUST_CFG_REF}" 
    126123compile_nemo 
    127124 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/web/index.php

    r8840 r8843  
    9191                                                else { 
    9292                     if ( $LOG == "martin" ) { 
    93                         $FILE = sprintf( "%s/%s/%s/trusting_martin_X64_CURIE_cron.txt", $DIR_TGCC , $CFG, $BCH ); 
     93                        $FILE = sprintf( "%s/%s/%s/trusting_martin_X64_CURIE_trust.txt", $DIR_TGCC , $CFG, $BCH ); 
    9494                     } 
    9595                     else { 
Note: See TracChangeset for help on using the changeset viewer.