Merge pull request #221 from FourierFlows/ncc/fix-some-bugs

Fix some bugs
FourierFlows · Apr 6, 2021 · 93d0a15 · 93d0a15
2 parents 0aca13d + 3c02b3a
commit 93d0a15
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 env:
-  JULIA_VERSION: "1.5.3"
+  JULIA_VERSION: "1.5.4"
   JULIA_MINOR_VERSION: "1.5"
   GKSwstype: "100" # See: https://github.com/jheinen/GR.jl/issues/278
   SECRET_CODECOV_TOKEN: "Ak2mVTxXnhkPNc096ImDdp7bOc4zGNTqFEEDaGMwAgYPr28g5dyMbslh8B/ad4NQHXVL1MXQ3zrUfGgMBRq+mmqRaAe13FI4Go9uCas6bzdZXE23ExiLzBmqVRNRf8GqEcpGL7BBreohC0cnfI0SVMiIJDCJXX9YsXJtlcpk1glQFMEFI5V6cpFe9K2l5xoUNQ4179ZYoJUMAy/aylQx/UdQuw527FjHQUsi5/dFtWzMqeys0secNa9alLvJCQdIX9OqPjmBYvuIIVXCR7vlZoH8PgXwEj7wbdp8/V31+wlLQI9WePcsJxoOybtLTOlwwfw4jWLAttDZYqnqiLVp3Q==;U2FsdGVkX18sNLCManU1B/jI5kh4LhSi69MFXljHSp9yWrN7u5d196K/XrELwb8ksbamyKeHjIvDIopwD55dbw=="

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: julia-actions/setup-julia@latest
         with:
-          version: 1.4
+          version: 1.5
       - name: Pkg.add("CompatHelper")
         run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
       - name: CompatHelper.main()

diff --git a/src/multilayerqg.jl b/src/multilayerqg.jl
@@ -450,7 +450,7 @@ function calcS!(S, Fp, Fm, nlayers, grid)
   F = Matrix(Tridiagonal(Fm, -([Fp; 0] + [0; Fm]), Fp))
 
   for n=1:grid.nl, m=1:grid.nkr
-    CUDA.@allowscalar k² = grid.Krsq[m, n]
+    k² = CUDA.@allowscalar grid.Krsq[m, n]
     Skl = SMatrix{nlayers, nlayers}(- k² * I + F)
     S[m, n] = Skl
   end
@@ -468,7 +468,7 @@ function calcS⁻¹!(S⁻¹, Fp, Fm, nlayers, grid)
   F = Matrix(Tridiagonal(Fm, -([Fp; 0] + [0; Fm]), Fp))
 
   for n=1:grid.nl, m=1:grid.nkr
-    CUDA.@allowscalar k² = grid.Krsq[m, n] == 0 ? 1 : grid.Krsq[m, n]
+    k² = CUDA.@allowscalar grid.Krsq[m, n] == 0 ? 1 : grid.Krsq[m, n]
     Skl = - k² * I + F
     S⁻¹[m, n] = SMatrix{nlayers, nlayers}(I / Skl)
   end

diff --git a/src/utils.jl b/src/utils.jl
@@ -11,9 +11,9 @@ function lambdipole(U, R, grid::TwoDGrid{T, A}; center=(mean(grid.x), mean(grid.
   q₀ = -2U * k / besselj(0, k * R) # dipole amplitude for strength U and radius R
   x, y = gridpoints(grid)
   xc, yc = center
-  r = @. sqrt( (x - xc)^2 + (y - yc)^2 )
-  CUDA.@allowscalar besselj1 = A([besselj(1, k * r[i, j]) for i=1:grid.nx, j=1:grid.ny])
-  q = @. q₀ * besselj1 * (y - yc) / r
+  r = @. sqrt((x - xc)^2 + (y - yc)^2)
+  besseljorder1 = CUDA.@allowscalar A([besselj1(k * r[i, j]) for i=1:grid.nx, j=1:grid.ny])
+  q = @. q₀ * besseljorder1 * (y - yc) / r
   @. q = ifelse(r >= R, 0, q)
 
   return q

diff --git a/test/test_barotropicqgql.jl b/test/test_barotropicqgql.jl
@@ -61,7 +61,7 @@ function test_bqgql_stochasticforcingbudgets(dev::Device=CPU(); n=256, dt=0.01,
   kf, dkf = 12.0, 2.0
   ε = 0.1
 
-  CUDA.@allowscalar Kr = ArrayType(dev)([ grid.kr[i] for i=1:grid.nkr, j=1:grid.nl])
+  Kr = CUDA.@allowscalar ArrayType(dev)([ grid.kr[i] for i=1:grid.nkr, j=1:grid.nl])
 
   forcing_spectrum = zeros(dev, T, (grid.nkr, grid.nl))
   @. forcing_spectrum = exp(-(sqrt(grid.Krsq) - kf)^2 / (2 * dkf^2))