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

Timestamp:

2015-11-26T16:55:09+01:00 (8 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS18_TRUST Last commits before merging to trunk

Location:

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc

Files:

• . (added)
• banner.html (added)
• banner.txt (added)
• svn_abstract.awk (added)
• trusting.env (moved) (moved from branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.env) (2 diffs)
• trusting_func.sh (moved) (moved from branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting_func.sh) (12 diffs)
• trusting_help.txt (moved) (moved from branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting_help.txt)

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

@@ -2 +2 @@
 
 
-## Patterns (UTC time-stamp & messengers filename)
+## Global environment variables
 ##--------------------------------------
 dat=$( date )
@@ -12 +12 @@
 ## Source user configuration
 ##---------------------------------------------------
-. ${TRUS_DIRE}/config/${TRUS_USER}.cfg
-export TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC
-export TRUS_WORK TRUS_BRAN TRUS_BHMK TRUS_TEST
-export TRUS_REFE TRUS_CONF TRUS_TARF TRUS_KEYA TRUS_KEYD
+. ./config/${TRUS_USER}.cfg
+export TRUS_WORK TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC
+export TRUS_BRAN TRUS_REFE
+export TRUS_CONF TRUS_TARF TRUS_KEYA TRUS_KEYD
 export TRUS_MAIL
-
-export TRUS_NGCM=${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
 
 
 ## Source (super)computer configuration
 ##---------------------------------------------------
-. ${TRUS_DIRE}/config/${TRUS_HPCC}.cfg
-export TRUS_ENVI
-export TRUS_CDOD
-export TRUS_JSUB TRUS_JSTA TRUS_JKIL TRUS_JPME TRUS_JTIM TRUS_JVME TRUS_JINF
-export TRUS_CMPF TRUS_CDOR TRUS_MPIR TRUS_CDFR
-export TRUS_NPRO TRUS_TOUT
+. ./config/${TRUS_HPCC}.cfg
+export TRUS_ENVI TRUS_CDOD TRUS_NPRO TRUS_TOUT
+export TRUS_JSPT TRUS_JSUB TRUS_JSTA TRUS_JKIL
+export TRUS_JPME TRUS_JTIM TRUS_JVME TRUS_JINF
+export TRUS_CMPV TRUS_CDOR TRUS_MPIR TRUS_CDFR
 
+
+export TRUS_NGCM=${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM

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

@@ -90 +90 @@
     [ $TRUS_HPCC == 'X64_ADA' ] && WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS}
 
-    for str in ${TRUS_CMPF} ${TRUS_MPIR} ${TRUS_CDFR} ${TRUS_CDOR}; do
+    for str in ${TRUS_CMPV} ${TRUS_MPIR} ${TRUS_CDFR} ${TRUS_CDOR}; do
    [ -z "$str" ] && continue
    soft_rel=''
@@ -98 +98 @@
 
    ## option --version would work for main compilers (gfortran, intel, pgfortran, ...)
-   [ $str == ${TRUS_CMPF} ] && soft_rel=$( $str --version | grep -m1 -oe '\<[0-9. ]*\>' )
+   [ $str == ${TRUS_CMPV} ] && soft_rel=$( $str --version | grep -m1 -oe '\<[0-9. ]*\>' )
 
    ## Cleaning characters string to display proper soft name
@@ -116 +116 @@
 
 get_inputs() {
-    # List archive content & extract it by default
-    local cmd_iol="tar -tvf ${TRUS_FORC}/${TRUS_TARF}" cmd_iof="tar -vxf ${TRUS_FORC}/${TRUS_TARF}"
-
-    ## List & copy files in case of personal inputs
-    if [ -z "${TRUS_TARF}" ]; then
-     cmd_iol="ls ${TRUS_FORC}/*"                ; cmd_iof="\cp ${TRUS_FORC}/* ."
-    fi
-
-    ${cmd_iol} > inputs_list.txt
-    ${cmd_iof} > /dev/null
+    ## Extract archive or copy files in case of personal inputs
+    [ -z "${TRUS_TARF}" ] && get_io="cp ${TRUS_FORC}/* ." || get_io="tar -vxf ${TRUS_FORC}/${TRUS_TARF}"
+
+    ${get_io} > /dev/null
+    [ $? -ne 0 ] && get_out 3 || echo 'Success'
+    [ $( find -name '*.gz' -print -quit ) ] && gunzip *.gz
+
+    ls -lh > inputs_list.txt
 }
 
@@ -137 +135 @@
 
    ## Continue even if input file is not in here (see after)
-   if [ -e ${TRUS_BHMK}/$file ]; then dif=$( diff -q $file ${TRUS_BHMK}/$file ); else dif=0; fi
+   if [ -e ${TRUS_STOR}/$file ]; then dif=$( diff -q $file ${TRUS_STOR}/$file ); else dif=0; fi
 
    ## Pass over useless file omission in benckmark directory
@@ -180 +178 @@
     for file in 'ocean.output' *.stat; do
    ## Stop if no benchmark files (ocean.output, eventual stat files)
-   [ ! -e ${TRUS_BHMK}/$file ] && { TRUS_RSLT='FAILED'; get_out 7; }
-
-   diff -q $file ${TRUS_BHMK}/$file
+   [ ! -e ${TRUS_STOR}/$file ] && { TRUS_RSLT='FAILED'; get_out 7; }
+
+   diff -q $file ${TRUS_STOR}/$file
 
    ## Continue even if it differs
@@ -200 +198 @@
 
     ## Stop if no benchmark files (ie time.step)
-    [ ! -e ${TRUS_BHMK}/time.step ] && { TRUS_RSLT='FAILED'; get_out 7; }
-    time_step=$( cat ${TRUS_BHMK}/time.step | tr -d [:space:] )
+    [ ! -e ${TRUS_STOR}/time.step ] && { TRUS_RSLT='FAILED'; get_out 7; }
+    time_step=$( cat ${TRUS_STOR}/time.step | tr -d [:space:] )
 
     ## Find all restart files to rebuild
@@ -222 +220 @@
           ${TRUS_NGCM}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} \
          > /dev/null
-          [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc \
-                        > /dev/null
       elif [ ${nb_dom} -eq 0 ]; then
           TRUS_RSLT='FAILED' && get_out 8
@@ -232 +228 @@
 
                     ## Stop if no benchmark files (restart file)
-          if [ -e ${TRUS_BHMK}/$file.nc ]; then
+          if [ -e ${TRUS_STOR}/$file.nc ]; then
 
                    ## UNIX `cmp` not suitable (timestamp in .nc file)
-         dif=$( $TRUS_CDOD $file.nc ${TRUS_BHMK}/$file.nc 2> /dev/null          \
+         dif=$( $TRUS_CDOD $file.nc ${TRUS_STOR}/$file.nc 2> /dev/null          \
                 | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n' )
 
@@ -325 +321 @@
 
    ## Create or append trusting logfile
-   if [ -f ${TRUS_BHMK}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
-
-   $cmd ${TRUS_FILE}                           \
-       >> ${TRUS_BHMK}/trusting_$PATTERNAME.txt
+   if [ -f ${TRUS_STOR}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
+
+   $cmd ${TRUS_FILE}                            \
+       >> ${TRUS_STOR}/trusting_$PATTERNAME.txt
 
         ## Send mail only when FAILED
@@ -347 +343 @@
 ${TRUS_USER}.cfg & ${TRUS_HPCC}.cfg
 
-For more details, look into the testing directory at:
-${TRUS_TEST}
+For more details, look into the testing folder at:
+${TRUS_SCRA}
 
 An archive has been created to share the questionable configuration for further studies:
-${TRUS_BHMK}/${TRUS_ARCH}
+${TRUS_STOR}/${TRUS_ARCH}
 
 END_MAIL
@@ -371 +367 @@
 
     ## In case of compilation error
-    cd ${TRUS_TEST}
+    cd ${TRUS_SCRA}
 
     if [ ${TRUS_RSLT} == 'FAILED' ]; then
@@ -410 +406 @@
     ## Save tested configuration if trusting failed in production mode (-p|--prod)
     if [[ ${TRUS_RSLT} == 'FAILED' && ${TRUS_PROD} -eq 1 ]]; then
-   echo 'Creating archive '${TRUS_ARCH}' under '${TRUS_BHMK}
-   tar -czf ${TRUS_BHMK}/${TRUS_ARCH}               *                    \
+   echo 'Creating archive '${TRUS_ARCH}' under '${TRUS_STOR}
+   tar -czf ${TRUS_STOR}/${TRUS_ARCH}               *                    \
        -C   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/MY_SRC .                    \
        -C   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}        cpp_${TRUS_CONF}.fcm