From 899a564c820bcecf08f2e01ea427dba2d3fffff1 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Tue, 16 Jul 2024 04:36:16 -0400 Subject: [PATCH 1/2] Fix some depwarns --- src/ensemble/ensemble_solutions.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ensemble/ensemble_solutions.jl b/src/ensemble/ensemble_solutions.jl index b2294ea25..e1ca76b8e 100644 --- a/src/ensemble/ensemble_solutions.jl +++ b/src/ensemble/ensemble_solutions.jl @@ -97,12 +97,12 @@ function calculate_ensemble_errors(u; elapsedTime = 0.0, converged = false, # Now Calculate Weak Errors weak_errors = Dict{Symbol, eltype(u[1].u[1])}() # Final - m_final = mean([s[end] for s in u]) + m_final = mean([s.u[end] for s in u]) m_final_analytic = mean([s.u_analytic[end] for s in u]) res = norm(m_final - m_final_analytic) weak_errors[:weak_final] = res if weak_timeseries_errors - ts_weak_errors = [mean([u[j][i] - u[j].u_analytic[i] for j in 1:length(u)]) + ts_weak_errors = [mean([u.u[j][i] - u[j].u_analytic[i] for j in 1:length(u)]) for i in 1:length(u[1])] ts_l2_errors = [sqrt.(sum(abs2, err) / length(err)) for err in ts_weak_errors] l2_tmp = sqrt(sum(abs2, ts_l2_errors) / length(ts_l2_errors)) @@ -111,11 +111,11 @@ function calculate_ensemble_errors(u; elapsedTime = 0.0, converged = false, weak_errors[:weak_l∞] = max_tmp end if weak_dense_errors - densetimes = collect(range(u[1].t[1], stop = u[1].t[end], length = 100)) + densetimes = collect(range(u.u[1].t[1], stop = u[1].t[end], length = 100)) u_analytic = [[sol.prob.f.analytic(sol.prob.u0, sol.prob.p, densetimes[i], sol.W(densetimes[i])[1]) for i in eachindex(densetimes)] for sol in u] - udense = [u[j](densetimes) for j in 1:length(u)] + udense = [u.u[j](densetimes) for j in 1:length(u)] dense_weak_errors = [mean([udense[j][i] - u_analytic[j][i] for j in 1:length(u)]) for i in eachindex(densetimes)] dense_L2_errors = [sqrt.(sum(abs2, err) / length(err)) for err in dense_weak_errors] From e35f40a576b443170e9e4f78d4f48aeed744d8ed Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Tue, 16 Jul 2024 04:37:07 -0400 Subject: [PATCH 2/2] Update Downstream.yml --- .github/workflows/Downstream.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index cdb56c4e9..73a26b9d8 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -21,6 +21,7 @@ jobs: - {user: SciML, repo: DelayDiffEq.jl, group: Integrators} - {user: SciML, repo: DelayDiffEq.jl, group: Regression} - {user: SciML, repo: DiffEqBase.jl, group: Core} + - {user: SciML, repo: DiffEqDevTools.jl, group: Core} - {user: SciML, repo: DiffEqBase.jl, group: Downstream} - {user: SciML, repo: DiffEqBase.jl, group: Downstream2} - {user: SciML, repo: DiffEqFlux.jl, group: DiffEqFlux}