adds CuTwoDTurb back

FourierFlows · Jul 28, 2018 · e681ee0 · e681ee0
1 parent a38a937
commit e681ee0
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/src/physics/twodturb.jl b/src/physics/twodturb.jl
@@ -107,33 +107,33 @@ end
 # CUDA functionality
 # ------------------
 
-# @require CuArrays begin
-#
-# using CuArrays
-#
-# function CuProblem(; stepper="RK4", kwargs...)
-#   prob = Problem(; kwargs...)
-#   dt = prob.ts.dt
-#
-#    g = CuTwoDGrid(prob.grid)
-#   vs = CuVars(prob.vars)
-#   eq = CuEquation(prob.eqn)
-#   ts = FourierFlows.autoconstructtimestepper(stepper, dt, eq.LC, g)
-#
-#   FourierFlows.CuProblem(g, vs, prob.params, eq, ts)
-# end
-#
-# eval(FourierFlows.structvarsexpr(:CuVars, physicalvars, transformvars, arraytype=:CuArray))
-# eval(FourierFlows.structvarsexpr(:CuForcedVars, physicalvars, transformvars, arraytype=:CuArray))
-#
-# CuVars(v::Vars) = CuVars(getfield.(v, fieldnames(v))...)
-# CuVars(v::ForcedVars) = CuForcedVars(getfield.(v, fieldnames(v))...)
-# CuVars(g::AbstractGrid) = CuVars(Vars(g))
-#
-# CuForcedVars(v::Vars) = CuForcedVars(getfield.(v, fieldnames(v))...)
-# CuForcedVars(g::AbstractGrid) = CuForcedVars(ForcedVars(g))
-#
-# end # CUDA stuff
+@require CuArrays begin
+
+using CuArrays
+
+function CuProblem(; stepper="RK4", kwargs...)
+  prob = Problem(; kwargs...)
+  dt = prob.ts.dt
+
+   g = CuTwoDGrid(prob.grid)
+  vs = CuVars(prob.vars)
+  eq = CuEquation(prob.eqn)
+  ts = FourierFlows.autoconstructtimestepper(stepper, dt, eq.LC, g)
+
+  FourierFlows.CuProblem(g, vs, prob.params, eq, ts)
+end
+
+eval(FourierFlows.structvarsexpr(:CuVars, physicalvars, transformvars, arraytype=:CuArray))
+eval(FourierFlows.structvarsexpr(:CuForcedVars, physicalvars, transformvars, arraytype=:CuArray))
+
+CuVars(v::Vars) = CuVars(getfield.(v, fieldnames(v))...)
+CuVars(v::ForcedVars) = CuForcedVars(getfield.(v, fieldnames(v))...)
+CuVars(g::AbstractGrid) = CuVars(Vars(g))
+
+CuForcedVars(v::Vars) = CuForcedVars(getfield.(v, fieldnames(v))...)
+CuForcedVars(g::AbstractGrid) = CuForcedVars(ForcedVars(g))
+
+end # CUDA stuff
 
 
 # -------