Fix anelastic_pressure_solver tests (#71)

* Fix anelastic_pressure_solver tests

* fix indexing

* deduce kernel parameters for horizontally flat grids

* fix

* fix

* cleanup

Author: glwagner

src/AtmosphereModels/anelastic_formulation.jl

@@ -66,8 +66,8 @@ end
 function thermodynamic_state(i, j, k, grid, formulation::AnelasticFormulation, thermo, energy, absolute_humidity)
     @inbounds begin
         e = energy[i, j, k]
-        pᵣ = formulation.reference_pressure[i, j, k]
-        ρᵣ = formulation.reference_density[i, j, k]
+        pᵣ = formulation.reference_pressure[1, 1, k]
+        ρᵣ = formulation.reference_density[1, 1, k]
         ρq = absolute_humidity[i, j, k]
     end
 
@@ -87,7 +87,7 @@ end
 @inline function specific_volume(i, j, k, grid, formulation, temperature, specific_humidity, thermo)
     @inbounds begin
         q  = specific_humidity[i, j, k]
-        pᵣ = formulation.reference_pressure[i, j, k]
+        pᵣ = formulation.reference_pressure[1, 1, k]
         T = temperature[i, j, k]
     end
 
@@ -98,7 +98,7 @@ end
 
 @inline function reference_specific_volume(i, j, k, grid, formulation, thermo)
     Rᵈ = dry_air_gas_constant(thermo)
-    pᵣ = @inbounds formulation.reference_pressure[i, j, k]
+    pᵣ = @inbounds formulation.reference_pressure[1, 1, k]
     θᵣ = formulation.constants.reference_potential_temperature
     return Rᵈ * θᵣ / pᵣ
 end
@@ -165,16 +165,16 @@ end
 
     # Using a homogeneous Neumann (zero Gradient) boundary condition:
     @inbounds begin
-        ρ¹ = ρʳ[i, j, 1]
-        ρᴺ = ρʳ[i, j, Nz]
+        ρ¹ = ρʳ[1, 1, 1]
+        ρᴺ = ρʳ[1, 1, Nz]
         ρ̄² = ℑzᵃᵃᶠ(i, j, 2, grid, ρʳ)
         ρ̄ᴺ = ℑzᵃᵃᶠ(i, j, Nz, grid, ρʳ)
 
         D[i, j, 1]  = - ρ̄² / Δzᵃᵃᶠ(i, j,  2, grid) - ρ¹ * Δzᵃᵃᶜ(i, j,  1, grid) * (λx[i] + λy[j])
         D[i, j, Nz] = - ρ̄ᴺ / Δzᵃᵃᶠ(i, j, Nz, grid) - ρᴺ * Δzᵃᵃᶜ(i, j, Nz, grid) * (λx[i] + λy[j])
 
         for k in 2:Nz-1
-            ρᵏ = ρʳ[i, j, k]
+            ρᵏ = ρʳ[1, 1, k]
             ρ̄⁺ = ℑzᵃᵃᶠ(i, j, k+1, grid, ρʳ)
             ρ̄ᵏ = ℑzᵃᵃᶠ(i, j, k, grid, ρʳ)
 

src/AtmosphereModels/update_hydrostatic_pressure.jl

@@ -40,9 +40,14 @@ function update_hydrostatic_pressure!(model)
     T = model.temperature
     q = model.specific_humidity
     thermo = model.thermodynamics
-    Nx, Ny, Nz = size(grid)
-    kernel_parameters = KernelParameters(0:Nx+1, 0:Ny+1)
+
+    Nx, Ny, _ = size(grid)
+    TX, TY, _ = topology(grid)
+    ii = TX == Flat ? (1:Nx) : (0:Nx+1)
+    jj = TY == Flat ? (1:Ny) : (0:Ny+1)
+    kernel_parameters = KernelParameters(ii, jj)
+
     launch!(arch, grid, kernel_parameters, _update_hydrostatic_pressure!, pₕ′, grid, formulation, T, q, thermo)
-    fill_halo_regions!(pₕ′)
+
     return nothing
 end

test/runtests.jl

@@ -7,9 +7,4 @@ testsuite = find_tests(@__DIR__)
 # Parse arguments
 args = parse_args(ARGS)
 
-if filter_tests!(testsuite, args)
-    # Skip this one for the time being
-    delete!(testsuite, "anelastic_pressure_solver")
-end
-
 runtests(Breeze, args; testsuite)