puts back TwoGrid() in the default kwargs and correct grid variable name in Problem()

Author: navidcy

src/physics/traceradvdiff.jl

@@ -44,22 +44,19 @@ function ConstDiffProblem(;
       steadyflow = false
     else
       steadyflow = true
+      println("I'm here")
     end
   end
 
-  if grid == nothing; g = TwoDGrid(nx, Lx, ny, Ly)
-  else;               g = grid
-  end
-
-  if steadyflow; pr = TracerAdvDiff.ConstDiffSteadyFlowParams(eta, kap, u, v, g)
+  if steadyflow; pr = TracerAdvDiff.ConstDiffSteadyFlowParams(eta, kap, u, v, grid)
   else;          pr = TracerAdvDiff.ConstDiffParams(eta, kap, u, v)
   end
 
-  vs = TracerAdvDiff.Vars(g)
-  eq = TracerAdvDiff.Equation(pr, g)
-  ts = FourierFlows.autoconstructtimestepper(stepper, dt, eq.LC, g)
+  vs = TracerAdvDiff.Vars(grid)
+  eq = TracerAdvDiff.Equation(pr, grid)
+  ts = FourierFlows.autoconstructtimestepper(stepper, dt, eq.LC, grid)
 
-  FourierFlows.Problem(g, vs, pr, eq, ts)
+  FourierFlows.Problem(grid, vs, pr, eq, ts)
 end
 
 

test/test_traceradvdiff.jl

@@ -16,7 +16,7 @@ function test_constvel(stepper, dt, nsteps)
   u(x, y) = uvel
   v(x, y) = vvel
 
-  prob = TracerAdvDiff.Problem(; steadyflow=true, nx=nx, Lx=Lx, kap=0.0, u=u, v=v, dt=dt, stepper=stepper)
+  prob = TracerAdvDiff.Problem(; nx=nx, Lx=Lx, kap=0.0, u=u, v=v, dt=dt, stepper=stepper)
   s, v, p, g = prob.state, prob.vars, prob.params, prob.grid
 
   σ = 0.1
@@ -135,7 +135,6 @@ function test_hyperdiffusion(stepper, dt, tfinal; steadyflow = true)
       error("tfinal is not multiple of dt")
   end
 
-
    g = TwoDGrid(nx, Lx)
 
   u, v = 0*g.X, 0*g.X
@@ -182,4 +181,4 @@ dt, tfinal  = 0.005, 0.1
 @test test_diffusion(stepper, dt, tfinal; steadyflow=false)
 
 dt, tfinal  = 0.005, 0.1
-@test test_hyperdiffusion(stepper, dt, tfinal; steadyflow=true)
+@test test_hyperdiffusion(stepper, dt, tfinal)