refactor

src/systems/diffeqs/abstractodesystem.jl

@@ -1091,17 +1091,16 @@ function DiffEqBase.ODEProblem{iip, specialize}(sys::AbstractODESystem, u0map =
     if has_discrete_subsystems(sys) && (dss = get_discrete_subsystems(sys)) !== nothing
         affects, inits, clocks, svs = ModelingToolkit.generate_discrete_affect(sys, dss...)
         discrete_cbs = map(affects, clocks, svs) do affect, clock, sv
+            daffect = DiscreteSaveAffect(affect, sv)
             if clock isa Clock
-                PeriodicCallback(DiscreteSaveAffect(affect, sv), clock.dt;
+                PeriodicCallback(daffect, clock.dt;
                     final_affect = true, initial_affect = true)
             elseif clock isa SolverStepClock
-                affect = DiscreteSaveAffect(affect, sv)
-                DiscreteCallback(Returns(true), affect,
-                    initialize = (c, u, t, integrator) -> affect(integrator))
+                DiscreteCallback(Returns(true), daffect,
+                    initialize = (c, u, t, integrator) -> daffect(integrator))
             elseif clock isa EventClock
                 tempsys = @set sys.continuous_events = [SymbolicContinuousCallback(clock.cond)]
                 cb = generate_rootfinding_callback(tempsys)
-                daffect = DiscreteSaveAffect(affect, sv)
                 @set! cb.affect! = daffect
                 @set! cb.affect_neg! = daffect
                 cb

test/clock.jl

@@ -561,17 +561,17 @@ end
         c2 = ModelingToolkit.EventClock(t, fo.x ~ 0.1)
     end
     @equations begin
-        # counter.u ~ Sample(c2)(fo.x)
-        counter.u ~ Sample(t, 0.1)(fo.x)
+        counter.u ~ Sample(c2)(fo.x)
+        # counter.u ~ Sample(t, 0.1)(fo.x)
     end
 end
 
 @mtkbuild model = FirstOrderWithCrossingCounter()
-prob = ODEProblem(model, [], (0.0, 30.0))
+prob = ODEProblem(model, [model.counter.count(k - 1)=>0], (0.0, 30.0))
 sol = solve(prob, Tsit5(), kwargshandle = KeywordArgSilent)
 
-@test all(x -> isapprox(0.1, x[], rtol = 1e-6),
-    sol.prob.kwargs[:disc_saved_values][1].saveval[2:end]) # omit first value due to initial value of count in count(k+1) ~ u
+@test_broken all(x -> isapprox(0.1, x[], rtol = 1e-6),
+    sol.prob.kwargs[:disc_saved_values][1].saveval)  # Values are not saved
 @test length(sol.prob.kwargs[:disc_saved_values][1].t) == 10 # number of crossings of 0.1
 
 # plot(sol)