increases coverage in TwoDTurb

FourierFlows · Sep 5, 2019 · 9204ca7 · 9204ca7
1 parent 51d6f73
commit 9204ca7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/test/test_twodturb.jl b/test/test_twodturb.jl
@@ -186,25 +186,30 @@ function test_twodturb_energyenstrophy()
   nx, Lx  = 128, 2π
   ny, Ly  = 128, 3π
   gr = TwoDGrid(nx, Lx, ny, Ly)
-  k0, l0 = gr.k[2], gr.l[2] # fundamental wavenumbers
   x, y = gridpoints(gr)
 
+  k0, l0 = gr.k[2], gr.l[2] # fundamental wavenumbers
     psi0 = @. sin(2k0*x)*cos(2l0*y) + 2sin(k0*x)*cos(3l0*y)
    zeta0 = @. -((2k0)^2+(2l0)^2)*sin(2k0*x)*cos(2l0*y) - (k0^2+(3l0)^2)*2sin(k0*x)*cos(3l0*y)
 
   energy_calc = 29/9
   enstrophy_calc = 2701/162
 
   prob = TwoDTurb.Problem(nx=nx, Lx=Lx, ny=ny, Ly=Ly, stepper="ForwardEuler")
+
+  sol, cl, v, p, g = prob.sol, prob.clock, prob.vars, prob.params, prob.grid;
 
   TwoDTurb.set_zeta!(prob, zeta0)
   TwoDTurb.updatevars!(prob)
 
   energyzeta0 = TwoDTurb.energy(prob)
   enstrophyzeta0 = TwoDTurb.enstrophy(prob)
+
+  params = TwoDTurb.Params(p.ν, p.nν)
 
-  (isapprox(energyzeta0, 29.0/9, rtol=rtol_twodturb) &&
-   isapprox(enstrophyzeta0, 2701.0/162, rtol=rtol_twodturb))
+  (isapprox(energyzeta0, energy_calc, rtol=rtol_twodturb) &&
+   isapprox(enstrophyzeta0, enstrophy_calc, rtol=rtol_twodturb) &&
+   TwoDTurb.addforcing!(prob.timestepper.N, sol, cl.t, cl, v, p, g)==nothing && p == params)
 end
 
 function test_twodturb_problemtype(T=Float32)