Merge branch 'master' of https://github.com/swift-lang/xsede-tutorial

Conflicts:
	setup.sh

Author: Blue Waters Trainee 578

part07/Makefile

@@ -1,4 +1,4 @@
-CC=mpicc
+CC?=mpicc
 
 CFLAGS = -Wall -g
 

part08/bin/Makefile

@@ -1,4 +1,4 @@
-CC=mpicc
+CC?=mpicc
 
 CFLAGS = -Wall -g
 

part08/bin/driver.o

@@ -40,6 +40,13 @@ if hostname | grep bridges; then
     SWIFT=/home/wilde/swift/rev/swift-0.96.2
     PATH=$SWIFT/bin:$JAVA:$PATH
 
+    module unload mpi/intel_mpi
+    module   load mpi/gcc_mvapich
+
+    echo "modules adjusted: unloaded mpi/intel_mpi; loaded mpi/gcc_mvapich"
+    echo "This list should should show mpi/gcc_mvapich as only MPI:"
+    module list
+
 elif hostname -f | grep "ncsa.illinois.edu" ; then
     # BW does not have a clearly identifiable hostname on the login nodes
 
@@ -50,7 +57,6 @@ elif hostname -f | grep "ncsa.illinois.edu" ; then
     PATH=$SWIFT/bin:$PATH
     export CC="cc"
 
-
 elif hostname | grep comet; then
 
     JAVA=/oasis/scratch/comet/xdtr1/temp_project/jdk1.8.0_91/bin

part08/bin/mandelbrot

@@ -32,7 +32,7 @@ do
     popd
 done
 
-SITES=('stampede' 'gordon' 'blacklight')
+SITES=('bluewaters')
 for i in $(seq 4 1 6)
 do
     pushd .