Changeset 5637 for branches

Timestamp:

2015-07-27T20:10:53+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Deal with use or not of environment modules system

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST

Files:

• trusting.sh (modified) (2 diffs)
• trusting_func.sh (modified) (1 diff)

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

@@ -6 +6 @@
 NEMO_TRUS=$( pwd $( dirname $0 ) )
 DEBUG=0; PUBLISH=0
-ST='FAILED' ## 'FAILED' by default
+I_MODULE=0      ## No 'module' command by default
+ST='FAILED'     ## 'FAILED'            ""   " "  
 
 ## Get options for replacing some initials settings
@@ -56 +57 @@
 print_step 'Get softwares release'
 [ -e ${ARCH_ENV} ] && . ${ARCH_ENV} > /dev/null
+[ $? -eq 0 ] && I_MODULE=1
+export I_MODULE
 get_soft_rel
 cat model.log

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

@@ -101 +101 @@
 get_soft_rel() {
     for soft in $CDO $COMPILER $MPI $NETCDF; do
-                                 soft_rel=$( echo $LOADEDMODULES | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" )
-   [ -z "${soft_rel}"  ] && soft_rel=$( echo $PATH          | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" )
-   [ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version | grep -m1 -oe '\<[0-9. ]*\>' )
+        ((   ${I_MODULE} == 1   )) && soft_rel=$( echo $LOADEDMODULES | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" )
+   [    -z "${soft_rel}"    ] && soft_rel=$( echo $PATH          | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" )
+   [ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version     | grep -m1 -oe '\<[0-9. ]*\>'           )
    ## Not working inside CURIE cron (cdo embedded in netcdf-*)
 #  [[ "$soft" == "$CDO"    && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf-utils[^/]*" )