From d96e1244413ee8de009609c64a7467408b2a0548 Mon Sep 17 00:00:00 2001
From: Matthew Emmett <memmett@gmail.com>
Date: Fri, 25 Oct 2013 07:13:13 +0200
Subject: [PATCH] JUQUEEN build settings, tweak NS encap.

---
 examples/mpi-navier-stokes/Makefile         | 6 ++++--
 examples/mpi-navier-stokes/makefile.include | 6 ------
 examples/mpi-navier-stokes/src/encap.f90    | 2 +-
 mk/makefile.juqueen.defs                    | 9 +++++++++
 4 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 examples/mpi-navier-stokes/makefile.include
 create mode 100644 mk/makefile.juqueen.defs

diff --git a/examples/mpi-navier-stokes/Makefile b/examples/mpi-navier-stokes/Makefile
index 2772a17e..73496612 100644
--- a/examples/mpi-navier-stokes/Makefile
+++ b/examples/mpi-navier-stokes/Makefile
@@ -15,7 +15,10 @@ CSRC   += src/numpy.c
 CXXSRC += src/cfftw++.cpp src/fftw++.cpp src/convolution.cpp
 
 FFLAGS  += -I$(FFTW3)/include -fopenmp
-LDFLAGS += -L$(FFTW3)/lib -lfftw3 -fopenmp -lstdc++
+CFLAGS  += -I$(FFTW3)/include -fopenmp
+LDFLAGS += -L$(FFTW3)/lib -lfftw3 -fopenmp -lstdc++ -lfftw3_omp
+
+vpath %.cpp $(VPATHS)
 
 build/%.o: %.cpp
 	@mkdir -p build
@@ -24,7 +27,6 @@ build/%.o: %.cpp
 all: $(EXE)
 
 OBJ = $(subst src,build,$(FSRC:.f90=.o) $(CSRC:.c=.o) $(CXXSRC:.cpp=.o))
-vpath %.cpp   $(VPATHS)
 
 include $(LIBPFASST)/Makefile.rules
 
diff --git a/examples/mpi-navier-stokes/makefile.include b/examples/mpi-navier-stokes/makefile.include
deleted file mode 100644
index 83d3e83d..00000000
--- a/examples/mpi-navier-stokes/makefile.include
+++ /dev/null
@@ -1,6 +0,0 @@
-COMM = mpi
-SDC  = imex
-
-LDFLAGS += -fopenmp -L$(SYSLIBDIR) -lfftw3_omp -lstdc++
-FFLAGS += -fopenmp
-CFLAGS += -fopenmp
diff --git a/examples/mpi-navier-stokes/src/encap.f90 b/examples/mpi-navier-stokes/src/encap.f90
index c9d6908c..27015c7a 100644
--- a/examples/mpi-navier-stokes/src/encap.f90
+++ b/examples/mpi-navier-stokes/src/encap.f90
@@ -109,7 +109,7 @@ end subroutine encap_pack
   ! Unpack solution from a flat array.
   subroutine encap_unpack(solptr, q)
     type(c_ptr), intent(in   ), value :: solptr
-    real(pfdp),  intent(  out)        :: q(:)
+    real(pfdp),  intent(in   )        :: q(:)
 
     type(c_ptr)            :: qptr
     type(carray4), pointer :: sol
diff --git a/mk/makefile.juqueen.defs b/mk/makefile.juqueen.defs
new file mode 100644
index 00000000..fbad810c
--- /dev/null
+++ b/mk/makefile.juqueen.defs
@@ -0,0 +1,9 @@
+#
+# JUQUEEN build settings for libpfasst.
+#
+
+# need: module load gcc
+
+FC = mpigfortran
+CC = mpigcc
+