Skip to content

Type for ode4 and ode_ms and parameters for RHS #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 16, 2012
Merged

Type for ode4 and ode_ms and parameters for RHS #597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce49c1d
Type for ode4 and ode_ms and parameters for RHS
JonasRauch Mar 16, 2012
4be8b39
removed parameters again
JonasRauch Mar 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions jl/ode.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,12 @@ const ode45 = ode45_dp
# ODEFUN(T,X) must return a column vector corresponding to f(t,x). Each
# row in the solution array X corresponds to a time returned in the
# column vector T.
function ode4(F::Function, tspan::AbstractVector, x0::AbstractVector)
function ode4{T}(F::Function, tspan::AbstractVector, x0::AbstractVector{T})
h = diff(tspan)
x = Array(Float64, (length(tspan), length(x0)))
x = Array(T, (length(tspan), length(x0)))
x[1,:] = x0'

midxdot = Array(Float64, (4, length(x0)))
midxdot = Array(T, (4, length(x0)))
for i = 1:(length(tspan)-1)
# Compute midstep derivatives
midxdot[1,:] = F(tspan[i], x[i,:]')
Expand All @@ -392,9 +392,9 @@ function ode4(F::Function, tspan::AbstractVector, x0::AbstractVector)
end

# ODE_MS Fixed-step, fixed-order multi-step numerical method with Adams-Bashforth-Moulton coefficients
function ode_ms(F::Function, tspan::AbstractVector, x0::AbstractVector, order::Integer)
function ode_ms{T}(F::Function, tspan::AbstractVector, x0::AbstractVector{T}, order::Integer)
h = diff(tspan)
x = zeros(length(tspan), length(x0))
x = zeros(T,(length(tspan), length(x0)))
x[1,:] = x0

if 1 <= order <= 4
Expand Down