Merge 009548a into 282c90a

SciML · Aug 24, 2022 · bf7d718 · bf7d718
2 parents 282c90a + 009548a
commit bf7d718
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 39 deletions.
diff --git a/Project.toml b/Project.toml
@@ -33,7 +33,7 @@ PoissonRandom = "0.4"
 RandomNumbers = "1.3"
 RecursiveArrayTools = "2"
 Reexport = "0.2, 1.0"
-SciMLBase = "1.35.1"
+SciMLBase = "1.51"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 TreeViews = "0.3"
 UnPack = "1.0.2"

diff --git a/src/coupling.jl b/src/coupling.jl
@@ -21,17 +21,8 @@ function cat_problems(prob::DiffEqBase.AbstractODEProblem,
                       prob_control::DiffEqBase.AbstractODEProblem)
     l = length(prob.u0) # add l_c = length(prob_control.u0)
 
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f = SciMLBase.unwrapped_f(prob.f)
-    else
-        _f = prob.f
-    end
-
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f_control = SciMLBase.unwrapped_f(prob_control.f)
-    else
-        _f_control = prob_control.f
-    end
+    _f = SciMLBase.unwrapped_f(prob.f)
+    _f_control = SciMLBase.unwrapped_f(prob_control.f)
 
     new_f = function (du, u, p, t)
         _f(@view(du[1:l]), u.u, p, t)
@@ -47,17 +38,8 @@ function cat_problems(prob::DiscreteProblem, prob_control::DiffEqBase.AbstractOD
         @warn("Coupling to DiscreteProblem with nontrivial f. Note that, unless scale_by_time=true, the meaning of f will change when using an ODE/SDE/DDE/DAE solver.")
     end
 
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f = SciMLBase.unwrapped_f(prob.f)
-    else
-        _f = prob.f
-    end
-
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f_control = SciMLBase.unwrapped_f(prob_control.f)
-    else
-        _f_control = prob_control.f
-    end
+    _f = SciMLBase.unwrapped_f(prob.f)
+    _f_control = SciMLBase.unwrapped_f(prob_control.f)
 
     new_f = function (du, u, p, t)
         _f(@view(du[1:l]), u.u, p, t)
@@ -86,17 +68,8 @@ function cat_problems(prob::DiffEqBase.AbstractSDEProblem,
                       prob_control::DiffEqBase.AbstractODEProblem)
     l = length(prob.u0)
 
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f = SciMLBase.unwrapped_f(prob.f)
-    else
-        _f = prob.f
-    end
-
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f_control = SciMLBase.unwrapped_f(prob_control.f)
-    else
-        _f_control = prob_control.f
-    end
+    _f = SciMLBase.unwrapped_f(prob.f)
+    _f_control = SciMLBase.unwrapped_f(prob_control.f)
 
     new_f = function (du, u, p, t)
         _f(@view(du[1:l]), u.u, p, t)

diff --git a/src/problem.jl b/src/problem.jl
@@ -227,11 +227,8 @@ function extend_problem(prob::DiffEqBase.AbstractDiscreteProblem, jumps; rng = D
 end
 
 function extend_problem(prob::DiffEqBase.AbstractODEProblem, jumps; rng = DEFAULT_RNG)
-    if isdefined(SciMLBase, :unwrapped_f)
-        _f = SciMLBase.unwrapped_f(prob.f)
-    else
-        _f = prob.f
-    end
+
+    _f = SciMLBase.unwrapped_f(prob.f)
 
     jump_f = let _f = _f
         function jump_f(du::ExtendedJumpArray, u::ExtendedJumpArray, p, t)