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

Timestamp:

2015-07-23T16:47:33+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Adjustements for running under CURIE cron

File:

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

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

@@ -61 +61 @@
 
        if [ -e ${REFE_DIR}/$file.nc ]; then
-       # UNIX `cmp` not suitable (filename & timestamp in .nc file)
+       ## UNIX `cmp` not suitable (filename & timestamp in .nc file)
       nc_diff=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null \
                  | awk '/records/ {print $1}'                           )
@@ -100 +100 @@
 
 get_soft_rel() {
-    for rel in $CDO $COMPILER $MPI $NETCDF; do
-                                     arch_rel=$( echo $LOADEDMODULES | sed  "s#.*$rel/\([^:]*\).*#\1#" )
-   [ -z "${arch_rel}"  ]     && arch_rel=$( echo $PATH          | sed  "s#.*$rel/\([^/]*\).*#\1#" )
-   [ "$rel" == "$COMPILER" ] && arch_rel=$( $rel --version      | grep -m1 -o ' [0-9.]* '         )
-   echo $rel ${arch_rel} >> model.log
+    for soft in $CDO $COMPILER $MPI $NETCDF; do
+                                     soft_rel=$( echo $LOADEDMODULES | grep -o "$soft[^:]*"  )
+   [ -z "${soft_rel}"  ]     && soft_rel=$( echo $PATH          | grep -o "$soft/[^/]*" )
+   ## Not working inside CURIE cron (no modules command && cdo embedded in netcdf-*)
+   #[ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version      | grep -m1 -o ' [0-9.]* '         )
+   [[ "$soft" == "$CDO"    && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf-utils[^/]*" )
+   [[ "$soft" == "$NETCDF" && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf[^/]*"  | sort | head -1 )
+   echo $soft ${soft_rel} >> model.log
     done
 
@@ -115 +118 @@
     svn_opt='status'
 
-    # If -v|--version option has been set, modify svn command
+    ## If -v|--version option has been set, modify svn command
     if   [ $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"                     ) ]; then
    svn_cmd='svn update -r HEAD'
@@ -132 +135 @@
           ${DIR_XIOS}                             ; do
 
-   # For time being, just get revision number from XIOS
+   ## For time being, just get revision number from XIOS
    if [ "$dir" == "${DIR_XIOS}" ]; then
        rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' )
@@ -166 +169 @@
   $cmd trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.txt >> ${REFE_DIR}/trusting_${CFG_USER}_${CFG_ARCH}.txt
 
-  # Send mail only when FAILED
+  ## Send mail only when FAILED
   if [[ ! -z $EMAIL && "$ST" == 'FAILED' ]]; then
       cat << END_MAIL > trusting.mail
@@ -206 +209 @@
    [ ! -e $file ] && printf "Comments\n\n"      > $file
 
-        # Error identification
+        ## Error identification
    case $ERR in
-       # Compilation
+       ## Compilation
        1) ERR='XIOS compilation failed'             ;;  2) ERR='NEMO compilation failed'            ;;
-       # Submission
+       ## Submission
        3) ERR='Missing input files'                  ;;  4) ERR='Job submission error'               ;;
-       # Running
+       ## Running
        5) ERR='nemo.exe crashed at '${LAST_TIME_STEP};;  6) ERR='Exceeded time limit '${TIME_LIMI}'h';;
-       # Results
+       ## Results
        7) ERR='Missing previous outputs '            ;;  8) ERR='New outputs  differ/missing'        ;;
        9) ERR='Missing previous restarts'            ;; 10) ERR='New restarts differ/missing'        ;;
-       # Undefined
+       ## Undefined
        *) ERR='Unknown error'                        ;;
    esac
@@ -226 +229 @@
     printf "Result\n$ERR\n" > mesg_03_result_${CFG_USER}_${CFG_ARCH}.txt
 
-    # Save tested configuration if trusting failed
+    ## Save tested configuration if trusting failed
     [[ "$ST" == 'FAILED' && $DEBUG -eq 0 ]] && tar -czf ${REFE_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.tar.gz *