Upstream

Project.toml

@@ -79,7 +79,7 @@ ADTypes = "0.2, 1"
 Adapt = "3.0, 4"
 ArrayInterface = "7"
 DataStructures = "0.18"
-DiffEqBase = "6.147"
+DiffEqBase = "6.154"
 DocStringExtensions = "0.9"
 EnumX = "1"
 ExponentialUtilities = "1"

lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml

@@ -1,30 +1,45 @@
 name = "OrdinaryDiffEqAdamsBashforthMoulton"
 uuid = "89bda076-bce5-4f1c-845f-551c83cdda9a"
 authors = ["ParamThakkar123 <[email protected]>"]
-version = "1.0.0"
+version = "1.1.0"
 
 [deps]
+ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
+DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
 MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
 OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
 OrdinaryDiffEqLowOrderRK = "1344f307-1e59-4825-a18e-ace9aa3fa4c6"
 Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
-Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
-ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 
 [compat]
+ADTypes = "1.7.1"
+DiffEqBase = "6.152.2"
+DiffEqDevTools = "2.44.4"
+FastBroadcast = "0.3.5"
+MuladdMacro = "0.2.4"
+ODEProblemLibrary = "0.1.8"
+OrdinaryDiffEqCore = "1.1"
+OrdinaryDiffEqLowOrderRK = "<0.0.1, 1"
+Polyester = "0.7.16"
+Random = "<0.0.1, 1"
+RecursiveArrayTools = "3.27.0"
+Reexport = "1.2.2"
+SafeTestsets = "0.1.0"
+Static = "1.1.1"
+Test = "<0.0.1, 1"
 julia = "1.10"
 
 [extras]
+DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d"
 ODEProblemLibrary = "fdc4e326-1af4-4b90-96e7-779fcce2daa5"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 
 [targets]
 test = ["DiffEqDevTools", "ODEProblemLibrary", "Random", "SafeTestsets", "Test", "DiffEqBase"]

lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl

@@ -7,13 +7,14 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqMutableCache, OrdinaryDiffEqConstantCac
                            OrdinaryDiffEqAdaptiveAlgorithm,
                            OrdinaryDiffEqAdamsVarOrderVarStepAlgorithm,
                            constvalue, calculate_residuals, calculate_residuals!,
-                           trivial_limiter!,
+                           trivial_limiter!, get_fsalfirstlast,
                            full_cache
 import OrdinaryDiffEqLowOrderRK: BS3ConstantCache, BS3Cache, RK4ConstantCache, RK4Cache
 import RecursiveArrayTools: recursivefill!
 using MuladdMacro, FastBroadcast
 import Static: False
 import ADTypes: AutoForwardDiff
+import OrdinaryDiffEqCore
 
 using Reexport
 @reexport using DiffEqBase

lib/OrdinaryDiffEqAdamsBashforthMoulton/src/adams_bashforth_moulton_caches.jl

@@ -1,4 +1,8 @@
-@cache mutable struct AB3Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+abstract type ABMMutableCache <: OrdinaryDiffEqMutableCache end
+abstract type ABMVariableCoefficientMutableCache <: OrdinaryDiffEqMutableCache end
+get_fsalfirstlast(cache::ABMMutableCache,u) = (cache.fsalfirst, cache.k)
+get_fsalfirstlast(cache::ABMVariableCoefficientMutableCache,u) = (cache.fsalfirst, cache.k4)
+@cache mutable struct AB3Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -38,7 +42,7 @@ function alg_cache(alg::AB3, u, rate_prototype, ::Type{uEltypeNoUnits},
     AB3ConstantCache(k2, k3, 1)
 end
 
-@cache mutable struct ABM32Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+@cache mutable struct ABM32Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -78,7 +82,7 @@ function alg_cache(alg::ABM32, u, rate_prototype, ::Type{uEltypeNoUnits},
     ABM32ConstantCache(k2, k3, 1)
 end
 
-@cache mutable struct AB4Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+@cache mutable struct AB4Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -128,7 +132,7 @@ function alg_cache(alg::AB4, u, rate_prototype, ::Type{uEltypeNoUnits},
     AB4ConstantCache(k2, k3, k4, 1)
 end
 
-@cache mutable struct ABM43Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+@cache mutable struct ABM43Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -184,7 +188,7 @@ function alg_cache(alg::ABM43, u, rate_prototype, ::Type{uEltypeNoUnits},
     ABM43ConstantCache(k2, k3, k4, 1)
 end
 
-@cache mutable struct AB5Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+@cache mutable struct AB5Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -236,7 +240,7 @@ function alg_cache(alg::AB5, u, rate_prototype, ::Type{uEltypeNoUnits},
     AB5ConstantCache(k2, k3, k4, k5, 1)
 end
 
-@cache mutable struct ABM54Cache{uType, rateType} <: OrdinaryDiffEqMutableCache
+@cache mutable struct ABM54Cache{uType, rateType} <: ABMMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -312,7 +316,7 @@ end
 
 @cache mutable struct VCAB3Cache{uType, rateType, TabType, bs3Type, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -408,7 +412,7 @@ end
 
 @cache mutable struct VCAB4Cache{uType, rateType, rk4cacheType, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -504,7 +508,7 @@ end
 
 @cache mutable struct VCAB5Cache{uType, rateType, rk4cacheType, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -602,7 +606,7 @@ end
 @cache mutable struct VCABM3Cache{
     uType, rateType, TabType, bs3Type, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -708,7 +712,7 @@ end
 
 @cache mutable struct VCABM4Cache{uType, rateType, rk4cacheType, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -813,7 +817,7 @@ end
 
 @cache mutable struct VCABM5Cache{uType, rateType, rk4cacheType, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType
@@ -919,7 +923,7 @@ end
 
 @cache mutable struct VCABMCache{uType, rateType, dtType, tArrayType, cArrayType,
     uNoUnitsType, coefType, dtArrayType} <:
-                      OrdinaryDiffEqMutableCache
+                      ABMVariableCoefficientMutableCache
     u::uType
     uprev::uType
     fsalfirst::rateType