From df6facce8681addd3e86f68b722968b1d93cd43d Mon Sep 17 00:00:00 2001
From: Wirawan Purwanto <wpurwant@turing.hpc.odu.edu>
Date: Mon, 7 Nov 2016 11:57:34 -0500
Subject: [PATCH] * pwscf: Ad-hoc fix for Turing after 2016 upgrade.

  We force using the old (TCL) module system since the new module
  system (LMOD) always executes itself whenever a bash batch script
  is executed on Turing right now.
---
 turing/calculations/pwscf-5.3 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/turing/calculations/pwscf-5.3 b/turing/calculations/pwscf-5.3
index c7e93ca..39e7deb 100755
--- a/turing/calculations/pwscf-5.3
+++ b/turing/calculations/pwscf-5.3
@@ -33,14 +33,19 @@ MODULEPATH_DEFAULT=/cm/local/modulefiles:/cm/shared/modulefiles:/cm/shared/compi
 # It requires the following variables to be set:
 # - MODULESHOME (optional; default provided above)
 # - MODULEPATH
-# - LAODEDMODULES
+# - LOADEDMODULES
 
 RestoreModuleEnv () {
   local LOADEDMODULES_SAVE
-  : ${MODULESHOME:=$MODULESHOME_DEFAULT}
-  : ${MODULEPATH:=$MODULEPATH_DEFAULT}
+  # : ${MODULESHOME:=$MODULESHOME_DEFAULT}
+  # : ${MODULEPATH:=$MODULEPATH_DEFAULT}
+  MODULESHOME=$MODULESHOME_DEFAULT
+  MODULEPATH=$MODULEPATH_DEFAULT
   export MODULESHOME
   export MODULEPATH
+  if [[ ":${MODULEPATH}:" != *":${MODULEPATH_DEFAULT}:"* ]]; then
+    MODULEPATH=${MODULEPATH}:${MODULEPATH_DEFAULT}
+  fi
 
   LOADEDMODULES_SAVE=$LOADEDMODULES
   unset LOADEDMODULES