Changeset 8780 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc

Timestamp:

2017-11-22T11:28:53+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Push modifications from functional Trusting in Curie HPC

Location:

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc

Files:

• trusting.env (modified) (3 diffs)
• trusting_func.sh (modified) (15 diffs)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env

@@ -5 +5 @@
 ##--------------------------------------
 dat=$( date )
-export DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" )
-export PATTERNAME=${TRUS_USER}'_'${TRUS_HPCC}
+export TRUS_DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" )
+export TRUS_NAME=${TRUS_USER}'_'${TRUS_HPCC}
 export TRUS_SVNH='https://forge.ipsl.jussieu.fr/nemo/svn'
 
@@ -12 +12 @@
 ## Source user configuration
 ##---------------------------------------------------
-. ./config/${TRUS_USER}.cfg
+. ./cfg/${TRUS_USER}.cfg
 export TRUS_WORK TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC
 export TRUS_BRAN TRUS_REFE
@@ -21 +21 @@
 ## Source (super)computer configuration
 ##---------------------------------------------------
-. ./config/${TRUS_HPCC}.cfg
+. ./cfg/${TRUS_HPCC}.cfg
 export TRUS_ENVI TRUS_CDOD TRUS_NPRO TRUS_TOUT
 export TRUS_JSPT TRUS_JSUB TRUS_JSTA TRUS_JKIL

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

@@ -3 +3 @@
 
 ## Messenger filenames
-FILE_DATE=mesg_01_date_$PATTERNAME.txt  ; FILE_RSLT=mesg_02_result_$PATTERNAME.txt
-FILE_STAT=mesg_03_state_$PATTERNAME.txt ; FILE_NEMO=mesg_04_nemo_$PATTERNAME.txt
-FILE_XIOS=mesg_05_xios_$PATTERNAME.txt  ; FILE_CMPF=mesg_06_compiler_$PATTERNAME.txt
-FILE_LMPI=mesg_07_mpi_$PATTERNAME.txt   ; FILE_NCDF=mesg_08_netcdf_$PATTERNAME.txt
-FILE_INPT=mesg_09_inputs_$PATTERNAME.txt; FILE_TIME=mesg_10_time_$PATTERNAME.txt
-FILE_MEMY=mesg_11_memory_$PATTERNAME.txt; FILE_NOTE=mesg_12_comments_$PATTERNAME.txt
+file_date=mesg_01_date.txt  ; file_rslt=mesg_02_result.txt
+file_stat=mesg_03_state.txt ; file_nemo=mesg_04_nemo.txt
+file_xios=mesg_05_xios.txt  ; file_cmpf=mesg_06_compiler.txt
+file_lmpi=mesg_07_mpi.txt   ; file_ncdf=mesg_08_netcdf.txt
+file_inpt=mesg_09_inputs.txt; file_time=mesg_10_time.txt
+file_memy=mesg_11_memory.txt; file_note=mesg_12_comments.txt
 
 ## Trusting timestamped logfile & archive
-TRUS_FILE=trusting_${DATE}_$PATTERNAME.txt; TRUS_ARCH=trusting_${DATE}_$PATTERNAME.tgz
+TRUS_FILE=trusting_${TRUS_DATE}_$TRUS_NAME.txt; TRUS_ARCH=trusting_${TRUS_DATE}_$TRUS_NAME.tgz
 
 
@@ -23 +23 @@
 
 init_files() {
-    echo 'Date'               > ${FILE_DATE}; echo 'Result'           > ${FILE_RSLT}
-    echo 'State'              > ${FILE_STAT}; echo 'NEMOGCM rev.'     > ${FILE_NEMO}
-    echo 'XIOS rev.'          > ${FILE_XIOS}; echo 'Fortran compiler' > ${FILE_CMPF}
-    echo 'MPI libs'           > ${FILE_LMPI}; echo 'NetCDF libs'      > ${FILE_NCDF}
-    echo 'Input files'        > ${FILE_INPT}; echo 'Elapsed time'     > ${FILE_TIME}
-    echo 'Memory usage (P/V)' > ${FILE_MEMY}; echo 'Comments'         > ${FILE_NOTE}
+    echo 'Date'               > ${file_date}; echo 'Result'           > ${file_rslt}
+    echo 'State'              > ${file_stat}; echo 'NEMOGCM rev.'     > ${file_nemo}
+    echo 'XIOS rev.'          > ${file_xios}; echo 'Fortran compiler' > ${file_cmpf}
+    echo 'MPI libs'           > ${file_lmpi}; echo 'NetCDF libs'      > ${file_ncdf}
+    echo 'Input files'        > ${file_inpt}; echo 'Elapsed time'     > ${file_time}
+    echo 'Memory usage (P/V)' > ${file_memy}; echo 'Comments'         > ${file_note}
 
     ## 'Failed' status with 'Unknown error' by default
     echo ${TRUS_RSLT}      \
-   >> ${FILE_RSLT}
+   >> ${file_rslt}
     echo 'Unknown error' \
-   >> ${FILE_STAT}
+   >> ${file_stat}
 }
 
 get_date() {
     ## UTC time zone for timestamping
-    local dat=$( date -ud "${DATE}" +"%F %R %Z" )
+    local dat=$( date -ud "${TRUS_DATE}" +"%F %R %Z" )
 
     echo $dat           \
-   >> ${FILE_DATE}
+   >> ${file_date}
 }
 
