Get all passing

Author: ChrisRackauckas

lib/OrdinaryDiffEqCore/ext/OrdinaryDiffEqCoreEnzymeCoreExt.jl

@@ -6,7 +6,7 @@ function EnzymeCore.EnzymeRules.inactive_noinl(
     true
 end
 function EnzymeCore.EnzymeRules.inactive_noinl(
-        ::typeof(OrdinaryDiffEqCore.fixed_t_for_floatingpoint_error!), args...)
+        ::typeof(OrdinaryDiffEqCore.fixed_t_for_tstop_error!), args...)
     true
 end
 function EnzymeCore.EnzymeRules.inactive_noinl(

lib/OrdinaryDiffEqCore/ext/OrdinaryDiffEqCoreMooncakeExt.jl

@@ -8,7 +8,7 @@ Mooncake.@zero_adjoint Mooncake.MinimalCtx Tuple{
 Mooncake.@zero_adjoint Mooncake.MinimalCtx Tuple{
     typeof(OrdinaryDiffEqCore.SciMLBase.check_error), Any}
 Mooncake.@zero_adjoint Mooncake.MinimalCtx Tuple{
-    typeof(OrdinaryDiffEqCore.fixed_t_for_floatingpoint_error!), Any, Any}
+    typeof(OrdinaryDiffEqCore.fixed_t_for_tstop_error!), Any, Any}
 Mooncake.@zero_adjoint Mooncake.MinimalCtx Tuple{
     typeof(OrdinaryDiffEqCore.final_progress), Any}
 

lib/OrdinaryDiffEqCore/src/integrators/integrator_utils.jl

@@ -73,6 +73,10 @@ function last_step_failed(integrator::ODEIntegrator)
 end
 
 function modify_dt_for_tstops!(integrator)
+    integrator.t, integrator.dt
+    tdir_tstop = first_tstop(integrator)
+    distance_to_tstop = abs(tdir_tstop - integrator.tdir * integrator.t)
+
     if has_tstop(integrator)
         tdir_t = integrator.tdir * integrator.t
         tdir_tstop = first_tstop(integrator)
@@ -82,6 +86,7 @@ function modify_dt_for_tstops!(integrator)
         original_dt = abs(integrator.dt)
 
         if integrator.opts.adaptive
+            integrator.dtpropose = original_dt
             if original_dt < distance_to_tstop
                 # Normal step, no tstop interference
                 integrator.next_step_tstop = false
@@ -124,7 +129,7 @@ function handle_tstop_step!(integrator)
         perform_step!(integrator, integrator.cache)
     end
 
-    # Flag will be reset in fixed_t_for_floatingpoint_error! when t is updated
+    # Flag will be reset in fixed_t_for_tstop_error! when t is updated
 end
 
 # Want to extend savevalues! for DDEIntegrator
@@ -186,7 +191,6 @@ function _savevalues!(integrator, force_save, reduce_size)::Tuple{Bool, Bool}
     end
     if force_save || (integrator.opts.save_everystep &&
         (isempty(integrator.sol.t) ||
-         (integrator.t !== integrator.sol.t[end]) &&
          (integrator.opts.save_end || integrator.t !== integrator.sol.prob.tspan[2])
     ))
         integrator.saveiter += 1
@@ -311,12 +315,20 @@ function _loopfooter!(integrator)
         if integrator.accept_step # Accept
             increment_accept!(integrator.stats)
             integrator.last_stepfail = false
+            integrator.tprev = integrator.t
+
+            if integrator.next_step_tstop
+                # Step controller dt is overly pessimistic, since dt = time to tstop
+                # For example, if super dense time, dt = eps(t), so the next step is tiny
+                # Thus if snap to tstop, let the step controller assume dt was the pre-fixed version
+                integrator.dt = integrator.dtpropose
+            end
+            integrator.t = fixed_t_for_tstop_error!(integrator, ttmp)
+            
             dtnew = DiffEqBase.value(step_accept_controller!(integrator,
                 integrator.alg,
                 q)) *
                     oneunit(integrator.dt)
-            integrator.tprev = integrator.t
-            integrator.t = fixed_t_for_floatingpoint_error!(integrator, ttmp)
             calc_dt_propose!(integrator, dtnew)
             handle_callbacks!(integrator)
         else # Reject
@@ -325,7 +337,7 @@ function _loopfooter!(integrator)
     elseif !integrator.opts.adaptive #Not adaptive
         increment_accept!(integrator.stats)
         integrator.tprev = integrator.t
-        integrator.t = fixed_t_for_floatingpoint_error!(integrator, ttmp)
+        integrator.t = fixed_t_for_tstop_error!(integrator, ttmp)
         integrator.last_stepfail = false
         integrator.accept_step = true
         integrator.dtpropose = integrator.dt
@@ -364,7 +376,7 @@ function log_step!(progress_name, progress_id, progress_message, dt, u, p, t, ts
         progress=(t-t1)/(t2-t1))
 end
 
-function fixed_t_for_floatingpoint_error!(integrator, ttmp)
+function fixed_t_for_tstop_error!(integrator, ttmp)
     # If we're in tstop snap mode, use exact tstop target
     if integrator.next_step_tstop
         # Reset the flag now that we're snapping to tstop
@@ -501,10 +513,7 @@ function handle_tstop!(integrator)
         tdir_t = integrator.tdir * integrator.t
         tdir_tstop = first_tstop(integrator)
         if tdir_t == tdir_tstop
-            while tdir_t == tdir_tstop #remove all redundant copies
-                res = pop_tstop!(integrator)
-                has_tstop(integrator) ? (tdir_tstop = first_tstop(integrator)) : break
-            end
+            res = pop_tstop!(integrator)
             integrator.just_hit_tstop = true
         elseif tdir_t > tdir_tstop
             if !integrator.dtchangeable

lib/OrdinaryDiffEqCore/src/solve.jl

@@ -506,7 +506,7 @@ function SciMLBase.__init(
     next_step_tstop = false
     tstop_target = zero(t)
     isout = false
-    accept_step = false
+    accept_step = true
     force_stepfail = false
     last_stepfail = false
     do_error_check = true
@@ -605,7 +605,8 @@ end
 
 function SciMLBase.solve!(integrator::ODEIntegrator)
     @inbounds while !isempty(integrator.opts.tstops)
-        while integrator.tdir * integrator.t < first(integrator.opts.tstops)
+        first_tstop = first(integrator.opts.tstops)
+        while integrator.tdir * integrator.t <= first_tstop
             loopheader!(integrator)
             if integrator.do_error_check && check_error!(integrator) != ReturnCode.Success
                 return integrator.sol
@@ -617,9 +618,11 @@ function SciMLBase.solve!(integrator::ODEIntegrator)
             else
                 perform_step!(integrator, integrator.cache)
             end
-            
+
+            should_exit = integrator.next_step_tstop
+
             loopfooter!(integrator)
-            if isempty(integrator.opts.tstops)
+            if isempty(integrator.opts.tstops) || should_exit
                 break
             end
         end
@@ -671,11 +674,11 @@ end
 
     for t in tstops
         tdir_t = tdir * t
-        tdir_t0 < tdir_t ≤ tdir_tf && push!(tstops_internal, tdir_t)
+        tdir_t0 < tdir_t < tdir_tf && push!(tstops_internal, tdir_t)
     end
     for t in d_discontinuities
         tdir_t = tdir * t
-        tdir_t0 < tdir_t ≤ tdir_tf && push!(tstops_internal, tdir_t)
+        tdir_t0 < tdir_t < tdir_tf && push!(tstops_internal, tdir_t)
     end
     push!(tstops_internal, tdir_tf)