Fix precompilation errors from OrdinaryDiffEq

Author: bgroenks96

examples/heat_freeW_samoylov.jl

@@ -26,7 +26,7 @@ soilprofile = SoilProfile(
 initT = initializer(:T, CryoGrid.SamoylovDefault.tempprofile);
 
 # We choose the default grid discretization with 5 cm spacing at the surface.
-grid = CryoGrid.DefaultGrid_5cm;
+grid = CryoGrid.DefaultGrid_10cm;
 
 # Now we construct the Tile using the built-in model configuration `SoilHeatTile` which defines a
 # standalone soil straigraphy with only heat conduction and no water flow.
@@ -41,20 +41,25 @@ tile = CryoGrid.SoilHeatTile(
 );
 
 # Here we define the time span:
-tspan = (DateTime(2010,12,31),DateTime(2011,12,31));
+tspan = (DateTime(2010,12,31),DateTime(2012,12,31));
 
 # Evaluate the initial condition
 u0, du0 = initialcondition!(tile, tspan);
 
 # Here we construct a CryoGridProblem with tile, initial condition, and timespan.
-prob = CryoGridProblem(tile, u0, tspan, saveat=24*3600.0, savevars=(:T,));
+prob = CryoGridProblem(tile, u0, tspan, saveat=24*3600.0, savevars=(:T,), step_limiter=nothing);
 
 # Solve the configured problem with the built-in forward Euler method.
 # note that, due to compile time, this may take 1-2 minutes when executed in a fresh Julia
 # session. Subsequent solves will be much faster.
-sol = @time solve(prob);
+sol = @time solve(prob, Euler(), dt=900.0);
 out = CryoGridOutput(sol)
 
+dts = []
+for integrator in init(prob, Euler(), dt=900.0)
+    push!(dts, integrator.dt)
+end
+
 # Now we plot the reuslts!
 import Plots
 zs = [1,10,20,30,50,100,200,500,1000]u"cm"

src/Solvers/DiffEq/DiffEq.jl

@@ -38,7 +38,8 @@ function __init__()
     # OrdinaryDiffEq compatibility
     @require OrdinaryDiffEq="1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" begin
         using .OrdinaryDiffEq
-        using .OrdinaryDiffEq: NLSolver, OrdinaryDiffEqAlgorithm, DAEAlgorithm
+        import .OrdinaryDiffEq.OrdinaryDiffEqNonlinearSolve: NLSolver, NLStatus, AbstractNLSolverAlgorithm, AbstractNLSolverCache, build_nlsolver
+        import .OrdinaryDiffEq.OrdinaryDiffEqCore: OrdinaryDiffEqAlgorithm, DAEAlgorithm
         # re-export selected types from OrdinaryDiffEq;
         export OrdinaryDiffEq
         # explicit methods

src/Solvers/DiffEq/nlsolve/nlsolve.jl

@@ -1,7 +1,7 @@
 """
 Base type for custom nonlinear solver algorithms.
 """
-abstract type AbstractCryoGridNLSolverAlgorithm <: OrdinaryDiffEq.AbstractNLSolverAlgorithm end
+abstract type AbstractCryoGridNLSolverAlgorithm <: AbstractNLSolverAlgorithm end
 
 kappa(::AbstractCryoGridNLSolverAlgorithm) = 1e-2
 
@@ -16,7 +16,7 @@ Constructs the nonlinear solver cache for `nlalg`.
 """
 build_nlcache(::AbstractCryoGridNLSolverAlgorithm, f, u, p, t) = error("not implemented")
 
-function OrdinaryDiffEq.build_nlsolver(
+function build_nlsolver(
     alg,
     nlalg::AbstractCryoGridNLSolverAlgorithm,
     u,
@@ -46,7 +46,7 @@ function OrdinaryDiffEq.build_nlsolver(
     ηold = one(t)
     NLSolver{true, tTypeNoUnits}(z, tmp, ztmp, γ, c, α, nlalg, kappa(nlalg),
                 fast_convergence_cutoff(nlalg), ηold, 0, maxiters(nlalg),
-                OrdinaryDiffEq.Divergence,
+                NLStatus.Divergence,
                 nlcache)
 end
 

src/Solvers/DiffEq/nlsolve/nlsolve_cglite.jl

@@ -5,7 +5,7 @@ Base.@kwdef struct NLCGLite <: AbstractCryoGridNLSolverAlgorithm
     check_div::Bool = false
 end
 
-mutable struct NLCGLiteCache{Tu,Tt,Tcache} <: OrdinaryDiffEq.AbstractNLSolverCache
+mutable struct NLCGLiteCache{Tu,Tt,Tcache} <: AbstractNLSolverCache
     ustep::Tu
     tstep::Tt
     innercache::Tcache
@@ -35,7 +35,7 @@ end
 # and is probably used by the adaptive timestepping algorithms.
 initial_η(nlsolver::NLSolver{<:NLCGLite}, integrator) = nlsolver.ηold
 
-DiffEqBase.@muladd function OrdinaryDiffEq.initialize!(nlsolver::NLSolver{<:NLCGLite}, integrator::DiffEqBase.DEIntegrator)
+DiffEqBase.@muladd function initialize!(nlsolver::NLSolver{<:NLCGLite}, integrator::DiffEqBase.DEIntegrator)
     nlsolver.cache.tstep = integrator.t + nlsolver.c * integrator.dt
     copyto!(nlsolver.cache.innercache.uprev, nlsolver.tmp)
     # this won't work if u has units
@@ -44,7 +44,7 @@ DiffEqBase.@muladd function OrdinaryDiffEq.initialize!(nlsolver::NLSolver{<:NLCG
     return nothing
 end
 
-DiffEqBase.@muladd function OrdinaryDiffEq.compute_step!(nlsolver::NLSolver{<:NLCGLite, true}, integrator)
+DiffEqBase.@muladd function compute_step!(nlsolver::NLSolver{<:NLCGLite, true}, integrator)
     @unpack p, dt = integrator
     @unpack z, tmp, ztmp, γ, α, cache = nlsolver
     @unpack ustep, tstep, innercache = cache