@unroll

CliMA · Nov 20, 2023 · 78d19f6 · 78d19f6
1 parent 114ef4a
commit 78d19f6
Show file tree

Hide file tree

Showing 4 changed files with 1,431 additions and 5 deletions.
diff --git a/Examples/testNHSphere.jl b/Examples/testNHSphere.jl
@@ -70,6 +70,7 @@ Stretch = parsed_args["Stretch"]
 StretchType = parsed_args["StretchType"]
 TopoS = parsed_args["TopoS"]
 GridType = parsed_args["GridType"]
+RadEarth = parsed_args["RadEarth"]
 # CG Element
 OrdPoly = parsed_args["OrdPoly"]
 # Viscosity
@@ -206,7 +207,7 @@ if RadEarth == 0.0
   RadEarth = Phys.RadEarth
 end
 
-Topography = (TopoS=TopoS,H=H,Rad=Phys.RadEarth)
+Topography = (TopoS=TopoS,H=H,Rad=RadEarth)
 
 @show "InitSphere"
 (CG, Metric, Exchange, Global) = DyCore.InitSphere(backend,FTB,OrdPoly,OrdPolyZ,nz,nPanel,H,

diff --git a/src/GPU/GPU.jl b/src/GPU/GPU.jl
@@ -6,6 +6,7 @@ import ..Grids
 using StaticArrays
 using KernelAbstractions
 using KernelAbstractions: @atomic, @atomicswap, @atomicreplace
+using KernelAbstractions.Extras
 
 include("OperatorKernel.jl")
 include("FcnGPU.jl")

diff --git a/src/GPU/OperatorKernel.jl b/src/GPU/OperatorKernel.jl
@@ -1012,7 +1012,6 @@ end
 @kernel function DivRhoKernel!(F,@Const(U),@Const(D),@Const(dXdxI),
   @Const(JJ),@Const(M),@Const(Glob))
 
-# gi, gj, gz, gF = @index(Group, NTuple)
   I, J, iz   = @index(Local, NTuple)
   _,_,Iz,IF = @index(Global, NTuple)
 
@@ -1046,9 +1045,10 @@ end
 
   if Iz <= Nz
     ID = I + (J - 1) * N  
-    @inbounds DivRho = D[I,1] * uConCol[1,J,iz] 
-    @inbounds DivRho += D[J,1] * vConCol[I,1,iz] 
-    for k = 2 : N
+#   @inbounds DivRho = D[I,1] * uConCol[1,J,iz] 
+#   @inbounds DivRho += D[J,1] * vConCol[I,1,iz] 
+    DivRho = eltype(F)(0)
+    @unroll for k = 1 : N
       @inbounds DivRho += D[I,k] * uConCol[k,J,iz] 
       @inbounds DivRho += D[J,k] * vConCol[I,k,iz] 
     end