Merge pull request #192 from FourierFlows/ncc/use-on_grid-barotropicqgql

Use FourierFlows.on_grid() in BarotropicQGQL
FourierFlows · Jan 28, 2021 · 4fb7c56 · 4fb7c56
2 parents ab5ed34 + a52bf99
commit 4fb7c56
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/barotropicqgql.jl b/src/barotropicqgql.jl
@@ -98,10 +98,9 @@ end
 Constructor for `params` that accepts a generating function for the topographic PV, `eta`.
 """
 function Params(grid::AbstractGrid{T, A}, β, eta::Function, μ, ν, nν, calcF) where {T, A}
-  x, y = gridpoints(grid)
-  eta_on_grid = A([eta(grid.x[i], grid.y[j]) for i=1:grid.nx, j=1:grid.ny])
+  eta_on_grid = FourierFlows.on_grid(eta, grid)
   etah_on_grid = rfft(eta_on_grid)
-  Params(β, eta_on_grid, etah_on_grid, μ, ν, nν, calcF)
+  Params(β, A(eta_on_grid), A(etah_on_grid), μ, ν, nν, calcF)
 end