Simplify diff_mode access

Author: nefrathenrici

src/diagnostics/default_diagnostics.jl

@@ -437,22 +437,17 @@ function default_diagnostics(
     start_date;
     output_writer,
 )
-    diagnostics = []
-
     # Add radiation mode diagnostics
-    if atmos_radiation.radiation_mode !== nothing
-        append!(
-            diagnostics,
-            default_diagnostics(
-                atmos_radiation.radiation_mode,
-                duration,
-                start_date;
-                output_writer,
-            ),
+    if !isnothing(atmos_radiation.radiation_mode)
+        return default_diagnostics(
+            atmos_radiation.radiation_mode,
+            duration,
+            start_date;
+            output_writer,
         )
+    else
+        return []
     end
-
-    return diagnostics
 end
 
 function default_diagnostics(
@@ -461,20 +456,15 @@ function default_diagnostics(
     start_date;
     output_writer,
 )
-    diagnostics = []
-
     # Add turbulence convection model diagnostics
-    if atmos_turbconv.turbconv_model !== nothing
-        append!(
-            diagnostics,
-            default_diagnostics(
-                atmos_turbconv.turbconv_model,
-                duration,
-                start_date;
-                output_writer,
-            ),
+    if !isnothing(atmos_turbconv.turbconv_model)
+        return default_diagnostics(
+            atmos_turbconv.turbconv_model,
+            duration,
+            start_date;
+            output_writer,
         )
+    else
+        return []
     end
-
-    return diagnostics
 end

src/diagnostics/radiation_diagnostics.jl

@@ -45,7 +45,7 @@ function compute_rsd!(
             cache.radiation.rrtmgp_model.face_sw_flux_dn,
             axes(state.f),
         )
-        @assert out !== nothing "Output field 'out' must not be `nothing` in this branch"
+        @assert !isnothing(out) "Output field 'out' must not be `nothing` in this branch"
         radiation_mode.deep_atmosphere &&
             apply_geometric_scaling!(out, z_lev, planet_radius, FT)
     end

src/prognostic_equations/implicit/implicit_tendency.jl

@@ -30,7 +30,7 @@ NVTX.@annotate function implicit_tendency!(Yₜ, Y, p, t)
         )
     end
 
-    if p.atmos.numerics.diff_mode == Implicit()
+    if p.atmos.diff_mode == Implicit()
         vertical_diffusion_boundary_layer_tendency!(
             Yₜ,
             Y,

src/prognostic_equations/remaining_tendency.jl

@@ -201,7 +201,7 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
         )
     end
 
-    if p.atmos.numerics.diff_mode == Explicit()
+    if p.atmos.diff_mode == Explicit()
         vertical_diffusion_boundary_layer_tendency!(
             Yₜ,
             Y,

src/solver/type_getters.jl

@@ -145,6 +145,7 @@ function get_atmos(config::AtmosConfig, params)
         numerics = get_numerics(parsed_args),
         disable_surface_flux_tendency = parsed_args["disable_surface_flux_tendency"],
     )
+    # TODO: Should this go in the AtmosModel constructor?
     @assert !@any_reltype(atmos, (UnionAll, DataType))
 
     @info "AtmosModel: \n$(summary(atmos))"
@@ -450,7 +451,7 @@ get_jacobian(ode_algo, Y, atmos, parsed_args) =
             parsed_args["use_dense_jacobian"] ? AutoDenseJacobian() :
             ManualSparseJacobian(
                 DerivativeFlag(has_topography(axes(Y.c))),
-                DerivativeFlag(atmos.numerics.diff_mode),
+                DerivativeFlag(atmos.diff_mode),
                 DerivativeFlag(atmos.sgs_adv_mode),
                 DerivativeFlag(atmos.sgs_entr_detr_mode),
                 DerivativeFlag(atmos.sgs_mf_mode),

src/solver/types.jl

@@ -650,6 +650,7 @@ const ATMOS_MODEL_GROUPS = (
     (AtmosGravityWave, :gravity_wave),
     (AtmosSponge, :sponge),
     (AtmosSurface, :surface),
+    (AtmosNumerics, :numerics),
 )
 
 # Auto-generate map from property_name to group_field  
@@ -869,20 +870,10 @@ function AtmosModel(; kwargs...)
     # Kwargs for direct AtmosModel fields (hyperdiff, numerics, vert_diff, disable_surface_flux_tendency)
     atmos_model_kwargs = Dict{Symbol, Any}()
 
-    # Make all kwargs: apply defaults for any missing kwargs, then sort into appropriate groups
-    all_kwargs = Dict{Symbol, Any}()
+    # Merge defaults with kwargs
+    all_kwargs = merge(default_args, kwargs)
 
-    # First add defaults
-    for (key, default_value) in pairs(default_args)
-        all_kwargs[key] = default_value
-    end
-
-    # Then add user kwargs (overriding defaults)
-    for (key, value) in kwargs
-        all_kwargs[key] = value
-    end
-
-    # Sort kwargs into appropriate groups
+    # Sort kwargs into a hierarchy of dicts
     for (key, value) in all_kwargs
         if haskey(GROUPED_PROPERTY_MAP, key)
             group_field = GROUPED_PROPERTY_MAP[key]
@@ -987,15 +978,6 @@ end
     EquilMoistAtmosModel(; kwargs...)
 
 Create an equilibrium moist atmospheric model with sensible defaults for moist simulations.
-
-# Example
-```julia
-model = EquilMoistAtmosModel(;
-    precip_model = Microphysics1Moment(),
-    cloud_model = QuadratureCloud(),
-    surface_model = PrognosticSurfaceTemperature()
-)
-```
 """
 function EquilMoistAtmosModel(; kwargs...)
     defaults = (
@@ -1015,15 +997,6 @@ end
     NonEquilMoistAtmosModel(; kwargs...)
 
 Create a non-equilibrium moist atmospheric model with sensible defaults.
-
-# Example
-```julia
-model = NonEquilMoistAtmosModel(;
-    precip_model = Microphysics2Moment(),
-    cloud_model = SGSQuadratureCloud(),
-    noneq_cloud_formation_mode = Implicit()
-)
-```
 """
 function NonEquilMoistAtmosModel(; kwargs...)
     defaults = (

test/solver/atmos_model_constructor.jl

@@ -23,7 +23,7 @@ end
 
 @testset "AtmosModel Constructor Tests" begin
 
-    @testset "Intelligent Defaults" begin
+    @testset "Sensible Defaults" begin
         @testset "Basic AtmosModel() creates working model with expected defaults" begin
             model = CA.AtmosModel()