Add VelocityVerlet related types

SciML · Jun 27, 2017 · 927b7ae · 927b7ae
1 parent 3ef4a73
commit 927b7ae
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/OrdinaryDiffEq.jl b/src/OrdinaryDiffEq.jl
@@ -95,7 +95,7 @@ module OrdinaryDiffEq
 
   export LawsonEuler, NorsettEuler
 
-  export SymplecticEuler
+  export SymplecticEuler, VelocityVerlet
 
   #export Verlet, VelocityVerlet
 

diff --git a/src/alg_utils.jl b/src/alg_utils.jl
@@ -15,6 +15,7 @@ isfsal(alg::NorsettEuler) = true
 isfsal(alg::Euler) = true
 isfsal(alg::SplitEuler) = true
 isfsal(alg::SymplecticEuler) = true
+isfsal(alg::VelocityVerlet) = true
 isfsal(alg::Midpoint) = true
 isfsal(alg::SSPRK22) = true
 isfsal(alg::SSPRK33) = true
@@ -80,6 +81,7 @@ alg_order(alg::LawsonEuler) = 1
 alg_order(alg::NorsettEuler) = 1
 alg_order(alg::SplitEuler) = 1
 alg_order(alg::SymplecticEuler) = 1
+alg_order(alg::VelocityVerlet) = 2
 alg_order(alg::Midpoint) = 2
 alg_order(alg::IIF1) = 1
 alg_order(alg::IIF2) = 2

diff --git a/src/algorithms.jl b/src/algorithms.jl
@@ -15,7 +15,7 @@ immutable SSPRK104 <: OrdinaryDiffEqAlgorithm end
 
 #immutable Verlet <: OrdinaryDiffEqAlgorithm end
 immutable SymplecticEuler <: OrdinaryDiffEqAlgorithm end
-#immutable VelocityVerlet <: OrdinaryDiffEqAdaptiveAlgorithm end
+immutable VelocityVerlet <: OrdinaryDiffEqAlgorithm end
 
 immutable SplitEuler <: OrdinaryDiffEqAlgorithm end
 

diff --git a/src/caches.jl b/src/caches.jl
@@ -91,6 +91,28 @@ immutable SymplecticEulerConstantCache <: OrdinaryDiffEqConstantCache end
 
 alg_cache(alg::SymplecticEuler,u,rate_prototype,uEltypeNoUnits,tTypeNoUnits,uprev,uprev2,f,t,::Type{Val{false}}) = SymplecticEulerConstantCache()
 
+immutable VelocityVerletCache{uType,rateType} <: OrdinaryDiffEqMutableCache
+  u::uType
+  uprev::uType
+  tmp::uType
+  k::rateType
+  fsalfirst::rateType
+end
+
+u_cache(c::VelocityVerletCache) = ()
+du_cache(c::VelocityVerletCache) = (c.k,c.fsalfirst)
+
+immutable VelocityVerletConstantCache <: OrdinaryDiffEqConstantCache end
+
+function alg_cache(alg::VelocityVerlet,u,rate_prototype,uEltypeNoUnits,tTypeNoUnits,uprev,uprev2,f,t,::Type{Val{true}})
+  tmp = similar(u)
+  k = zeros(rate_prototype)
+  fsalfirst = zeros(rate_prototype)
+  VelocityVerletCache(u,uprev,k,tmp,fsalfirst)
+end
+
+alg_cache(alg::VelocityVerlet,u,rate_prototype,uEltypeNoUnits,tTypeNoUnits,uprev,uprev2,f,t,::Type{Val{false}}) = VelocityVerletConstantCache()
+
 immutable MidpointCache{uType,rateType} <: OrdinaryDiffEqMutableCache
   u::uType
   uprev::uType