Merge pull request #189 from devmotion/eps

Fix eps() for types with units

Author: ChrisRackauckas

src/integrators/integrator_utils.jl

@@ -260,9 +260,10 @@ function loopfooter!(integrator)
       integrator.last_stepfail = false
       dtnew = step_accept_controller!(integrator,integrator.alg,q)
       integrator.tprev = integrator.t
-      if typeof(integrator.t)<:AbstractFloat && !isempty(integrator.opts.tstops)
+      # integrator.EEst has unitless type of integrator.t
+      if typeof(integrator.EEst)<: AbstractFloat && !isempty(integrator.opts.tstops)
         tstop = top(integrator.opts.tstops)
-        abs(ttmp - tstop) < 10eps(integrator.t) ? (integrator.t = tstop) : (integrator.t = ttmp)
+        abs(ttmp - tstop) < 10eps(integrator.EEst)*oneunit(integrator.t) ? (integrator.t = tstop) : (integrator.t = ttmp)
       else
         integrator.t = ttmp
       end
@@ -271,9 +272,10 @@ function loopfooter!(integrator)
     end
   elseif !integrator.opts.adaptive #Not adaptive
     integrator.tprev = integrator.t
-    if typeof(integrator.t)<:AbstractFloat && !isempty(integrator.opts.tstops)
+    # integrator.EEst has unitless type of integrator.t
+    if typeof(integrator.EEst)<: AbstractFloat && !isempty(integrator.opts.tstops)
       tstop = top(integrator.opts.tstops)
-      abs(ttmp - tstop) < 10eps(integrator.t) ? (integrator.t = tstop) : (integrator.t = ttmp)
+      abs(ttmp - tstop) < 10eps(integrator.EEst)*oneunit(integrator.t) ? (integrator.t = tstop) : (integrator.t = ttmp)
     else
       integrator.t = ttmp
     end