Update compat to be compatible with Spaces.z_max

CliMA · Nov 22, 2024 · 331c2d9 · 331c2d9
1 parent 918ae61
commit 331c2d9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -3,6 +3,7 @@ module ClimaAtmos
 using NVTX
 import Thermodynamics as TD
 
+include("compat.jl")
 include(joinpath("parameters", "Parameters.jl"))
 import .Parameters as CAP
 

diff --git a/src/compat.jl b/src/compat.jl
@@ -0,0 +1,22 @@
+import ClimaCore
+import ClimaCore: Domains, Spaces, Topologies
+
+# To allow for backwards compatibility of ClimaCore:
+if pkgversion(ClimaCore) < v"0.14.18"
+    """
+        z_max(::ClimaCore.Spaces.AbstractSpace)
+
+    The domain maximum along the z-direction.
+    """
+    function z_max end
+
+    z_max(domain::Domains.IntervalDomain) = domain.coord_max.z
+    function z_max(space::Spaces.AbstractSpace)
+        mesh = Topologies.mesh(Spaces.vertical_topology(space))
+        domain = Topologies.domain(mesh)
+        return z_max(domain)
+    end
+
+else
+    z_max(s::Spaces.AbstractSpace) = Spaces.z_max(s)
+end
diff --git a/src/parameterized_tendencies/sponge/rayleigh_sponge.jl b/src/parameterized_tendencies/sponge/rayleigh_sponge.jl
@@ -16,6 +16,6 @@ rayleigh_sponge_tendency!(Yₜ, Y, p, t, ::Nothing) = nothing
 
 function rayleigh_sponge_tendency!(Yₜ, Y, p, t, s::RayleighSponge)
     ᶜz = Fields.coordinate_field(Y.c).z
-    zmax = Spaces.z_max(axes(Y.f))
+    zmax = z_max(axes(Y.f))
     @. Yₜ.c.uₕ -= β_rayleigh_uₕ(s, ᶜz, zmax) * Y.c.uₕ
 end
diff --git a/src/parameterized_tendencies/sponge/viscous_sponge.jl b/src/parameterized_tendencies/sponge/viscous_sponge.jl
@@ -20,7 +20,7 @@ function viscous_sponge_tendency!(Yₜ, Y, p, t, s::ViscousSponge)
     ᶜuₕ = Y.c.uₕ
     ᶜz = Fields.coordinate_field(Y.c).z
     ᶠz = Fields.coordinate_field(Y.f).z
-    zmax = Spaces.z_max(axes(ᶠz))
+    zmax = z_max(axes(ᶠz))
     @. Yₜ.c.uₕ +=
         β_viscous(s, ᶜz, zmax) * (
             wgradₕ(divₕ(ᶜuₕ)) - Geometry.project(

diff --git a/src/prognostic_equations/implicit/implicit_solver.jl b/src/prognostic_equations/implicit/implicit_solver.jl
@@ -568,7 +568,7 @@ function update_implicit_equation_jacobian!(A, Y, p, dtγ)
         dtγ * ᶠp_grad_matrix ⋅ DiagonalMatrixRow(-(ᶜkappa_m) * ᶜρ) ⋅ ∂ᶜK_∂ᶜuₕ
     rs = p.atmos.rayleigh_sponge
     ᶠz = Fields.coordinate_field(Y.f).z
-    zmax = Spaces.z_max(axes(Y.f))
+    zmax = z_max(axes(Y.f))
     if rs isa RayleighSponge
         @. ∂ᶠu₃_err_∂ᶠu₃ =
             dtγ * (

diff --git a/src/prognostic_equations/implicit/implicit_tendency.jl b/src/prognostic_equations/implicit/implicit_tendency.jl
@@ -166,7 +166,7 @@ function implicit_vertical_advection_tendency!(Yₜ, Y, p, t)
 
     if rayleigh_sponge isa RayleighSponge
         ᶠz = Fields.coordinate_field(Y.f).z
-        zmax = Spaces.z_max(axes(Y.f))
+        zmax = z_max(axes(Y.f))
         rs = rayleigh_sponge
         @. Yₜ.f.u₃ -= β_rayleigh_w(rs, ᶠz, zmax) * Y.f.u₃
         if turbconv_model isa PrognosticEDMFX