Update package compat versions

Also replaces the apparently now defunct SimpleNonlinearSolve with NonlinearSolve.

Author: bgroenks96

Project.toml

@@ -25,6 +25,7 @@ LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
 ModelParameters = "4744a3fa-6c31-4707-899e-a3298e4618ad"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
+NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
@@ -33,7 +34,6 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
-SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -53,7 +53,7 @@ ConstructionBase = "1.4"
 DataStructures = "0.18"
 Dates = "1"
 DiffEqBase = "6"
-DiffEqCallbacks = "2, 3"
+DiffEqCallbacks = "2, 3, 4"
 DimensionalData = "0.19, 0.20, 0.21, 0.24, 0.25, 0.26, 0.27, 0.28"
 Downloads = "1"
 Flatten = "0.4"
@@ -68,6 +68,7 @@ LinearSolve = "1, 2"
 LoopVectorization = "0.12"
 ModelParameters = "0.3, 0.4"
 NCDatasets = "0.12, 0.13, 0.14"
+NonlinearSolve = "4"
 OrdinaryDiffEq = "6"
 PreallocationTools = "0.4"
 RecursiveArrayTools = "2, 3"
@@ -76,7 +77,6 @@ Requires = "1"
 ReverseDiff = "1"
 SciMLBase = "1, 2"
 Setfield = "0.8,1"
-SimpleNonlinearSolve = "0.1,1"
 SpecialFunctions = "2"
 StaticArrays = "1"
 Statistics = "1"

examples/heat_sfcc_samoylov.jl

@@ -16,7 +16,7 @@ lowerbc = GeothermalHeatFlux(0.053u"W/m^2")
 tile = CryoGrid.SoilHeatTile(upperbc, lowerbc, soilprofile, forcings, initT; grid=grid)
 tspan = (DateTime(2010,10,30),DateTime(2011,10,30))
 u0, du0 = @time initialcondition!(tile, tspan)
-prob = CryoGridProblem(tile, u0, tspan, saveat=3*3600.0, savevars=(:T,));
+prob = CryoGridProblem(tile, u0, tspan, saveat=3*3600.0, savevars=(:T,:H,:C,:θw,:∂H∂T));
 
 # ... then solve it with the built-in forward Euler integrator.
 sol = @time solve(prob);

src/Physics/Heat/analytic/stefan_analytic.jl

@@ -2,7 +2,7 @@ using ComponentArrays
 using SpecialFunctions
 using UnPack
 
-import SimpleNonlinearSolve
+import NonlinearSolve
 import SciMLBase
 
 const DefaultHeatProperties = HeatBalanceProperties()
@@ -103,12 +103,12 @@ function (sol::StefanSolution)(x, t)
         IfElse.ifelse(x >= x_m, uconvert(u"°C", T_s), uconvert(u"°C", T_l))
     end
 end
-function SciMLBase.solve(prob::StefanProblem, alg=SimpleNonlinearSolve.SimpleNewtonRaphson(); p=prob.p, x0=prob.x0, t0=prob.t0)
+function SciMLBase.solve(prob::StefanProblem, alg=NonlinearSolve.SimpleNewtonRaphson(); p=prob.p, x0=prob.x0, t0=prob.t0)
     pvec = ComponentVector(values(p))
     prob = StefanProblem(StefanParameters(;pvec...), x0, t0)
     f(u,p) = stefan_residual(u, p.T_m, p.T_l, p.T_s, p.k_l, p.c_l, p.k_s, p.c_s, p.ρ, p.θwi, p.Lf)
     λ₀ = 1/(pvec.Lf*pvec.θwi)
-    nlprob = SimpleNonlinearSolve.NonlinearProblem(f, ustrip(λ₀), ustrip.(pvec))
+    nlprob = NonlinearSolve.NonlinearProblem(f, ustrip(λ₀), ustrip.(pvec))
     nlsol = SciMLBase.solve(nlprob, alg)
     λ = nlsol.u*one(λ₀)
     return StefanSolution(prob, nlsol, λ)

src/Physics/Surface/SEB/seb_solve.jl

@@ -1,4 +1,4 @@
-function SimpleNonlinearSolve.solve(seb::SurfaceEnergyBalance{<:Numerical}, initialstate::SEBState)
+function NonlinearSolve.solve(seb::SurfaceEnergyBalance{<:Numerical}, initialstate::SEBState)
     function resid(u, p)
         state = SEBState(;
             Qh=u[1],

src/Physics/Surface/Surface.jl

@@ -9,7 +9,7 @@ using CryoGrid.Numerics
 using CryoGrid.Utils
 
 using Setfield
-using SimpleNonlinearSolve
+using NonlinearSolve
 using StaticArrays: @SVector
 using Unitful
 

src/problem.jl

@@ -74,8 +74,8 @@ function CryoGridProblem(
     # remove units
     tile = stripunits(tile)
     # set up saving callback
-    stateproto = getsavestate(tile, u0, du0)
-    savevals = SavedValues(Float64, typeof(stateproto))
+    # stateproto = getsavestate(tile, u0, du0)
+    savevals = SavedValues(Float64, Any)
     saveat = expandtstep(saveat, tspan)
     savingcallback = SavingCallback(savefunc, savevals; saveat=saveat, save_start=save_start, save_end=save_end, save_everystep=save_everystep)
     diagnostic_step_callback = PresetTimeCallback(tspan[1]:diagnostic_stepsize:tspan[end], diagnosticstep!)
@@ -115,7 +115,8 @@ function SciMLBase.remake(
     kwargs=prob.kwargs,
 ) where iip
     # always re-run initialcondition! with the given tspan and parameters
-    _u0, du0 = initialcondition!(Tile(f), tspan, p)
+    tile = Tile(f)
+    _u0, du0 = initialcondition!(tile, tspan, p)
     # if u0 was explicitly given, use it instead of the computed value
     if !isnothing(u0)
         # evaluate Tile on new initial state

test/Physics/Surface/runtests.jl

@@ -3,7 +3,7 @@ using CryoGrid.Hydrology
 using CryoGrid.Surface
 using CryoGrid.Utils
 
-using SimpleNonlinearSolve
+using NonlinearSolve
 using Test
 
 include("seb_tests.jl")