more fixes

Author: nefrathenrici

NEWS.md

@@ -4,6 +4,9 @@ ClimaAtmos.jl Release Notes
 main
 -------
 
+PR [#4021](https://github.com/CliMA/ClimaAtmos.jl/pull/4021) uses ClimaCore
+convenience constructors to create spaces without an AtmosConfig.
+
 v0.31.5
 -------
 PR [#3975](https://github.com/CliMA/ClimaAtmos.jl/pull/3975) updates the pressure gradient formulation to subtract a reference state and use the Exner pressure.

Project.toml

@@ -45,7 +45,7 @@ Artifacts = "1"
 AtmosphericProfilesLibrary = "0.1.7"
 ClimaComms = "0.6.9"
 ClimaCore = "0.14.43"
-ClimaDiagnostics = "0.2.12"
+ClimaDiagnostics = "0.2.13"
 ClimaInterpolations = "0.1.0"
 ClimaParams = "1.0.2"
 ClimaTimeSteppers = "0.8.2"

examples/topography_spectra.jl

@@ -19,52 +19,15 @@ using ClimaCore:
 using ClimaComms
 using ClimaUtilities: SpaceVaryingInputs.SpaceVaryingInput
 
+# Include helper functions from test directory
+include(joinpath(@__DIR__, "..", "test", "test_helpers.jl"))
+
 # h_elem is the number of elements per side of every panel (6 panels in total)
 function cubed_sphere_mesh(; radius, h_elem)
     domain = Domains.SphereDomain(radius)
     return Meshes.EquiangularCubedSphere(domain, h_elem)
 end
 
-function make_horizontal_space(
-    mesh,
-    quad,
-    comms_ctx::ClimaComms.SingletonCommsContext,
-    bubble,
-)
-
-    space = if mesh isa Meshes.AbstractMesh1D
-        topology = Topologies.IntervalTopology(comms_ctx, mesh)
-        Spaces.SpectralElementSpace1D(topology, quad)
-    elseif mesh isa Meshes.AbstractMesh2D
-        topology = Topologies.Topology2D(
-            comms_ctx,
-            mesh,
-            Topologies.spacefillingcurve(mesh),
-        )
-        Spaces.SpectralElementSpace2D(topology, quad; enable_bubble = bubble)
-    end
-    return space
-end
-
-function make_horizontal_space(mesh, quad, comms_ctx, bubble)
-    if mesh isa Meshes.AbstractMesh1D
-        error("Distributed mode does not work with 1D horizontal spaces.")
-    elseif mesh isa Meshes.AbstractMesh2D
-        topology = Topologies.DistributedTopology2D(
-            comms_ctx,
-            mesh,
-            Topologies.spacefillingcurve(mesh),
-        )
-        space = Spaces.SpectralElementSpace2D(
-            topology,
-            quad;
-            enable_bubble = bubble,
-        )
-    end
-    return space
-end
-
-
 """
     generate_spaces(; h_elem=16)
 For a given number of elements `h_elem`, this function generates a 
@@ -95,7 +58,6 @@ function generate_spaces(;
         "z",
         h_space,
     )
-    elev_from_file = @. max(elev_from_file, 0)
     # Fractional damping of smallest resolved scale
     # Approximated as k₀ ≈ 1/Δx, with n_attenuation 
     # the factor by which we wish to damp wavenumber
@@ -104,7 +66,7 @@ function generate_spaces(;
     κ = diff_courant * Δh_scale^2
     maxiter = Int(round(log(n_attenuation) / diff_courant))
     diffuse_surface_elevation!(elev_from_file; κ, dt = FT(1), maxiter)
-    elev_from_file = @. max(elev_from_file, 0)
+    @. elev_from_file = max(elev_from_file, FT(0))
     return elev_from_file
 end
 

post_processing/ci_plots.jl

@@ -1566,7 +1566,7 @@ function make_plots(
 
     make_plots_generic(
         output_paths,
-        vcat(var_groups_zt...),
+        vcat((var_groups_zt...)...),
         plot_fn = plot_parsed_attribute_title!,
         summary_files = [tmp_file],
         MAX_NUM_COLS = 2,

src/diagnostics/default_diagnostics.jl

@@ -169,8 +169,8 @@ function core_default_diagnostics(output_writer, duration, start_date; topograph
         min_func = (args...; kwargs...) -> hourly_min(FT, args...; kwargs...)
         max_func = (args...; kwargs...) -> hourly_max(FT, args...; kwargs...)
     end
-    # Common diagnostics for all cases
-    common_diagnostics = [
+    # Base diagnostics for all cases
+    base_diagnostics = [
         average_func(core_diagnostics...; output_writer, start_date)...,
         min_func("ts"; output_writer, start_date),
         max_func("ts"; output_writer, start_date),
@@ -185,10 +185,10 @@ function core_default_diagnostics(output_writer, duration, start_date; topograph
             output_writer,
             output_short_name = "orog_inst",
         )
-        pushfirst!(common_diagnostics, orog_diagnostic)
+        return [orog_diagnostic, base_diagnostics...]
+    else
+        return base_diagnostics
     end
-
-    return common_diagnostics
 end
 
 ##################