[patch] 5.7.3-fftw.patch

5.7.3-fftw.patch (text/plain), 2.30 KB, created by Honza Macháček on 2009-04-14 13:59:36 UTC

diff -Naur tmp-old/src/12ffts/ccfft.F90 tmp-new/src/12ffts/ccfft.F90
--- src/12ffts/ccfft.F90	2009-03-11 05:12:18.000000000 +0000
+++ src/12ffts/ccfft.F90	2009-04-14 12:13:31.000000000 +0000
@@ -97,8 +97,8 @@
  type(MPI_type),intent(inout) :: mpi_enreg
 !arrays
  integer,intent(in) :: ngfft(18)
- real(dp),intent(inout) :: work1(2,n4*n5*n6*ndat)
- real(dp),intent(out) :: work2(2,n4*n5*n6*ndat)
+ real(dp),intent(inout) :: work1(2*n4,n5,n6,ndat)
+ real(dp),intent(out) :: work2(2*n4,n5,n6,ndat)
 
 !Local variables ------------------------------
 !scalars
@@ -112,16 +112,16 @@
 !ENDDEBUG
 
 !Interfaces -----------------------------------
-#if defined HAVE_FFTW
- interface
-subroutine fftw(n1,n2,n3,isign,work1,work2)
-   integer(i4b), intent(in) :: n1,n2,n3
-   integer(i4b), intent(in) :: isign
-   real(dp), intent(in) :: work1(:,:,:,:)
-   real(dp), intent(out) :: work2(:,:,:,:)
-end subroutine fftw
- end interface
-#endif
+!#if defined HAVE_FFTW
+! interface
+!subroutine fftw(n1,n2,n3,isign,work1,work2)
+!   integer(i4b), intent(in) :: n1,n2,n3
+!   integer(i4b), intent(in) :: isign
+!   real(dp), intent(in) :: work1(:,:,:,:)
+!   real(dp), intent(out) :: work2(:,:,:,:)
+!end subroutine fftw
+! end interface
+!#endif
 
 !Machine-dependent declarations---------------------------
 
diff -Naur tmp-old/src/main/Makefile.am tmp-new/src/main/Makefile.am
--- src/main/Makefile.am	2009-03-11 05:15:07.000000000 +0000
+++ src/main/Makefile.am	2009-04-14 12:12:32.000000000 +0000
@@ -514,7 +514,8 @@
 	@src_defs_includes@ \
 	@lib_bigdft_includes@ \
 	@lib_etsf_io_includes@ \
-	@lib_netcdf_includes@
+	@lib_netcdf_includes@ \
+	@lib_fft_includes@
 mrgscr_LDADD = \
 	$(FC_LDFLAGS) \
 	$(LIB_15GW) \
@@ -551,6 +552,7 @@
 	$(LIB_LINALG) \
 	$(LIB_ETSF_IO) \
 	$(LIB_NETCDF) \
+	$(LIB_FFT_EXT) \
 	$(FC_LIBS)
 
 # anaddb.F90 ---> anaddb
diff -Naur tmp-old/src/main/Makefile.in tmp-new/src/main/Makefile.in
--- src/main/Makefile.in	2009-03-11 05:15:23.000000000 +0000
+++ src/main/Makefile.in	2009-04-14 12:11:04.000000000 +0000
@@ -1332,7 +1332,8 @@
 	@src_defs_includes@ \
 	@lib_bigdft_includes@ \
 	@lib_etsf_io_includes@ \
-	@lib_netcdf_includes@
+	@lib_netcdf_includes@ \
+	@lib_fft_includes@
 
 mrgscr_LDADD = \
 	$(FC_LDFLAGS) \
@@ -1370,6 +1371,7 @@
 	$(LIB_LINALG) \
 	$(LIB_ETSF_IO) \
 	$(LIB_NETCDF) \
+	$(LIB_FFT_EXT) \
 	$(FC_LIBS)