Skip to content

Commit 116f989

Browse files
charleskawczynskicharleskawczynski
committed
Reduce dependence on OrdinaryDiffEq
1 parent 9eb9662 commit 116f989

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+100
-76
lines changed

‎.buildkite/Manifest.toml

+23-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "652f90825513bed89484e0ca25f9a53f61dedb8c"
5+
project_hash = "a3b8e1623c974758b823be61fb12f149202fadbb"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "99a6f5d0ce1c7c6afdb759daa30226f71c54f6b0"
@@ -1744,6 +1744,28 @@ git-tree-sha1 = "a8b2d333cd90562b58b977b4033739360b37fb1f"
17441744
uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
17451745
version = "6.87.0"
17461746

1747+
[[deps.OrdinaryDiffEqCore]]
1748+
deps = ["ADTypes", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "TruncatedStacktraces"]
1749+
git-tree-sha1 = "bc70a38874c801549d415c16a23ec632ad91afd1"
1750+
uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
1751+
version = "1.4.0"
1752+
weakdeps = ["EnzymeCore"]
1753+
1754+
[deps.OrdinaryDiffEqCore.extensions]
1755+
OrdinaryDiffEqCoreEnzymeCoreExt = "EnzymeCore"
1756+
1757+
[[deps.OrdinaryDiffEqSSPRK]]
1758+
deps = ["DiffEqBase", "FastBroadcast", "MuladdMacro", "OrdinaryDiffEqCore", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "Static", "StaticArrays"]
1759+
git-tree-sha1 = "7dbe4ac56f930df5e9abd003cedb54e25cbbea86"
1760+
uuid = "669c94d9-1f4b-4b64-b377-1aa079aa2388"
1761+
version = "1.2.0"
1762+
1763+
[[deps.OrdinaryDiffEqTsit5]]
1764+
deps = ["DiffEqBase", "FastBroadcast", "LinearAlgebra", "MuladdMacro", "OrdinaryDiffEqCore", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "Static", "TruncatedStacktraces"]
1765+
git-tree-sha1 = "96552f7d4619fabab4038a29ed37dd55e9eb513a"
1766+
uuid = "b1df2697-797e-41e3-8120-5422d3b24e4a"
1767+
version = "1.1.0"
1768+
17471769
[[deps.P11Kit_jll]]
17481770
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
17491771
git-tree-sha1 = "2cd396108e178f3ae8dedbd8e938a18726ab2fbf"

‎.buildkite/Project.toml

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
3535
NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
3636
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
3737
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
38+
OrdinaryDiffEqSSPRK = "669c94d9-1f4b-4b64-b377-1aa079aa2388"
39+
OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
3840
PProf = "e4faabce-9ead-11e9-39d9-4379958e3056"
3941
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
4042
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"

‎examples/bickleyjet/bickleyjet_cg.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ClimaCore:
1212
Quadratures
1313
import ClimaCore.Geometry: ⊗
1414

15-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
15+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1616

1717
import Logging
1818
import TerminalLoggers

‎examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Topologies,
1212
Quadratures,
1313
DataLayouts
14-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
using Logging
1717
ClimaComms.@import_required_backends

‎examples/bickleyjet/bickleyjet_cg_unsmesh.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ClimaCore:
1212
Quadratures
1313
import ClimaCore.Geometry: ⊗
1414

15-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
15+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1616

1717
import Logging
1818
import TerminalLoggers

‎examples/bickleyjet/bickleyjet_dg.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ClimaCore:
1414
import ClimaCore.Geometry: ⊗
1515
import ClimaCore.RecursiveApply: ⊞, rdiv, rmap
1616

17-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
17+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1818

1919
import Logging
2020
import TerminalLoggers

‎examples/column/advect.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/advect_diffusion.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/bb_fct_advection.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ClimaComms
22
ClimaComms.@import_required_backends
33
using Test
44
using LinearAlgebra
5-
using OrdinaryDiffEq: ODEProblem, solve
5+
using SciMLBase: ODEProblem, solve
66
using ClimaTimeSteppers
77

88
import ClimaCore:

‎examples/column/ekman.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Geometry,
1212
Spaces
1313

14-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
import Logging
1717
import TerminalLoggers

‎examples/column/fct_advection.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ClimaComms
22
ClimaComms.@import_required_backends
33
using Test
44
using LinearAlgebra
5-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
5+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
66

77
import ClimaCore:
88
Fields,

‎examples/column/heat.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/hydrostatic.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/hydrostatic_discrete.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ClimaCore:
1010
Geometry,
1111
Spaces
1212

13-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
13+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1414

1515
import Logging
1616
import TerminalLoggers

‎examples/column/hydrostatic_ekman.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ClimaCore:
1414

1515
import ClimaCore.Geometry: ⊗
1616

17-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
17+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1818

1919
import Logging
2020
import TerminalLoggers

