Skip to content

Commit

Permalink
Merge branch 'back'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisRackauckas committed Jun 8, 2017
2 parents a4c0aeb + cb818ca commit 5ba1e83
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/integrators/integrator_utils.jl
Expand Up @@ -113,12 +113,10 @@ end

@inline function loopfooter!(integrator::SDEIntegrator)
if integrator.opts.adaptive
EEst,beta1,q11,qold,beta2 = integrator.EEst, integrator.opts.beta1, integrator.q11,integrator.qold,integrator.opts.beta2
@fastmath q11 = EEst^beta1
@fastmath q = q11/(qold^beta2)
integrator.q11 = q11
@fastmath q = max(inv(integrator.opts.qmax),min(inv(integrator.opts.qmin),q/integrator.opts.gamma))
@fastmath dtnew = integrator.dt/q
@fastmath integrator.q11 = integrator.EEst^integrator.opts.beta1
@fastmath integrator.q = integrator.q11/(integrator.qold^integrator.opts.beta2)
@fastmath integrator.q = max(inv(integrator.opts.qmax),min(inv(integrator.opts.qmin),integrator.q/integrator.opts.gamma))
@fastmath integrator.dtnew = integrator.dt/integrator.q
ttmp = integrator.t + integrator.dt
integrator.isout = integrator.opts.isoutofdomain(ttmp,integrator.u)
integrator.accept_step = (!integrator.isout && integrator.EEst <= 1.0) || (integrator.opts.force_dtmin && integrator.dt <= integrator.opts.dtmin)
Expand Down

0 comments on commit 5ba1e83

Please sign in to comment.