remove def checkerror

SciML · Nov 16, 2018 · e991a8f · e991a8f
1 parent ac6c3b2
commit e991a8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/integrators/integrator_utils.jl b/src/integrators/integrator_utils.jl
@@ -28,12 +28,6 @@ end
 last_step_failed(integrator::ODEIntegrator) =
   integrator.last_stepfail && !integrator.opts.adaptive
 
-@def ode_exit_conditions begin
-  if check_error!(integrator) != :Success
-    return integrator.sol
-  end
-end
-
 function modify_dt_for_tstops!(integrator)
   tstops = integrator.opts.tstops
   if !isempty(tstops)

diff --git a/src/solve.jl b/src/solve.jl
@@ -335,7 +335,9 @@ function DiffEqBase.solve!(integrator::ODEIntegrator)
   @inbounds while !isempty(integrator.opts.tstops)
     while integrator.tdir*integrator.t < integrator.tdir*top(integrator.opts.tstops)
       loopheader!(integrator)
-      @ode_exit_conditions
+      if check_error!(integrator) != :Success
+        return integrator.sol
+      end
       perform_step!(integrator,integrator.cache)
       loopfooter!(integrator)
       if isempty(integrator.opts.tstops)