simplifies eta and params/vars style within Problem()

FourierFlows · May 28, 2020 · 7dfb701 · 7dfb701
1 parent 7d6a4c8
commit 7dfb701
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/barotropicqgql.jl b/src/barotropicqgql.jl
@@ -60,15 +60,19 @@ function Problem(dev::Device=CPU();
   x, y = gridpoints(grid)
 
   # topographic PV
-  if eta==nothing
-    eta = zeros(dev, T, (nx, ny))
-  end
+  eta === nothing && ( eta = zeros(dev, T, (nx, ny)) )
 
-  params = !(typeof(eta)<:ArrayType(dev)) ? Params(grid, β, eta, μ, ν, nν, calcF) : Params(β, eta, rfft(eta), μ, ν, nν, calcF)
+  params = !(typeof(eta)<:ArrayType(dev)) ?
+           Params(grid, β, eta, μ, ν, nν, calcF) :
+           Params(β, eta, rfft(eta), μ, ν, nν, calcF)
 
-  vars = calcF == nothingfunction ? Vars(dev, grid) : (stochastic ? StochasticForcedVars(dev, grid) : ForcedVars(dev, grid))
+  vars = calcF == nothingfunction ?
+         Vars(dev, grid) : stochastic ?
+                           StochasticForcedVars(dev, grid) :
+                           ForcedVars(dev, grid)
 
   equation = BarotropicQGQL.Equation(params, grid)
+
   FourierFlows.Problem(equation, stepper, dt, grid, vars, params, dev)
 end