handle combination of static and nonstatic in Rk4

baggepinnen · Oct 6, 2023 · 24d6bed · 24d6bed · baggepinnen · Oct 6, 2023
1 parent b50a1f9
commit 24d6bed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SeeToDee"
 uuid = "1c904df7-48cd-41e7-921b-d889ed9a470c"
 authors = ["Fredrik Bagge Carlson"]
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"

diff --git a/src/SeeToDee.jl b/src/SeeToDee.jl
@@ -78,7 +78,7 @@ function _inner_rk4(integ::Rk4{F}, f1, x, u, p, t; Ts=integ.Ts, supersample=inte
     f4 = f(xi, u, p, t + Ts2)
     xi .= (Ts2 / 6) .* (f1 .+ 2 .* f2 .+ 2 .* f3 .+ f4)
     # This gymnastics with changing the name to y is to ensure type stability when x + add is not the same type as x. The compiler is smart enough to figure out the type of y
-    y = x + xi
+    y = _mutable(x + xi) # If x is non-static but xi isn't, we get a static array and adding to y won't work
     for i in 2:supersample
         f1 = f(y, u, p, t)
         xi = y .+ (Ts2 / 2) .* f1
@@ -93,6 +93,8 @@ function _inner_rk4(integ::Rk4{F}, f1, x, u, p, t; Ts=integ.Ts, supersample=inte
     return y
 end
 
+_mutable(x::StaticArray) = Array(x)
+_mutable(x::AbstractArray) = x
 
 # ==============================================================================