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

Timestamp:

2015-07-24T18:32:54+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Trusting release for scheduling tests ('crontab'/'at')

File:

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

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

@@ -8 +8 @@
    [ -e time.step ] && LAST_TIME_STEP=$( cat time.step | tr -d ' ' )
    export LAST_TIME_STEP
-   [ -e ocean.output ] && line=$( grep -m1 -A4 "$state" ocean.output | tr -d '\n' )
+   [ -e ocean.output ] && line=$( grep -m1 -A4 "$state"   ocean.output | tr -d '\n' )
     else
    [ -e ocean.output ] && line=$( grep -m1 -A3 "^ $state" ocean.output | tr -d '\n' )
@@ -101 +101 @@
 get_soft_rel() {
     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/[^/]*" )
+                                     soft_rel=$( echo $LOADEDMODULES | grep -o "$soft[^:]*"            )
+   [ -z "${soft_rel}"  ]     && soft_rel=$( echo $PATH          | grep -o "$soft/[^/]*" | sort -u )
    ## Not working inside CURIE cron (no modules command && cdo embedded in netcdf-*)
    #[ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version      | grep -m1 -o ' [0-9.]* '         )