Attachment #188311 for bug #249493

View | Details | Raw Unified | Return to bug 249493 | Differences between

and this patch




 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)

!Local variables ------------------------------
!scalars

!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

!Machine-dependent declarations---------------------------


Lines 514-520 Link Here

(-)src/main/Makefile.am (-1 / +3 lines)
514	@src_defs_includes@ \	514	@src_defs_includes@ \
515	@lib_bigdft_includes@ \	515	@lib_bigdft_includes@ \
516	@lib_etsf_io_includes@ \	516	@lib_etsf_io_includes@ \
517	@lib_netcdf_includes@	517	@lib_netcdf_includes@ \
		518	@lib_fft_includes@
518	mrgscr_LDADD = \	519	mrgscr_LDADD = \
519	$(FC_LDFLAGS) \	520	$(FC_LDFLAGS) \
520	$(LIB_15GW) \	521	$(LIB_15GW) \
Lines 551-556 Link Here
551	$(LIB_LINALG) \	552	$(LIB_LINALG) \
552	$(LIB_ETSF_IO) \	553	$(LIB_ETSF_IO) \
553	$(LIB_NETCDF) \	554	$(LIB_NETCDF) \
		555	$(LIB_FFT_EXT) \
554	$(FC_LIBS)	556	$(FC_LIBS)
555		557
556	# anaddb.F90 ---> anaddb	558	# anaddb.F90 ---> anaddb

Lines 1332-1338 Link Here

(-)src/main/Makefile.in (-1 / +3 lines)
1332	@src_defs_includes@ \	1332	@src_defs_includes@ \
1333	@lib_bigdft_includes@ \	1333	@lib_bigdft_includes@ \
1334	@lib_etsf_io_includes@ \	1334	@lib_etsf_io_includes@ \
1335	@lib_netcdf_includes@	1335	@lib_netcdf_includes@ \
		1336	@lib_fft_includes@
1336		1337
1337	mrgscr_LDADD = \	1338	mrgscr_LDADD = \
1338	$(FC_LDFLAGS) \	1339	$(FC_LDFLAGS) \
Lines 1370-1375 Link Here
1370	$(LIB_LINALG) \	1371	$(LIB_LINALG) \
1371	$(LIB_ETSF_IO) \	1372	$(LIB_ETSF_IO) \
1372	$(LIB_NETCDF) \	1373	$(LIB_NETCDF) \
		1374	$(LIB_FFT_EXT) \
1373	$(FC_LIBS)	1375	$(FC_LIBS)
1374		1376
1375		1377

Return to bug 249493

Lines 97-104 Link Here

(-)src/12ffts/ccfft.F90 (-12 / +12 lines)
97	type(MPI_type),intent(inout) :: mpi_enreg	97	type(MPI_type),intent(inout) :: mpi_enreg
98	!arrays	98	!arrays
99	integer,intent(in) :: ngfft(18)	99	integer,intent(in) :: ngfft(18)
100	real(dp),intent(inout) :: work1(2,n4n5n6*ndat)	100	real(dp),intent(inout) :: work1(2*n4,n5,n6,ndat)
101	real(dp),intent(out) :: work2(2,n4n5n6*ndat)	101	real(dp),intent(out) :: work2(2*n4,n5,n6,ndat)
102		102
103	!Local variables ------------------------------	103	!Local variables ------------------------------
104	!scalars	104	!scalars
Lines 112-127 Link Here
112	!ENDDEBUG	112	!ENDDEBUG
113		113
114	!Interfaces -----------------------------------	114	!Interfaces -----------------------------------
115	#if defined HAVE_FFTW	115	!#if defined HAVE_FFTW
116	interface	116	! interface
117	subroutine fftw(n1,n2,n3,isign,work1,work2)	117	!subroutine fftw(n1,n2,n3,isign,work1,work2)
118	integer(i4b), intent(in) :: n1,n2,n3	118	! integer(i4b), intent(in) :: n1,n2,n3
119	integer(i4b), intent(in) :: isign	119	! integer(i4b), intent(in) :: isign
120	real(dp), intent(in) :: work1(:,:,:,:)	120	! real(dp), intent(in) :: work1(:,:,:,:)
121	real(dp), intent(out) :: work2(:,:,:,:)	121	! real(dp), intent(out) :: work2(:,:,:,:)
122	end subroutine fftw	122	!end subroutine fftw
123	end interface	123	! end interface
124	#endif	124	!#endif
125		125
126	!Machine-dependent declarations---------------------------	126	!Machine-dependent declarations---------------------------
127		127