From 139c1184b00759132e5f0c707aef09f3be09ccad Mon Sep 17 00:00:00 2001
From: Jaron Krogel <krogeljt@ornl.gov>
Date: Fri, 6 Jan 2017 22:20:48 +0000
Subject: [PATCH] update EOS build scripts to load newer gcc

git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@7399 e5b18d87-469d-4833-9cc0-8cdfa06e9491
---
 config/build_olcf_eos.sh                        | 9 +++++++--
 tests/test_automation/nightly_ornl_olcf_eos.job | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/build_olcf_eos.sh b/config/build_olcf_eos.sh
index 28c806230..1df0b58b9 100755
--- a/config/build_olcf_eos.sh
+++ b/config/build_olcf_eos.sh
@@ -9,9 +9,9 @@
 ##   ./config/build_olcf_eos.sh                               ##
 ##                                                            ##
 ## Settings should be consistent with test scripts e.g.       ##
-##  ./tests/test_automation/night_ornl_olcf_eos.job           ##
+##  ./tests/test_automation/nightly_ornl_olcf_eos.job         ##
 ##                                                            ##
-## Last modified: Aug 3, 2016                                 ##
+## Last modified: Jan 6, 2017                                 ##
 ################################################################
 
 
@@ -21,7 +21,12 @@ if (echo $LOADEDMODULES | grep -q pgi)
 then
 module unload PrgEnv-pgi
 fi
+if (echo $LOADEDMODULES | grep -q gnu)
+then
+module unload PrgEnv-gnu
+fi
 module load PrgEnv-intel
+module load gcc
 module load cray-hdf5
 module load fftw
 module load boost
diff --git a/tests/test_automation/nightly_ornl_olcf_eos.job b/tests/test_automation/nightly_ornl_olcf_eos.job
index b09f4458b..e1dc00bb7 100644
--- a/tests/test_automation/nightly_ornl_olcf_eos.job
+++ b/tests/test_automation/nightly_ornl_olcf_eos.job
@@ -57,6 +57,7 @@ echo --- Building for $sys `date`
 case $sys in
 "build_intel")
 # Build with default Intel PrgEnv on eos. This is not checked!
+    module load gcc
     module load cray-hdf5
     module load cmake
     module load fftw
@@ -68,6 +69,7 @@ case $sys in
     ;;
 "build_intel_complex")
 # Build with default Intel PrgEnv on eos. This is not checked!
+    module load gcc
     module load cray-hdf5
     module load cmake
     module load fftw