From 382d506b082f42be2ede9e5afd4764c4e8d67efa Mon Sep 17 00:00:00 2001 From: Orjan Ameye Date: Sat, 26 Oct 2024 18:43:23 +0200 Subject: [PATCH] Fix: wromg auto-merge --- ext/TimeEvolution/ODEProblem.jl | 4 ++-- test/time_evolution.jl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/TimeEvolution/ODEProblem.jl b/ext/TimeEvolution/ODEProblem.jl index ec07993a..ab2364ef 100644 --- a/ext/TimeEvolution/ODEProblem.jl +++ b/ext/TimeEvolution/ODEProblem.jl @@ -5,7 +5,7 @@ using OrdinaryDiffEqTsit5: ODEProblem, solve, ODESolution eom::HarmonicEquation; fixed_parameters, u0::Vector, - sweep::ParameterSweep, + sweep::AdiabaticSweep, timespan::Tuple ) @@ -16,7 +16,7 @@ If `u0` is specified, it is used as an initial condition; otherwise the values f function OrdinaryDiffEqTsit5.ODEProblem( eom::HarmonicEquation, fixed_parameters; - sweep::ParameterSweep=ParameterSweep(), + sweep::AdiabaticSweep=AdiabaticSweep(), u0::Vector=[], timespan::Tuple, perturb_initial=0.0, diff --git a/test/time_evolution.jl b/test/time_evolution.jl index e076bf95..1369e3bd 100644 --- a/test/time_evolution.jl +++ b/test/time_evolution.jl @@ -22,7 +22,7 @@ varied = ω => range(0.9, 1.1, 10) res = get_steady_states(p, varied, fixed; show_progress=false, seed=SEED) tspan = (0.0, 10) -sweep = ParameterSweep(ω => (0.9, 1.1), tspan) # linearly interpolate between two values at two times +sweep = AdiabaticSweep(ω => (0.9, 1.1), tspan) # linearly interpolate between two values at two times ode_problem = ODEProblem(harmonic_eq, fixed; sweep=sweep, u0=[0.01; 0.0], timespan=tspan) time_soln = solve(ode_problem, Tsit5(); saveat=1);