Skip to content

Commit d8ed0ca

Browse files
update to new names
1 parent f3bfa18 commit d8ed0ca

7 files changed

+78
-369
lines changed

src/DiffEqProblemLibrary.jl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ include("ode_premade_problems.jl")
88
include("dae_premade_problems.jl")
99
include("dde_premade_problems.jl")
1010
include("sde_premade_problems.jl")
11-
include("fem_premade_problems.jl")
1211

1312
#ODE Example Problems
1413
export prob_ode_linear, prob_ode_bigfloatlinear, prob_ode_2Dlinear,
@@ -41,17 +40,4 @@ export prob_dde_1delay, prob_dde_1delay_notinplace, prob_dde_1delay_scalar_notin
4140
# examples with vanishing state dependent delays
4241
prob_neves2, prob_dde_gatica
4342

44-
#FEM Example Problems
45-
export prob_femheat_moving, prob_femheat_pure, prob_femheat_diffuse,
46-
prob_poisson_wave, prob_poisson_noisywave, prob_femheat_birthdeath,
47-
prob_poisson_birthdeath, prob_femheat_stochasticbirthdeath,
48-
prob_stokes_homogenous, prob_stokes_dirichletzero, prob_poisson_birthdeathsystem,
49-
prob_poisson_birthdeathinteractingsystem, prob_femheat_birthdeathinteractingsystem,
50-
prob_femheat_birthdeathsystem, prob_femheat_diffusionconstants,
51-
heatProblemExample_grayscott,heatProblemExample_gierermeinhardt,
52-
prob_femheat_stochasticbirthdeath_fast,prob_femheat_pure11,prob_femheat_moving7
53-
54-
55-
export cs_fempoisson_wave,cs_femheat_moving_dt,cs_femheat_moving_dx, cs_femheat_moving_faster_dt
56-
5743
end # module

src/dae_premade_problems.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### DAE Problems
22

3-
f = function (tres, y, yp, r)
3+
f = function (r, yp, y, p, tres)
44
r[1] = -0.04*y[1] + 1.0e4*y[2]*y[3]
55
r[2] = -r[1] - 3.0e7*y[2]*y[2] - yp[2]
66
r[1] -= yp[1]

src/dde_premade_problems.jl

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
### In-place function
66

7-
function f_1delay(t, u, h, du)
7+
function f_1delay(du, u, h, p, t)
88
du[1] = - h(t - oneunit(t))[1] / oneunit(t)
99
end
1010

11-
function f_1delay(::Type{Val{:analytic}}, t, u₀)
11+
function f_1delay(::Type{Val{:analytic}}, u₀, p, t)
1212
z = t/oneunit(t)
1313

1414
if z < 0
@@ -77,7 +77,7 @@ prob_dde_1delay = build_prob_dde_1delay(1.0)
7777

7878
### Not in-place function
7979

80-
function f_1delay_notinplace(t, u, h)
80+
function f_1delay_notinplace(u, h, p, t)
8181
- h(t - oneunit(t)) ./ oneunit(t)
8282
end
8383

@@ -113,11 +113,11 @@ prob_dde_1delay_scalar_notinplace = build_prob_dde_1delay_scalar_notinplace(1.0)
113113

114114
### In-place function
115115

