Fix 2438

CliMA · Dec 18, 2023 · 317b4f6 · 317b4f6
1 parent a0ccabd
commit 317b4f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/cache/cache.jl b/src/cache/cache.jl
@@ -129,9 +129,11 @@ function build_cache(Y, atmos, params, surface_setup, dt, start_date)
     net_energy_flux_toa = [Geometry.WVector(FT(0))]
     net_energy_flux_sfc = [Geometry.WVector(FT(0))]
 
-    limiter =
-        isnothing(atmos.numerics.limiter) ? nothing :
-        atmos.numerics.limiter(similar(Y.c, FT))
+    limiter = if isnothing(atmos.numerics.limiter)
+        nothing
+    elseif atmos.numerics.limiter isa QuasiMonotoneLimiter
+        Limiters.QuasiMonotoneLimiter(similar(Y.c, FT))
+    end
 
     numerics = (; limiter)
 

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -78,7 +78,7 @@ function get_atmos(config::AtmosConfig, params)
         surface_model = get_surface_model(parsed_args),
         numerics = get_numerics(parsed_args),
     )
-    @assert !@any_reltype(atmos, (UnionAll,))
+    @assert !@any_reltype(atmos, (UnionAll, DataType))
 
     @info "AtmosModel: \n$(summary(atmos))"
     return atmos
@@ -97,8 +97,7 @@ function get_numerics(parsed_args)
     edmfx_sgsflux_upwinding =
         Val(Symbol(parsed_args["edmfx_sgsflux_upwinding"]))
 
-    limiter =
-        parsed_args["apply_limiter"] ? Limiters.QuasiMonotoneLimiter : nothing
+    limiter = parsed_args["apply_limiter"] ? CA.QuasiMonotoneLimiter() : nothing
 
     # wrap each upwinding mode in a Val for dispatch
     numerics = AtmosNumerics(;

diff --git a/src/solver/types.jl b/src/solver/types.jl
@@ -270,6 +270,8 @@ abstract type AbstractTimesteppingMode end
 struct Explicit <: AbstractTimesteppingMode end
 struct Implicit <: AbstractTimesteppingMode end
 
+struct QuasiMonotoneLimiter end # For dispatching to use the ClimaCore QuasiMonotoneLimiter.
+
 Base.@kwdef struct AtmosNumerics{
     EN_UP,
     TR_UP,