‎examples/column/step.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Geometry,
1212
Spaces
1313

14-
using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
import Logging
1717
import TerminalLoggers

‎examples/column/wave.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import ClimaCore:
1111
Geometry,
1212
Spaces
1313

14-
using OrdinaryDiffEq: OrdinaryDiffEq, ODEProblem, solve, SSPRK33
14+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
1515

1616
import Logging
1717
import TerminalLoggers

‎examples/column/zalesak_fct_advection.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ClimaComms
22
ClimaComms.@import_required_backends
33
using Test
44
using LinearAlgebra
5-
using OrdinaryDiffEq: ODEProblem, solve
5+
using SciMLBase: ODEProblem, solve
66
using ClimaTimeSteppers
77

88
import ClimaCore:

‎examples/hybrid/box/bubble_3d_invariant_rhoe.jl

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ using Adapt
1313
using ClimaComms
1414
ClimaComms.@import_required_backends
1515
FloatType = eval(Meta.parse(get(ARGS, 1, "Float64")))
16-
using StaticArrays, IntervalSets, LinearAlgebra, OrdinaryDiffEq
16+
using StaticArrays, IntervalSets, LinearAlgebra, SciMLBase
17+
using OrdinaryDiffEqSSPRK: SSPRK33
1718
using DocStringExtensions
1819