116-
function f_2delays(t::T, u, h, du) where {T<:Number}
116+
function f_2delays(du::T, u, h, p, t) where T
117117
du[1] = (- h(t - T(1//3))[1] - h(t - T(1//5))[1]) / oneunit(t)
118118
end
119119

120-
function f_2delays(::Type{Val{:analytic}}, t, u₀)
120+
function f_2delays(::Type{Val{:analytic}}, u₀, p, t)
121121
z = t/oneunit(t)
122122

123123
if z < 0
@@ -184,7 +184,7 @@ prob_dde_2delays = build_prob_dde_2delays(1.0)
184184

185185
### Not in-place function
186186

187-
function f_2delays_notinplace(t::T, u, h) where {T}
187+
function f_2delays_notinplace(u::T, h, p, t) where T
188188
(- h(t - T(1//3)) .- h(t - T(1//5))) ./ oneunit(t)
189189
end
190190

@@ -225,7 +225,7 @@ prob_dde_2delays_scalar_notinplace = build_prob_dde_2delays_scalar_notinplace(1.
225225

226226
### In-place function
227227

228-
function f_1delay_long(t::T, u, h, du) where {T}
228+
function f_1delay_long(du::T, u, h, p, t) where T
229229
du[1] = (- h(t - T(1//5))[1] + u[1]) / oneunit(t)
230230
end
231231

@@ -258,7 +258,7 @@ prob_dde_1delay_long = build_prob_dde_1delay_long(1.0)
258258

259259
### Not in-place function
260260

261-
function f_1delay_long_notinplace(t::T, u, h) where {T}
261+
function f_1delay_long_notinplace(u::T, h, p, t) where T
262262
(- h(t - T(1//5)) .+ u ) ./ oneunit(t)
263263
end
264264

@@ -289,7 +289,7 @@ prob_dde_1delay_long_scalar_notinplace = build_prob_dde_1delay_long_scalar_notin
289289

290290
### In-place function
291291

292-
function f_2delays_long(t::T, u, h, du) where {T}
292+
function f_2delays_long(du::T, u, h, p, t) where T
293293
du[1] = (- h(t - T(1//3))[1] - h(t - T(1//5))[1]) / oneunit(t)
294294
end
295295

@@ -322,7 +322,7 @@ prob_dde_2delays_long = build_prob_dde_2delays_long(1.0)
322322

323323
### Not in-place function
324324

325-
function f_2delays_long_notinplace(t::T, u, h) where {T}
325+
function f_2delays_long_notinplace(u::T, h, p, t) where T
326326
(- h(t - T(1//3)) .- h(t - T(1//5))) ./ oneunit(t)
327327
end
328328

@@ -360,7 +360,7 @@ W.H. Enright and H. Hayashi, The evaluation of numerical software for delay
360360
differential equations.
361361
=#
362362

363-
function f_dde_mackey(t, u, h, du)
363+
function f_dde_mackey(du, u, h, p, t)
364364
du[1] = 0.2*h(t-14)[1]/(1 + h(t-14)[1]^10) - 0.1*u[1]
365365
end
366366

@@ -372,7 +372,7 @@ chaos in physiological control systems, 1977).
372372
"""
373373
prob_dde_mackey = DDEProblem(f_dde_mackey, t -> [0.5], [0.5], (0.0, 500.0), [14])
374374

375-
function f_dde_wheldon(t, u, h, du)
375+
function f_dde_wheldon(du, u, h, p, t)
376376
du[1] = 1.1/(1 + sqrt(10)*(h(t-20)[1])^(5/4)) - 10*u[1]/(1 + 40*u[2])
377377
du[2] = 100*u[1]/(1 + 40*u[2]) - 2.43*u[2]
378378
end
@@ -386,11 +386,11 @@ H. Finlay, Cyclical granulopoiesis in chronic granulocytic leukemia: A simulatio
386386
"""
387387
prob_dde_wheldon = DDEProblem(f_dde_wheldon, t -> u0_wheldon, u0_wheldon, (0., 100.), [20])
388388

389-
function f_dde_neves1(t, u, h, du)
389+
function f_dde_neves1(du, u, h, p, t)
390390
du[1] = 1 - h(exp(1-1/t))[1]
391391
end
392392
# only valid for specific history function
393-
function f_dde_neves1(::Type{Val{:analytic}}, t, u₀)
393+
function f_dde_neves1(::Type{Val{:analytic}}, u₀, p, t )
394394
0 < t 10 && u₀ == [log(0.1)] && return [log(t)]
395395
error("This analytical solution is only valid on (0, 10] and for history function ϕ(t) = ln(t) for 0 < t ≤ 0.1")
396396
end
@@ -404,15 +404,15 @@ of functional differential equations: An approach, 1975).
404404
prob_dde_neves_1 = DDEProblem(f_dde_neves1, t -> [log(t)], [log(0.1)], (0.1, 10.), [],
405405
[(t, u) -> t - exp(1 - 1/t)])
406406

407-
function f_dde_neves_thompson(t, u, h, du)
407+
function f_dde_neves_thompson(du, u, h, p, t)
408408
if h(t/2)[1] < 0
409409
du[1] = 1 - u[1]
410410
else
411411
du[1] = -1 - u[1]
412412
end
413413
end
414414
# only valid for specific history function
415-
function f_dde_neves_thompson(::Type{Val{:analytic}}, t, u₀)
415+
function f_dde_neves_thompson(::Type{Val{:analytic}}, u₀, p, t )
416416
if u₀ == [1]
417417
if 0 t 2*log(2)
418418
return [2*exp(-t) - 1]
@@ -449,7 +449,7 @@ for ``t \\leq 0``.
449449
prob_dde_neves_thompson = DDEProblem(f_dde_neves_thompson, t -> [1.], [1.], (0., 2*log(66)),
450450
[], [(t, u) -> t/2])
451451

452-
function f_dde_paul1(t, u, h, du)
452+
function f_dde_paul1(du, u, h, p, t)
453453
du[1] = - 2*h(t - 1 - abs(u[1]))[1]*(1 - u[1]^2)
454454
end
455455

@@ -474,7 +474,7 @@ for ``t \\leq 0``.
474474
prob_dde_paul1 = DDEProblem(f_dde_paul1, t -> [0.5], [0.5], (0., 30.), [],
475475
[(t, u) -> 1 + abs(u[1])])
476476

477-
function f_dde_paul2(t, u, h, du)
477+
function f_dde_paul2(du, u, h, p, t)
478478
h1 = h(t - u[2])[1]
479479
du[1] = -2*h1
480480
du[2] = (abs(h1) - abs(u[1]))/(1 + abs(h1))
@@ -489,7 +489,7 @@ prob_dde_paul2 = DDEProblem(f_dde_paul2, t -> [1; 0.5], [1; 0.5], (0., 30.), [],
489489
[(t, u) -> u[2]])
490490

491491
function build_prob_dde_mahaffy(tspan, h, σ₀, T₁, γ, Q, k, a, K, r)
492-
function f(t, u, h, du)
492+
function f(du, u, h, p, t)
493493
du[1] = σ₀*h(t-T₁)[2] - γ*u[1] - Q
494494
du[2] = a/(1 + K*u[1]^r) - k*u[2]
495495
du[3] = 1 - Q*exp*u[3])/(σ₀*h(t-T₁-u[3])[2])
@@ -517,13 +517,13 @@ M. C. Mackey, Hematopoietic model with moving boundary condition and state depen
517517
"""
518518
prob_dde_mahaffy1, prob_dde_mahaffy2
519519

520-
function f_dde_neves2(t, u, h, du)
520+
function f_dde_neves2(du, u, h, p, t)
521521
t2 = exp(1 - u[2])
522522
du[1] = u[2]
523523
du[2] = -h(t2)[2]*u[2]^2*t2
524524
end
525525
# only valid for specific history function
526-
function f_dde_neves2(::Type{Val{:analytic}}, t, u₀)
526+
function f_dde_neves2(::Type{Val{:analytic}}, u₀, p, t )
527527
0 < t 5 && u₀ == [log(0.1); 10] && return [log(t); 1/t]
528528
error("This analytical solution is only valid on (0, 5) and for history function ϕ(t) = [ln(t); 1/t] for 0 < t ≤ 0.1")
529529
end
@@ -538,7 +538,7 @@ prob_dde_neves2 = DDEProblem(f_dde_neves2, t -> [log(t); 1/t], [log(0.1); 10], (
538538
[], [(t, u) -> t - exp(1 - u[2])])
539539

540540
function build_f_dde_gatica(r₁, r₂, α, δ)
541-
function f_dde_gatica(t, u, h, du)
541+
function f_dde_gatica(du, u, h, p, t)
542542
u₁u₂ = u[1]*u[2]
543543
r₁u₁u₂ = r₁*u₁u₂
544544
r₂u₃ = r₂*u[3]
@@ -580,7 +580,7 @@ function build_prob_dde_qs(u₀, tspan, τ, D, γₛ, Kₘ, nₛ, a, αₐ, β
580580

581581
S₀ = u₀[1]
582582

583-
function f_dde_qs(t, u, h, du)
583+
function f_dde_qs(du, u, h, p, t)
584584
if u[1] < 0
585585
# eq. 1 and 2 not defined for u[1] < 0
586586
du[1] = 0

0 commit comments

Comments
 (0)