JUQUEEN build settings, tweak NS encap.

drummerdoc · Oct 25, 2013 · d96e124 · d96e124
1 parent 28803a7
commit d96e124
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git 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
diff --git 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
@@ -0,0 +1,9 @@
+#
+# JUQUEEN build settings for libpfasst.
+#
+
+# need: module load gcc
+
+FC = mpigfortran
+CC = mpigcc
+