@@ -58 +58 @@
       >> model.log
        echo "<a href=\"https://forge.ipsl.jussieu.fr/ioserver/changeset/${rev_loc}\" target=\"_blank\">${rev_loc}</a>" \
-      >> ${FILE_XIOS}
+      >> ${file_xios}
        continue
    fi
@@ -72 +72 @@
    >> model.log
     echo "<a href=\"https://forge.ipsl.jussieu.fr/nemo/changeset/$rev\" target=\"_blank\">$rev</a>" \
-   >> ${FILE_NEMO}
+   >> ${file_nemo}
 }
 
@@ -110 +110 @@
 
     sed -n 3p model.log \
-   >> ${FILE_CMPF}
+   >> ${file_cmpf}
     sed -n 4p model.log \
-   >> ${FILE_LMPI}
+   >> ${file_lmpi}
     sed -n 5p model.log \
-   >> ${FILE_NCDF}
+   >> ${file_ncdf}
 }
 
@@ -145 +145 @@
     [ $mesg == 'Same' ] && echo $mesg
     echo $mesg          \
-   >> ${FILE_INPT}
+   >> ${file_inpt}
 
     ## List different files for web comment
     [ -n "${files_list}" ] && echo 'Inputs  : '${files_list}'differ<br>' \
-   >> temp_${FILE_NOTE}
+   >> temp_${file_note}
 }
 
@@ -161 +161 @@
    printf "\n%s\n" ${outline// /#}          \
        >> computation.log
-   [ -n "${TRUS_JINF}" ] && eval ${JOB_INFO} \
+   [ -n "${TRUS_JINF}" ] && eval ${TRUS_JINF} \
        >> computation.log
    sleep ${time_increment}
@@ -170 +170 @@
 
     ## Kill remaining job & stop the test if it's too long
-    [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${JOB_DELE} &> /dev/null; get_out 6; }
+    [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${TRUS_JKIL} &> /dev/null; get_out 6; }
 }
 
@@ -192 +192 @@
     ## List different files for web comment
     [ -n "${files_list}" ] && echo 'Results : '${files_list}'differ<br>' \
-   >> temp_${FILE_NOTE}
+   >> temp_${file_note}
 }
 
@@ -263 +263 @@
    if [ ${dif_sum} -ne 0 ]; then
        echo 'Restarts: '${files_list}${dif_sum}' record(s) differ<br>' \
-      >> temp_${FILE_NOTE}
+      >> temp_${file_note}
    else
        echo 'Same'
@@ -281 +281 @@
 
     printf "Elapsed time: "
-    echo ${time_cpu} | tee -a ${FILE_TIME}
+    echo ${time_cpu} | tee -a ${file_time}
 }
 
@@ -291 +291 @@
 
     printf "Memory max usage (physical/virtual): "
-    echo ${memory_pmax}' / '${memory_vmax} | tee -a ${FILE_MEMY}
+    echo ${memory_pmax}' / '${memory_vmax} | tee -a ${file_memy}
 }
 
@@ -308 +308 @@
 
     [ -n "$line" ] && ( echo $line; printf "$line<br>" \
-   >> temp_${FILE_NOTE} )
+   >> temp_${file_note} )
 }
 
 log_make() {
     ## Format comments for web
-    [ -e temp_${FILE_NOTE} ] && cat temp_${FILE_NOTE} | tr -d '\n' | sed 's/<br>$//' \
-   >> ${FILE_NOTE}
+    [ -e temp_${file_note} ] && cat temp_${file_note} | tr -d '\n' | sed 's/<br>$//' \
+   >> ${file_note}
 
     ## Construct txt file with all messenger files
@@ -328 +328 @@
 
    ## Create or append trusting logfile
-   if [ -f ${TRUS_STOR}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
+   if [ -f ${TRUS_STOR}/trusting_$TRUS_NAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
 
    $cmd ${TRUS_FILE}                            \
-       >> ${TRUS_STOR}/trusting_$PATTERNAME.txt
+       >> ${TRUS_STOR}/trusting_$TRUS_NAME.txt
 
         ## Send mail only when FAILED
@@ -409 +409 @@
     ## Last messenger files
     #export TRUS_RORR
-    sed -i "2 s/.*/$TRUS_RSLT/" ${FILE_RSLT}; sed -i "2 s/.*/$TRUS_RORR/" ${FILE_STAT}
+    sed -i "2 s/.*/$TRUS_RSLT/" ${file_rslt}; sed -i "2 s/.*/$TRUS_RORR/" ${file_stat}
 
     ## Save tested configuration if trusting failed in production mode (-p|--prod)