Changeset 5681 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

Timestamp:

2015-08-11T19:52:33+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Add cpp keys management & "cpp_*" file to compare in order to add ORCA2AGUL config to Trusting

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh (modified) (20 diffs)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

@@ -13 +13 @@
 FILE_TRUS=trusting_${DATE}_$PATTERNAME.txt; FILE_ARCH=trusting_${DATE}_$PATTERNAME.tar.gz
 
+
 print_step() { printf "\nStep.....\n$1\n"; }
+
 
 init_files() {
@@ -27 +29 @@
 }
 
+
 get_date() {
     local dat=$( date -ud ${DATE} +"%F %R %Z" )
@@ -32 +35 @@
     echo $dat >> ${FILE_DATE}
 }
+
 
 get_nemo_rev() {
@@ -54 +58 @@
 
    ## For time being, just get revision number from XIOS
-   if [ "$dir" == "${DIR_XIOS}" ]; then
+   if [ $dir == ${DIR_XIOS} ]; then
        rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' )
        echo 'XIOS '${rev_loc} >> model.log
@@ -73 +77 @@
 }
 
+
 get_soft_rel() {
     local soft_rel
@@ -85 +90 @@
    fi
 
-   [ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version | grep -m1 -oe '\<[0-9. ]*\>' )
+   [ $soft == $COMPILER ] && soft_rel=$( $soft --version | grep -m1 -oe '\<[0-9. ]*\>' )
    ## Cleaning characters string to display proper soft name
    soft=$( echo $soft | sed 's#\\##g; s#[/-]$##' )
@@ -95 +100 @@
 }
 
+
 get_inputs() {
     local cmd_iol="tar -tvf ${NEMO_FORC}/${NEMO_TARF}" cmd_iof="tar -vxf ${NEMO_FORC}/${NEMO_TARF}"
@@ -101 +107 @@
     ${cmd_iol} > inputs_list.txt && ${cmd_iof} > /dev/null
 }
+
 
 diff_inputs() {
@@ -106 +113 @@
     local files_list='' mesg='Same' 
 
-    for file in inputs_list.txt namelist_* *.xml; do
+    for file in inputs_list.txt namelist_* *.xml cpp_*; do
    dif=''
-   if [ -e ${REFE_DIR}/$file ]; then dif=$( diff -q $file ${REFE_DIR}/$file ); else dif=0; fi
+
+   if [ -e ${REFE_DIR}/$file ]; then
+       dif=$( diff -q $file ${REFE_DIR}/$file )
+   else dif=0; fi
 
    if [ -n "$dif" ]; then
        mesg='Different'
-       (( "$dif" != '0' )) && echo $dif && files_list+=$file' '
+       [ $dif != '0' ] && echo $dif && files_list+=$file' '
    fi
 
     done
 
-    [ "$mesg" == 'Same' ] && echo $mesg
-    echo $mesg >> ${FILE_INPT}
-
+    [ $mesg == 'Same' ] && echo $mesg | tee -a ${FILE_INPT}
     [ -n "${files_list}" ] && echo 'Inputs  : '${files_list}'differ<br>' \
    >> temp_${FILE_COMM}
 }
+
 
 job_pending() {
@@ -146 +155 @@
 }
 
+
 diff_results() {
     local files_list=''
@@ -159 +169 @@
 }
 
+
 diff_restart() {
-    local base_name dif dift file list_comp list_tmsp nb_dom
-    local files_list='' 
-
-    [ ! -e  ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out 7
+    local base_name dif file list_comp list_tmsp nb_dom
+    local files_list='' dift=0
+
+    [ ! -e ${REFE_DIR}/time.step ] && export ST='FAILED' && get_out 7
     export TIME_STEP=$( cat ${REFE_DIR}/time.step | tr -d [:space:] )
     echo 'Last time step of benchmark run: '${TIME_STEP}
@@ -195 +206 @@
                 | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n'  )
 
-         if [[ -n "${dif}" && $( echo $dif | awk '{ print $1 }') -ne 0 ]]; then
+         if [[ -n "$dif" && (( $( echo $dif | awk '{print $1}' ) -ne 0 )) ]]; then
              export ST='FAILED' && files_list+=$file' '
              let dift+=$( echo $dif | awk '{print $1}' )
-             echo $file'.nc: '$dif
-         else
-             echo 'identical'
+             echo $file.nc': '$dif
          fi
 
-          else
-         export ST='FAILED' && get_out 7
-          fi
-
-      else
-          continue
-      fi
+          else export ST='FAILED' && get_out 7; fi
+
+      else continue; fi
 
        done
    done
 
-   [ -n "${files_list}" ] && echo 'Restarts: '${files_list}$dift' record(s) differ<br>' \
-       >> temp_${FILE_COMM}
-    else
-   export ST='FAILED'
-    fi
-
-}
+   if (( $dift != 0 )); then
+       echo 'Restarts: '${files_list}$dift' record(s) differ<br>' \
+      >> temp_${FILE_COMM}
+   else echo 'No restart differ'; fi
+
+    else export ST='FAILED'; fi
+
+}
+
 
 get_cpu_time() {
@@ -227 +234 @@
     echo ${real_cpu_time} | tee -a ${FILE_CPUT}
 }
+
 
 comments() {
@@ -242 +250 @@
 }
 
+
 mesg_make() {
     ## Format comments for web
@@ -250 +259 @@
 }
 
+
 mesg_publish() {
     local cmd
@@ -259 +269 @@
    $cmd ${FILE_TRUS} >> ${REFE_DIR}/trusting_$PATTERNAME.txt
 
-        ## Send mail only when FAILED
-   if [[ ! -z "$EMAIL" && "$ST" == 'FAILED' ]]; then
-       cat << END_MAIL > trusting.mail
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  ## Send mail only when FAILED
+   if [[ ! -z "$EMAIL" && $ST == 'FAILED' ]]; then
+       cat <<END_MAIL \
+      > trusting.mail
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 Dear $USER,
@@ -270 +281 @@
 Archive created: ${FILE_ARCH} in ${REFE_DIR}
 
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 END_MAIL
@@ -282 +293 @@
 }
 
+
 get_out() {
     ERR=$1
@@ -287 +299 @@
     cd ${TEST_DIR}
 
-    if [ "$ST" == 'FAILED' ]; then
+    if [ $ST == 'FAILED' ]; then
 
         ## Error identification
@@ -309 +321 @@
 
     ## Save tested configuration if trusting failed
-    if [[ "$ST" == 'FAILED' && $PUBLISH -eq 1 && $DEBUG -eq 0 ]]; then
+    if [[ $ST == 'FAILED' && $PUBLISH -eq 1 && $DEBUG -eq 0 ]]; then
    echo 'Creating archive '${FILE_ARCH}' under '${REFE_DIR}
-   tar -czf ${REFE_DIR}/${FILE_ARCH} * ${TEST_DIR}/${NEMO_CONF}/${TEST_CONF}/cpp_*  \
-                                        ${TEST_DIR}/${NEMO_CONF}/${TEST_CONF}/MY_SRC \
-                                       ${TEST_DIR}/${NEMO_CONF}/${TEST_CONF}/WORK
+   tar -czf ${REFE_DIR}/${FILE_ARCH} * ${NEMO_HOME}/CONFIG/${TEST_CONF}/cpp_*  \
+                                        ${NEMO_HOME}/CONFIG/${TEST_CONF}/MY_SRC \
+                                       ${NEMO_HOME}/CONFIG/${TEST_CONF}/WORK
     fi