fixing transfer by adding t to interp and restrict

drummerdoc · Oct 23, 2013 · 052800b · 052800b
1 parent 6bb63a6
commit 052800b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/examples/fake-advection/src/transfer.f90 b/examples/fake-advection/src/transfer.f90
@@ -10,9 +10,10 @@ module transfer
   implicit none
 contains
 
-  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     type(ad_work_t), pointer :: workF, workG
     real(pfdp),      pointer :: qF(:), qG(:)
@@ -51,9 +52,10 @@ subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
     qF = real(wkF)
   end subroutine interpolate
 
-  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     real(pfdp), pointer :: qF(:), qG(:)
 

diff --git a/examples/mpi-advection/src/transfer.f90 b/examples/mpi-advection/src/transfer.f90
@@ -9,9 +9,10 @@ module transfer
   implicit none
 contains
 
-  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     type(ad_work_t), pointer :: workF, workG
     real(pfdp),      pointer :: qF(:), qG(:)
@@ -50,9 +51,10 @@ subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
     qF = real(wkF)
   end subroutine interpolate
 
-  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     real(pfdp), pointer :: qF(:), qG(:)
 

diff --git a/examples/mpi-ndarray/src/transfer.f90 b/examples/mpi-ndarray/src/transfer.f90
@@ -46,9 +46,10 @@ subroutine interp1(qF, qG, levelctxF, levelctxG)
     qF = real(wkF)
   end subroutine interp1
 
-  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     real(pfdp),      pointer :: qF(:), qG(:), qF2(:,:), qG2(:,:)
 
@@ -73,9 +74,10 @@ subroutine interpolate(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
     end if
   end subroutine interpolate
 
-  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG)
+  subroutine restrict(qFp, qGp, levelF, levelctxF, levelG, levelctxG,t)
     type(c_ptr), intent(in), value :: qFp, qGp, levelctxF, levelctxG
     integer,     intent(in)        :: levelF, levelG
+    real(pfdp),  intent(in) :: t
 
     real(pfdp), pointer :: qF(:), qG(:), qF2(:,:), qG2(:,:)
 

diff --git a/mk/makefile.gcc47.defs b/mk/makefile.gcc47.defs
@@ -9,5 +9,5 @@ FC = mpif90
 CC = $(LIBPFASST)/gcc-4.7/bin/gcc
 AR = ar rcs
 
-FFLAGS  = -Ibuild -Jbuild -Wall -g -Wno-unused-dummy-argument
+FFLAGS  = -Ibuild -Jbuild -Wall -cpp -g -Wno-unused-dummy-argument
 LDFLAGS = -g -static