Added ifft plan

Author: Atomtomate

Project.toml

@@ -1,7 +1,7 @@
 name = "Dispersions"
 uuid = "9451dd48-6b2a-4bde-a443-9ec270a37806"
 authors = ["Julian Stobbe <Atomtomate@gmx.de>", "Jan Frederik Weissler <f.weissler@outlook.de>", "<Marvin Leusch <marvin.leusch@studium.uni-hamburg.de>"]
-version = "1.1.1"
+version = "1.2.0"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

TODO

@@ -1,6 +0,0 @@
-- missing tests:
-    - fft
-    - ifft
-    - conv
-    - conv_fft1
-    - conv_fft

src/KGrid.jl

@@ -40,7 +40,8 @@ struct KGrid{T <: KGridType, D}
     cache1::Array{ComplexF64,D}
     cache2::Array{ComplexF64,D}
     fftw_plan::FFTW.cFFTWPlan
-    function KGrid(GT::Type{T}, D::Int, Ns::Int, t::Float64, tp::Float64, tpp::Float64; full::Bool=false, fftw_plan=nothing) where T<:KGridType
+    ifftw_plan::AbstractFFTs.ScaledPlan
+    function KGrid(GT::Type{T}, D::Int, Ns::Int, t::Float64, tp::Float64, tpp::Float64; full::Bool=false, fftw_plan=nothing, ifftw_plan=nothing) where T<:KGridType
         sampling = gen_sampling(GT, D, Ns)
         kGrid_f = map(v -> basis_transform(GT, v), sampling)
         kInd, kInd_conv, kInd_crossc, kMult, expand_perms, kGrid = full ? reduce_KGrid_ident(GT, D, Ns, kGrid_f) : reduce_KGrid(GT, D, Ns, kGrid_f)
@@ -51,9 +52,13 @@ struct KGrid{T <: KGridType, D}
             #println("WARNING!!! k-grid sampling must contain zero-vector in order for convolutions to work!")
             k0 = first(CartesianIndices([1 2; 3 4]))
         end
-        fftw_plan = fftw_plan === nothing ? plan_fft!(FFTW.FakeArray{ComplexF64}(gs...), flags=FFTW.ESTIMATE, timelimit=Inf) : fftw_plan
+        cache1 = Array{ComplexF64,D}(undef, gs...)
+        cache2 = Array{ComplexF64,D}(undef, gs...)
+        FFTW.set_num_threads(1);
+        fftw_plan = fftw_plan === nothing ? plan_fft!(cache1, flags=FFTW.PATIENT, timelimit=Inf, num_threads=1)  : fftw_plan
+        ifftw_plan = ifftw_plan === nothing ? plan_ifft!(cache1, flags=FFTW.PATIENT, timelimit=Inf, num_threads=1)  : ifftw_plan
         new{GT,D}(Ns^D, Ns, t, tp, tpp, k0, kGrid, ϵkGrid, kInd, kInd_conv, kInd_crossc, kMult, expand_perms,
-                  Array{ComplexF64,D}(undef, gs...), Array{ComplexF64,D}(undef, gs...), fftw_plan)
+            cache1, cache2, fftw_plan, ifftw_plan)
     end
 end
 

src/common.jl

@@ -113,12 +113,13 @@ function expandKArr!(
     kG::KGrid{gT,D},
     res::AbstractArray{T,D},
     arr::Array{T,1},
-) where {gT <: KGridType,T,D}
+)::Nothing where {gT <: KGridType,T,D}
     for (ri, perms) in enumerate(kG.expand_perms)
         @simd for p in perms
             @inbounds res[p] = arr[ri]
         end
     end
+    return nothing
 end
 
 """
@@ -355,7 +356,7 @@ function conv_fft_noPlan!(
     for i in eachindex(cache)
         @inbounds cache[i] = arr1[i] * arr2[i]
     end
-    ifft!(cache)
+    kG.ifftw_plan * cache
     conv_post!(kG, res, cache, crosscorrelation=crosscorrelation)
 end