Skip to content

Save only final times when evaluating matter power spectrum #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Save only final times when evaluating matter power spectrum #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/observables/fourier.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,14 @@ end
Solve the problem `prob` with exact wavenumber(s) `k`, and then compute the power spectrum with the solution `sol`.
"""
function spectrum_matter(prob::CosmologyProblem, k, τ = nothing; species = [:c, :b, :h], kwargs...)
sol = solve(prob, k; kwargs...) # TODO: just save endpoints
τ = isnothing(τ) ? sol[prob.M.τ][end] : τ
# save only the necessary time(s)
if isnothing(τ)
ptextraopts = (save_everystep = false, save_start = false, save_end = true)
else
ptextraopts = (saveat = [τ],)
end
sol = solve(prob, k; ptextraopts, kwargs...)
τ = isnothing(τ) ? sol.bg.t[end] : τ
return spectrum_matter(sol, k, τ; species)
end

Expand Down
14 changes: 7 additions & 7 deletions src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ end
"""
function solve(
prob::CosmologyProblem, ks::Union{Nothing, AbstractArray} = nothing;
bgopts = (alg = DEFAULT_BGALG, reltol = 1e-9, abstol = 1e-9),
ptopts = (alg = DEFAULT_PTALG, reltol = 1e-8, abstol = 1e-8),
bgopts = (alg = DEFAULT_BGALG, reltol = 1e-9, abstol = 1e-9), bgextraopts = (),
ptopts = (alg = DEFAULT_PTALG, reltol = 1e-8, abstol = 1e-8), ptextraopts = (),
shootopts = (alg = DEFAULT_SHOOTALG, abstol = 1e-5),
thread = true, verbose = false, kwargs...
)
Expand All @@ -280,23 +280,23 @@ If `threads`, integration over independent perturbation modes are parallellized.
"""
function solve(
prob::CosmologyProblem, ks::Union{Nothing, AbstractArray} = nothing;
bgopts = (alg = DEFAULT_BGALG, reltol = 1e-9, abstol = 1e-9),
ptopts = (alg = DEFAULT_PTALG, reltol = 1e-8, abstol = 1e-8),
bgopts = (alg = DEFAULT_BGALG, reltol = 1e-9, abstol = 1e-9), bgextraopts = (),
ptopts = (alg = DEFAULT_PTALG, reltol = 1e-8, abstol = 1e-8), ptextraopts = (),
shootopts = (alg = DEFAULT_SHOOTALG, abstol = 1e-5),
thread = true, verbose = false, kwargs...
)
if !isempty(prob.shoot)
bgsol = solvebg(prob.bg, collect(prob.shoot), prob.conditions; shootopts, verbose, bgopts..., kwargs...)
bgsol = solvebg(prob.bg, collect(prob.shoot), prob.conditions; shootopts, verbose, bgopts..., bgextraopts..., kwargs...)
else
bgsol = solvebg(prob.bg; verbose, bgopts..., kwargs...)
bgsol = solvebg(prob.bg; verbose, bgopts..., bgextraopts..., kwargs...)
end

if isnothing(ks) || isempty(ks)
ks = nothing
ptsol = nothing
else
ks = k_dimensionless.(ks, Ref(bgsol))
ptsol = solvept(prob.pt, bgsol, ks, prob.bgspline; thread, verbose, ptopts..., kwargs...)
ptsol = solvept(prob.pt, bgsol, ks, prob.bgspline; thread, verbose, ptopts..., ptextraopts..., kwargs...)
end

return CosmologySolution(prob, bgsol, ks, ptsol)
Expand Down