From d435290b0785fef559795455ed7c8f6335e124ca Mon Sep 17 00:00:00 2001 From: Kanav Gupta Date: Tue, 16 Jul 2019 02:16:13 +0530 Subject: [PATCH] silly mistakes --- src/caches/kencarp_kvaerno_caches.jl | 2 +- src/perform_step/sdirk_perform_step.jl | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/caches/kencarp_kvaerno_caches.jl b/src/caches/kencarp_kvaerno_caches.jl index 08cbdae6f8..d46bd436c4 100644 --- a/src/caches/kencarp_kvaerno_caches.jl +++ b/src/caches/kencarp_kvaerno_caches.jl @@ -64,7 +64,7 @@ function alg_cache(alg::Kvaerno4,u,rate_prototype,uEltypeNoUnits,uBottomEltypeNo γ, c = tab.γ, tab.c3 J, W = oop_generate_W(alg,u,uprev,p,t,dt,f,uEltypeNoUnits) nlsolver = oopnlsolve(alg,u,uprev,p,t,dt,f,W,J,rate_prototype,uEltypeNoUnits,uBottomEltypeNoUnits,γ,c) - Kvaerno4ConstantCache(uf,nlsolver,tab) + Kvaerno4ConstantCache(nlsolver,tab) end @cache mutable struct Kvaerno4Cache{uType,rateType,uNoUnitsType,N,Tab} <: SDIRKMutableCache diff --git a/src/perform_step/sdirk_perform_step.jl b/src/perform_step/sdirk_perform_step.jl index 7fd7507853..bb1727c0f9 100644 --- a/src/perform_step/sdirk_perform_step.jl +++ b/src/perform_step/sdirk_perform_step.jl @@ -373,23 +373,20 @@ end # TODO: Add extrapolation @.. zᵧ = zprev - nlsolver.z = zᵧ - + z .= zᵧ @.. tmp = uprev + d*zprev nlsolver.c = γ - zᵧ = nlsolve!(integrator, cache) + zᵧ .= nlsolve!(integrator, cache) nlsolvefail(nlsolver) && return ################################## Solve BDF2 Step ### Initial Guess From Shampine @.. z = α1*zprev + α2*zᵧ - nlsolver.z = z - @.. tmp = uprev + ω*zprev + ω*zᵧ nlsolver.c = 1 set_new_W!(nlsolver, false) - z = nlsolve!(integrator, cache) + nlsolve!(integrator, cache) nlsolvefail(nlsolver) && return @.. u = tmp + d*z