compatible with diffeq operator

Author: ChrisRackauckas

src/integrators/exponential_rk_integrators.jl

@@ -1,14 +1,14 @@
 @inline function initialize!(integrator,cache::LawsonEulerConstantCache,f=integrator.f)
   integrator.kshortsize = 2
   integrator.k = eltype(integrator.sol.k)(integrator.kshortsize)
-  rtmp = f[2](integrator.t,integrator.uprev)
+  rtmp = f[2]
   integrator.fsalfirst = rtmp # Pre-start fsal
 end
 
 @inline function perform_step!(integrator,cache::LawsonEulerConstantCache,f=integrator.f)
   @unpack t,dt,uprev,u,k = integrator
   rtmp = integrator.fsalfirst
-  A = f[1](t,u)
+  A = f[1]
   u = expm(dt*A)*(uprev + dt*rtmp)
   rtmp = f[2](t+dt,u)
   k = A*u + rtmp # For the interpolation, needs k at the updated point
@@ -26,7 +26,7 @@ end
   integrator.k = eltype(integrator.sol.k)(integrator.kshortsize)
   integrator.k[1] = fsalfirst # this is wrong, since it's just rtmp. Should fsal this value though
   integrator.k[2] = k
-  A = f[1](integrator.t,integrator.u,rtmp)
+  A = f[1]
   A_mul_B!(cache.k,A,integrator.u)
   f[2](integrator.t,integrator.uprev,rtmp) # For the interpolation, needs k at the updated point
   integrator.fsalfirst .= cache.k .+ rtmp
@@ -35,7 +35,7 @@ end
 @inline function perform_step!(integrator,cache::LawsonEulerCache,f=integrator.f)
   @unpack t,dt,uprev,u = integrator
   @unpack k,rtmp,tmp = cache
-  A = f[1](t,u,integrator.fsalfirst)
+  A = f[1]
   M = expm(dt*A)
   tmp .= uprev .+ dt.*integrator.fsalfirst
   A_mul_B!(u,M,tmp)
@@ -55,7 +55,7 @@ end
 @inline function perform_step!(integrator,cache::NorsettEulerConstantCache,f=integrator.f)
   @unpack t,dt,uprev,u,k = integrator
   rtmp = integrator.fsalfirst
-  A = f[1](t,u)
+  A = f[1]
   u = uprev + ((expm(dt*A)-I)/A)*(A*uprev + rtmp)
   rtmp = f[2](t+dt,u)
   k = A*u + rtmp # For the interpolation, needs k at the updated point
@@ -82,7 +82,7 @@ end
 @inline function perform_step!(integrator,cache::NorsettEulerCache,f=integrator.f)
   @unpack t,dt,uprev,u = integrator
   @unpack k,rtmp,tmp = cache
-  A = f[1](t,u,integrator.fsalfirst)
+  A = f[1]
   M = ((expm(dt*A)-I)/A)
   A_mul_B!(tmp,A,uprev)
   tmp .+= rtmp

src/integrators/iif_integrators.jl

@@ -33,7 +33,7 @@ end
   @unpack uhold,rhs,nl_rhs = cache
 
   # If adaptive, this should be computed after and cached
-  A = integrator.f[1](t,u)
+  A = integrator.f[1]
   if typeof(cache) <: IIF1ConstantCache
     tmp = expm(A*dt)*(uprev)
   elseif typeof(cache) <: IIF2ConstantCache
@@ -91,7 +91,7 @@ end
   integrator.fsallast = cache.k
   integrator.kshortsize = 2
   integrator.k = eltype(integrator.sol.k)(integrator.kshortsize)
-  A = integrator.f[1](integrator.t,integrator.u,cache.rtmp1)
+  A = integrator.f[1]
   f[2](integrator.t,integrator.uprev,cache.rtmp1)
   A_mul_B!(cache.k,A,integrator.uprev)
   integrator.fsalfirst .= cache.k .+ cache.rtmp1
@@ -109,7 +109,7 @@ end
     @. k += 0.5dt*rtmp1
   end
 
-  A = integrator.f[1](t,uprev,rtmp1)
+  A = integrator.f[1]
   M = expm(A*dt)
   A_mul_B!(tmp,M,k)
 

test/linear_nonlinear_convergence_tests.jl

@@ -1,7 +1,7 @@
 using DiffEqBase, OrdinaryDiffEq, Base.Test, DiffEqDevTools, SpecialMatrices
 const μ = 1.01
 f2 = (t,u) -> μ * u
-f1 = (t,u) -> μ
+f1 = μ
 (p::typeof(f1))(::Type{Val{:analytic}},t,u0) = u0.*exp.(2μ*t)
 
 prob = SplitODEProblem((f1,f2),1/2,(0.0,1.0))
@@ -19,7 +19,7 @@ sim  = test_convergence(dts,prob,NorsettEuler())
 
 u0 = rand(2)
 A = Strang(2)
-f1 = (t,u,du) -> A
+f1 = A
 f2 = (t,u,du) -> du .= μ .* u
 function (p::typeof(f1))(::Type{Val{:analytic}},t,u0)
  tmp = (A+μ*I)*t