Horizontal limiter included

CliMA · Jul 7, 2024 · fec93ef · fec93ef
1 parent 11a8880
commit fec93ef
Show file tree

Hide file tree

Showing 7 changed files with 433 additions and 30 deletions.
diff --git a/AA b/AA
@@ -0,0 +1,174 @@
+@kernel inbounds = true function DivRhoTrUpwind3LimKernel!(FTr,@Const(Tr),@Const(U),@Const(D),@Const(dXdxI),
+  @Const(JJ),@Const(M),@Const(Glob),dt,@Const(w),@Const(qMin),@Const(qMax),@Const(Stencil))
+
+# gi, gj, gz, gF = @index(Group, NTuple)
+  I, J, iz   = @index(Local, NTuple)
+  _,_,Iz,IF = @index(Global, NTuple)
+
+  ColumnTilesDim = @uniform @groupsize()[3]
+  N = @uniform @groupsize()[1]
+  Nz = @uniform @ndrange()[3]
+  NF = @uniform @ndrange()[4]
+
+  @uniform l0  = eltype(FTr)(0)
+  @uniform eta = eltype(FTr)(1.e-12)
+  @uniform dlFD = eltype(FTr)(1.e-8)
+
+
+  cCol = @localmem eltype(FTr) (N,N, ColumnTilesDim+3)
+  uConCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  vConCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  DivRhoTr = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  DivRho = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  RhoTrColS = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  RhoColS = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  q = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  resp = @localmem eltype(FTr) (ColumnTilesDim)
+  resc = @localmem eltype(FTr) (ColumnTilesDim)
+  alpha = @localmem eltype(FTr) (ColumnTilesDim)
+  lp = @localmem eltype(FTr) (ColumnTilesDim)
+  lc = @localmem eltype(FTr) (ColumnTilesDim)
+  sumJ = @localmem eltype(FTr) (ColumnTilesDim)
+  qMinS = @localmem eltype(FTr) (ColumnTilesDim)
+  qMaxS = @localmem eltype(FTr) (ColumnTilesDim)
+  conv = @localmem (Bool) (ColumnTilesDim)
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    cCol[I,J,iz+1] = Tr[Iz,ind] / U[Iz,ind,1]
+    @views (uCon, vCon) = Contra12(-U[Iz,ind,1],U[Iz,ind,2],U[Iz,ind,3],dXdxI[1:2,1:2,:,ID,Iz,IF])
+    uConCol[I,J,iz] = uCon
+    vConCol[I,J,iz] = vCon
+    if ID == 1
+      resp[iz] = eltype(FTr)(0)  
+      resc[iz] = eltype(FTr)(0)  
+      sumJ[iz] = eltype(FTr)(0)  
+      conv[iz] = true
+      qMinS[iz] = qMin[Iz,Stencil[IF,1]]
+      qMaxS[iz] = qMax[Iz,Stencil[IF,1]]
+      for iS = 2 : 13
+        qMinS[iz] = min(qMin[Iz,Stencil[IF,iS]],qMinS[iz])
+        qMaxS[iz] = max(qMax[Iz,Stencil[IF,iS]],qMaxS[iz])
+      end
+    end  
+  end
+  if iz == 1
+    Izm1 = max(Iz - 1,1)
+    cCol[I,J,iz] = Tr[Izm1,ind] / U[Izm1,ind,1]
+  end
+  if iz == ColumnTilesDim || Iz == Nz
+    Izp1 = min(Iz + 1,Nz)
+    cCol[I,J,iz+2] = Tr[Izp1,ind] / U[Izp1,ind,1]
+    Izp2 = min(Iz + 2,Nz)
+    cCol[I,J,iz+3] = Tr[Izp2,ind] / U[Izp2,ind,1]
+  end
+  @synchronize
+
+  if Iz <= Nz 
+    ID = I + (J - 1) * N  
+    @atomic :monotonic sumJ[iz] += JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]  
+  end
+  @synchronize
+
+  if Iz < Nz 
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    cLL = cCol[I,J,iz]
+    cL = cCol[I,J,iz+1]
+    cR = cCol[I,J,iz+2]
+    cRR = cCol[I,J,iz+3]
+
+    @views wCon = Contra3(U[Iz:Iz+1,ind,1],U[Iz:Iz+1,ind,2],U[Iz:Iz+1,ind,3],
+      U[Iz,ind,4],dXdxI[3,:,:,ID,Iz:Iz+1,IF])
+
+    Izm1 = max(Iz - 1,1)
+    Izp2 = min(Iz + 2, Nz)
+    JLL = JJ[ID,1,Izm1,IF] + JJ[ID,2,Izm1,IF]
+    JL = JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]
+    JR = JJ[ID,1,Iz+1,IF] + JJ[ID,2,Iz+1,IF]
+    JRR = JJ[ID,1,Izp2,IF] + JJ[ID,2,Izp2,IF]
+    cFL, cFR = RecU4(cLL,cL,cR,cRR,JLL,JL,JR,JRR) 
+    Flux = eltype(FTr)(0.25) * ((abs(wCon) + wCon) * cFL + (-abs(wCon) + wCon) * cFR)
+    @atomic :monotonic FTr[Iz,ind] += -Flux / M[Iz,ind]
+    @atomic :monotonic FTr[Iz+1,ind] += Flux / M[Iz+1,ind]
+  end 
+
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    DivRhoTr[I,J,iz] = D[I,1] * uConCol[1,J,iz] * cCol[1,J,iz+1] 
+    DivRhoTr[I,J,iz] += D[J,1] * vConCol[I,1,iz] * cCol[I,1,iz+1]
+    DivRho[I,J,iz] = D[I,1] * uConCol[1,J,iz]
+    DivRho[I,J,iz] += D[J,1] * vConCol[I,1,iz]
+    for k = 2 : N
+      DivRhoTr[I,J,iz] += D[I,k] * uConCol[k,J,iz] * cCol[k,J,iz+1] 
+      DivRhoTr[I,J,iz] += D[J,k] * vConCol[I,k,iz] * cCol[I,k,iz+1]
+      DivRho[I,J,iz] += D[I,k] * uConCol[k,J,iz]
+      DivRho[I,J,iz] += D[J,k] * vConCol[I,k,iz]
+    end
+    ind = Glob[ID,IF]
+    RhoTrColS[I,J,iz] = Tr[Iz,ind] + dt * DivRhoTr[I,J,iz] / (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF])
+    RhoColS[I,J,iz] = U[Iz,ind,1] + dt * DivRho[I,J,iz] / (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF])
+    #   Finite difference step
+    q[I,J,iz] = medianGPU(qMinS[iz], RhoTrColS[I,J,iz] / RhoColS[I,J,iz] +
+      l0,  qMaxS[iz])
+    @atomic :monotonic resp[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] * 
+      (q[I,J,iz] * RhoColS[I,J,iz] - RhoTrColS[I,J,iz])
+  end
+  @synchronize
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    if abs(resp[iz]) <= eta 
+      if ID == 1
+        conv[iz] = false
+      end  
+    else
+      qLoc = medianGPU(qMinS[iz],  RhoTrColS[I,J,iz] / RhoColS[I,J,iz] + 
+        (l0 + dlFD),  qMaxS[iz])
+      @atomic :monotonic resc[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] * 
+        (qLoc * RhoColS[I,J,iz]  - RhoTrColS[I,J,iz])  
+    end
+  end
+  @synchronize
+
+  if Iz <= Nz && I == 1 && J == 1 && conv[iz]
+    if abs(resc[iz] - resp[iz]) <= eltype(FTr)(1.e-13)
+      conv[iz] = false
+    else
+      alpha[iz] = dlFD / (resc[iz] - resp[iz])
+      lp[iz] = l0
+      lc[iz] = lp[iz] - alpha[iz] * resp[iz]
+      resp[iz] = eltype(FTr)(0)
+      resc[iz] = eltype(FTr)(0)
+    end
+  end  
+  @synchronize
+  for iTer = 1 : 8
+    if Iz <= Nz && conv[iz]
+      ID = I + (J - 1) * N  
+      q[I,J,iz] = medianGPU(qMinS[iz], RhoTrColS[I,J,iz] / RhoColS[I,J,iz] +
+        lc[iz],  qMaxS[iz])
+      @atomic :monotonic resc[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] *
+        (q[I,J,iz] * RhoColS[I,J,iz] - RhoTrColS[I,J,iz])
+    end  
+    @synchronize
+    if Iz <= Nz && I == 1 && J == 1 && conv[iz]
+      if abs(resc[iz] - resp[iz]) <= eltype(FTr)(1.e-13) 
+        conv[iz] = false
+      else  
+        alpha[iz] = (lp[iz] - lc[iz]) / (resp[iz] - resc[iz])
+        resp[iz] = resc[iz]
+        lp[iz] = lc[iz]
+        lc[iz] = lc[iz] - alpha[iz] * resc[iz]
+        resc[iz] = eltype(FTr)(0)  
+      end  
+    end  
+    @synchronize
+  end
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    @show Iz,ind,q[I,J,iz],RhoColS[I,J,iz]
+    @atomic :monotonic FTr[Iz,ind] += (q[I,J,iz] * RhoColS[I,J,iz] - Tr[Iz,ind]) *
+      (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) / dt / M[Iz,ind]
+  end  
+end
diff --git a/BB b/BB
@@ -0,0 +1,190 @@
+@kernel inbounds = true function DivRhoTrViscUpwind3LimKernel!(FTr,@Const(Tr),@Const(U),@Const(Cache),@Const(D),@Const(DW),@Const(dXdxI),
+  @Const(JJ),@Const(M),@Const(Glob),Koeff,dt,@Const(w),@Const(qMin),@Const(qMax),@Const(Stencil))
+
+  I, J, iz   = @index(Local, NTuple)
+  _,_,Iz,IF = @index(Global, NTuple)
+
+  ColumnTilesDim = @uniform @groupsize()[3]
+  N = @uniform @groupsize()[1]
+  Nz = @uniform @ndrange()[3]
+  NF = @uniform @ndrange()[4]
+
+  @uniform l0  = eltype(FTr)(0)
+  @uniform eta = eltype(FTr)(1.e-12)
+  @uniform dlFD = eltype(FTr)(1.e-8)
+
+  cCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  CacheCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  RhoCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  uCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  vCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  wCol = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  DivRhoTr = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  DivRho = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  RhoTrColS = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  RhoColS = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  q = @localmem eltype(FTr) (N,N, ColumnTilesDim)
+  resp = @localmem eltype(FTr) (ColumnTilesDim)
+  resc = @localmem eltype(FTr) (ColumnTilesDim)
+  alpha = @localmem eltype(FTr) (ColumnTilesDim)
+  lp = @localmem eltype(FTr) (ColumnTilesDim)
+  lc = @localmem eltype(FTr) (ColumnTilesDim)
+  sumJ = @localmem eltype(FTr) (ColumnTilesDim)
+  qMinS = @localmem eltype(FTr) (ColumnTilesDim)
+  qMaxS = @localmem eltype(FTr) (ColumnTilesDim)
+  conv = @localmem (Bool) (ColumnTilesDim)
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    CacheCol[I,J,iz] = Cache[Iz,ind]
+    wCol[I,J,iz] = U[Iz,ind,4]
+    RhoCol[I,J,iz] = U[Iz,ind,1]
+    cCol[I,J,iz] = Tr[Iz,ind] / RhoCol[I,J,iz]
+    uCol[I,J,iz] = U[Iz,ind,2]
+    vCol[I,J,iz] = U[Iz,ind,3]
+    DivRho[I,J,iz] = eltype(FTr)(0)
+    DivRhoTr[I,J,iz] = eltype(FTr)(0)
+    if ID == 1
+      resp[iz] = eltype(FTr)(0)
+      resc[iz] = eltype(FTr)(0)
+      sumJ[iz] = eltype(FTr)(0)
+      conv[iz] = true
+      qMinS[iz] = minimum(qMin[Iz,Stencil[IF,:]])
+      qMaxS[iz] = maximum(qMax[Iz,Stencil[IF,:]])
+    end
+  end
+  @synchronize
+  if Iz < Nz 
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    ind = Glob[ID,IF]
+    cL = cCol[I,J,iz]
+    cR = cCol[I,J,iz+1]
+    if iz > 1
+      cLL = cCol[I,J,iz-1]
+    else
+      Izm1 = max(Iz - 1,1)
+      cLL = U[Izm1,ind,5] / U[Izm1,ind,1]
+    end
+    if iz < ColumnTilesDim - 1
+      cRR = cCol[I,J,iz+2]
+    else
+      Izp2 = min(Iz + 2, Nz)
+      cRR = U[Izp2,ind,5] / U[Izp2,ind,1]
+    end
+
+    @views wCon = Contra3(U[Iz:Iz+1,ind,1],U[Iz:Iz+1,ind,2],U[Iz:Iz+1,ind,3],
+      U[Iz,ind,4],dXdxI[3,:,:,ID,Iz:Iz+1,IF])
+
+    Izm1 = max(Iz - 1,1)
+    Izp2 = min(Iz + 2, Nz)
+    JLL = JJ[ID,1,Izm1,IF] + JJ[ID,2,Izm1,IF]
+    JL = JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]
+    JR = JJ[ID,1,Iz+1,IF] + JJ[ID,2,Iz+1,IF]
+    JRR = JJ[ID,1,Izp2,IF] + JJ[ID,2,Izp2,IF]
+    cFL, cFR = RecU4(cLL,cL,cR,cRR,JLL,JL,JR,JRR) 
+    Flux = 0.25 * ((abs(wCon) + wCon) * cFL + (-abs(wCon) + wCon) * cFR)
+    @atomic :monotonic FTr[Iz,ind] += -Flux / M[Iz,ind]
+    @atomic :monotonic FTr[Iz+1,ind] += Flux / M[Iz+1,ind]
+  end
+
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    Dxc = 0
+    Dyc = 0
+    for k = 1 : N
+      Dxc = Dxc + D[I,k] * CacheCol[k,J,iz]
+      Dyc = Dyc + D[J,k] * CacheCol[I,k,iz]
+    end
+
+    @views (GradDx, GradDy) = Grad12(RhoCol[I,J,iz],Dxc,Dyc,dXdxI[1:2,1:2,:,ID,Iz,IF],JJ[ID,:,Iz,IF])
+    @views (tempx, tempy) = Contra12(-Koeff,GradDx,GradDy,dXdxI[1:2,1:2,:,ID,Iz,IF])
+    for k = 1 : N
+      @atomic :monotonic DivRhoTr[k,J,iz] += DW[k,I] * tempx
+      @atomic :monotonic DivRhoTr[I,k,iz] += DW[k,J] * tempy
+    end
+
+    @views (tempxRho, tempyRho) = Contra12(-RhoCol[I,J,iz],uCol[I,J,iz],vCol[I,J,iz],dXdxI[1:2,1:2,:,ID,Iz,IF])
+    for k = 1 : N
+      @atomic :monotonic DivRho[k,J,iz] += D[k,I] * tempxRho
+      @atomic :monotonic DivRho[I,k,iz] += D[k,J] * tempyRho
+    end
+    tempxTr = tempxRho * cCol[I,J,iz]
+    tempyTr = tempyRho * cCol[I,J,iz]
+    for k = 1 : N
+      @atomic :monotonic DivRhoTr[k,J,iz] += D[k,I] * tempxTr
+      @atomic :monotonic DivRhoTr[I,k,iz] += D[k,J] * tempyTr
+    end
+    @atomic :monotonic sumJ[iz] += JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]  
+  end
+  @synchronize
+
+  if Iz <=Nz
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]  
+    RhoTrColS[I,J,iz] = Tr[Iz,ind] + dt * DivRhoTr[I,J,iz] / (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF])
+    RhoColS[I,J,iz] = U[Iz,ind,1] + dt * DivRho[I,J,iz] / (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF])
+    #   Finite difference step
+    q[I,J,iz] = medianGPU(qMinS[iz], RhoTrColS[I,J,iz] / RhoColS[I,J,iz] +
+      l0,  qMaxS[iz])
+    @atomic :monotonic resp[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] * 
+      (q[I,J,iz] * RhoColS[I,J,iz] - RhoTrColS[I,J,iz])
+  end
+  @synchronize
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    if abs(resp[iz]) <= eta 
+      if ID == 1
+        conv[iz] = false
+      end  
+    else
+      qLoc = medianGPU(qMinS[iz],  RhoTrColS[I,J,iz] / RhoColS[I,J,iz] + 
+        (l0 + dlFD), qMaxS[iz])
+      @atomic :monotonic resc[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] * 
+        (qLoc * RhoColS[I,J,iz]  - RhoTrColS[I,J,iz])  
+    end
+  end
+  @synchronize
+
+  if Iz <= Nz && I == 1 && J == 1 && conv[iz]
+    if abs(resc[iz] - resp[iz]) <= eltype(FTr)(1.e-13)
+      conv[iz] = false
+    else
+      alpha[iz] = dlFD / (resc[iz] - resp[iz])
+      lp[iz] = l0
+      lc[iz] = lp[iz] - alpha[iz] * resp[iz]
+      resp[iz] = eltype(FTr)(0)
+      resc[iz] = eltype(FTr)(0)
+    end
+  end  
+  @synchronize
+  for iTer = 1 : 5
+    if Iz <= Nz && conv[iz]
+      ID = I + (J - 1) * N  
+      q[I,J,iz] = medianGPU(qMinS[iz], RhoTrColS[I,J,iz] / RhoColS[I,J,iz] +
+        lc[iz],  qMaxS[iz])
+      @atomic :monotonic resc[iz] += (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) * w[I] * w[J] / sumJ[iz] *
+        (q[I,J,iz] * RhoColS[I,J,iz] - RhoTrColS[I,J,iz])
+    end  
+    @synchronize
+    if Iz <= Nz && I == 1 && J == 1 && conv[iz]
+      if abs(resc[iz] - resp[iz]) <= eltype(FTr)(1.e-13) 
+        conv[iz] = false
+      else  
+        alpha[iz] = (lp[iz] - lc[iz]) / (resp[iz] - resc[iz])
+        resp[iz] = resc[iz]
+        lp[iz] = lc[iz]
+        lc[iz] = lc[iz] - alpha[iz] * resc[iz]
+        resc[iz] = eltype(FTr)(0)  
+      end  
+    end  
+    @synchronize
+  end
+  if Iz <= Nz
+    ID = I + (J - 1) * N  
+    ind = Glob[ID,IF]
+    @show Iz,ind,q[I,J,iz],RhoColS[I,J,iz]
+    @atomic :monotonic FTr[Iz,ind] += (q[I,J,iz] * RhoColS[I,J,iz] - Tr[Iz,ind]) *
+      (JJ[ID,1,Iz,IF] + JJ[ID,2,Iz,IF]) / dt / M[Iz,ind]
+  end  
+end
diff --git a/Examples/testNHSphere.jl b/Examples/testNHSphere.jl
@@ -414,7 +414,7 @@ if ModelType == "VectorInvariant" || ModelType == "Advection"
       "v",
       "wB",
       "Th",
-      "Vort",
+#     "Vort",
       "Tr1",
       "Tr2",
       ]

diff --git a/Jobs/NHSphere/JobNHHeldSuarezMoistMOSTSphere b/Jobs/NHSphere/JobNHHeldSuarezMoistMOSTSphere
@@ -1,4 +1,4 @@
-mpirun -n 1 julia --project Examples/testNHSphere.jl \
+mpirun -n 6 julia --project Examples/testNHSphere.jl \
   --Problem="HeldSuarezMoistSphere" \
   --Device="CPU" \
   --GPUType="Metal" \
@@ -23,7 +23,7 @@ mpirun -n 1 julia --project Examples/testNHSphere.jl \
   --SurfaceScheme="MOST" \
   --Coriolis=true \
   --Upwind=true \
-  --HorLimit=false \
+  --HorLimit=true \
   --Equation="CompressibleShallow" \
   --State="Moist" \
   --Microphysics=true \