1920
import ClimaCore:
@@ -446,7 +447,7 @@ function bubble_3d_invariant_ρe(ARGS, comms_ctx, ::Type{FT}) where {FT}
446447
# run!
447448
Δt = sim_params.Δt
448449
prob = ODEProblem(rhs_invariant!, Y, (0.0, sim_params.t_int), ghost_buffer)
449-
integrator = OrdinaryDiffEq.init(
450+
integrator = SciMLBase.init(
450451
prob,
451452
SSPRK33(),
452453
dt = Δt,
@@ -460,7 +461,7 @@ function bubble_3d_invariant_ρe(ARGS, comms_ctx, ::Type{FT}) where {FT}
460461
throw(:exit_profile)
461462
end
462463

463-
t_diff = @elapsed sol_invariant = OrdinaryDiffEq.solve!(integrator)
464+
t_diff = @elapsed sol_invariant = SciMLBase.solve!(integrator)
464465

465466
if ClimaComms.iamroot(comms_ctx)
466467
println("Walltime = $t_diff seconds")

‎examples/hybrid/box/bubble_3d_invariant_rhotheta.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ dYdt = similar(Y);
304304
rhs_invariant!(dYdt, Y, nothing, 0.0);
305305

306306
# run!
307-
using OrdinaryDiffEq
307+
using OrdinaryDiffEqSSPRK: ODEProblem, solve, SSPRK33
308308
Δt = 0.050
309309
prob = ODEProblem(rhs_invariant!, Y, (0.0, 1.0))
310310
sol = solve(

‎examples/hybrid/box/bubble_3d_rhotheta.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ rhs!(dYdt, Y, nothing, 0.0);
305305

306306

307307
# run!
308-
using OrdinaryDiffEq
308+
using OrdinaryDiffEqSSPRK: ODEProblem, init, solve!, SSPRK33
309309
Δt = 0.05
310310
prob = ODEProblem(rhs!, Y, (0.0, 1.0))
311-
integrator = OrdinaryDiffEq.init(
311+
integrator = init(
312312
prob,
313313
SSPRK33(),
314314
dt = Δt,
@@ -321,7 +321,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
321321
throw(:exit_profile)
322322
end
323323

324-
sol = @timev OrdinaryDiffEq.solve!(integrator)
324+
sol = @timev solve!(integrator)
325325

326326
ENV["GKSwstype"] = "nul"
327327
import Plots

‎examples/hybrid/driver.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ atexit() do
4747
global_logger(prev_logger)
4848
end
4949

50-
using OrdinaryDiffEq
50+
using SciMLBase
5151
using DiffEqCallbacks
5252
using JLD2
5353

@@ -163,7 +163,7 @@ problem = ODE.ODEProblem(
163163
(t_start, t_end),
164164
p,
165165
)
166-
integrator = OrdinaryDiffEq.init(
166+
integrator = SciMLBase.init(
167167
problem,
168168
ode_algo;
169169
saveat = dt_save_to_sol == 0 ? [] : dt_save_to_sol,
@@ -182,7 +182,7 @@ end
182182
@info "Running `$test_dir/$test_file_name` test case"
183183
@info "on a vertical $z_stretch_string grid"
184184

185-
walltime = @elapsed sol = OrdinaryDiffEq.solve!(integrator)
185+
walltime = @elapsed sol = SciMLBase.solve!(integrator)
186186
any(isnan, sol.u[end]) && error("NaNs found in result.")
187187

188188
if is_distributed # replace sol.u on the root processor with the global sol.u

‎examples/hybrid/plane/bubble_2d_invariant_rhoe.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ dYdt = similar(Y);
253253
rhs_invariant!(dYdt, Y, nothing, 0.0);
254254

255255
# run!
256-
using OrdinaryDiffEq
256+
using OrdinaryDiffEqSSPRK: init, ODEProblem, solve!, SSPRK33
257257
Δt = 0.04
258258
prob = ODEProblem(rhs_invariant!, Y, (0.0, 1200.0))
259-
integrator = OrdinaryDiffEq.init(
259+
integrator = init(
260260
prob,
261261
SSPRK33(),
262262
dt = Δt,
@@ -269,7 +269,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
269269
throw(:exit_profile)
270270
end
271271

272-
sol = @timev OrdinaryDiffEq.solve!(integrator)
272+
sol = @timev solve!(integrator)
273273

274274
ENV["GKSwstype"] = "nul"
275275
import Plots, ClimaCorePlots

‎examples/hybrid/plane/density_current_2d_flux_form.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,11 @@ rhs!(dYdt, Y, nothing, 0.0);
295295

296296

297297
# run!
298-
using OrdinaryDiffEq
298+
using OrdinaryDiffEqSSPRK: ODEProblem, init, solve!, SSPRK33
299299
Δt = 0.3
300300
prob = ODEProblem(rhs!, Y, (0.0, 900.0))
301301

302-
integrator = OrdinaryDiffEq.init(
302+
integrator = init(
303303
prob,
304304
SSPRK33(),
305305
dt = Δt,
@@ -312,7 +312,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
312312
throw(:exit_profile)
313313
end
314314

315-
sol = @timev OrdinaryDiffEq.solve!(integrator)
315+
sol = @timev solve!(integrator)
316316

317317
ENV["GKSwstype"] = "nul"
318318
using ClimaCorePlots, Plots

‎examples/hybrid/plane/density_current_2dinvariant_rhoe.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ dYdt = similar(Y);
272272
rhs_invariant!(dYdt, Y, nothing, 0.0);
273273

274274
# run!
275-
using OrdinaryDiffEq
275+
using OrdinaryDiffEqSSPRK: ODEProblem, init, solve!, SSPRK33
276276
timeend = 900.0
277277
Δt = 0.3
278278
prob = ODEProblem(rhs_invariant!, Y, (0.0, timeend))
279-
integrator = OrdinaryDiffEq.init(
279+
integrator = init(
280280
prob,
281281
SSPRK33(),
282282
dt = Δt,
@@ -289,7 +289,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
289289
throw(:exit_profile)
290290
end
291291

292-
sol = @timev OrdinaryDiffEq.solve!(integrator)
292+
sol = @timev solve!(integrator)
293293

294294
ENV["GKSwstype"] = "nul"
295295
import Plots, ClimaCorePlots

‎examples/hybrid/plane/isothermal_channel.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,10 @@ dYdt = similar(Y);
277277
rhs_invariant!(dYdt, Y, nothing, 0.0);
278278

279279
# run!
280-
using OrdinaryDiffEq
280+
using OrdinaryDiffEqSSPRK: ODEProblem, init, solve!, SSPRK33
281281
Δt = 0.5
282282
prob = ODEProblem(rhs_invariant!, Y, (0.0, 15000.0))
283-
integrator = OrdinaryDiffEq.init(
283+
integrator = init(
284284
prob,
285285
SSPRK33(),
286286
dt = Δt,
@@ -293,7 +293,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
293293
throw(:exit_profile)
294294
end
295295

296-
sol = @timev OrdinaryDiffEq.solve!(integrator)
296+
sol = @timev solve!(integrator)
297297

298298
ENV["GKSwstype"] = "nul"
299299
import Plots, ClimaCorePlots

‎examples/hybrid/plane/topo_agnesi_nh.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ dYdt = similar(Y);
335335
rhs_invariant!(dYdt, Y, nothing, 0.0);
336336

337337
# run!
338-
using OrdinaryDiffEq
338+
using OrdinaryDiffEqSSPRK: ODEProblem, init, solve!, SSPRK33
339339
Δt = 1.0
340340
timeend = 72000.0
341341
function make_dss_func()
@@ -347,7 +347,7 @@ end
347347
dss_func = make_dss_func()
348348
dss_callback = FunctionCallingCallback(dss_func, func_start = true)
349349
prob = ODEProblem(rhs_invariant!, Y, (0.0, timeend))
350-
integrator = OrdinaryDiffEq.init(
350+
integrator = init(
351351
prob,
352352
SSPRK33(),
353353
dt = Δt,
@@ -361,7 +361,7 @@ if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
361361
throw(:exit_profile)
362362
end
363363

364-
sol = @timev OrdinaryDiffEq.solve!(integrator)
364+
sol = @timev solve!(integrator)
365365

366366
ENV["GKSwstype"] = "nul"
367367
import Plots, ClimaCorePlots

0 commit comments

Comments
 (0)