diff --git a/Project.toml b/Project.toml index b92c8e3511a..d3cc9060bc1 100644 --- a/Project.toml +++ b/Project.toml @@ -53,7 +53,7 @@ AtmosphericProfilesLibrary = "0.1" CPUSummary = "0.2" ClimaComms = "0.5" ClimaCore = "0.14" -ClimaDiagnostics = "0.1.6" +ClimaDiagnostics = "0.2" ClimaParams = "0.10.4" ClimaTimeSteppers = "0.7.18" ClimaUtilities = "0.1.3" diff --git a/src/callbacks/get_callbacks.jl b/src/callbacks/get_callbacks.jl index 47868ec1fb6..a218ef8021f 100644 --- a/src/callbacks/get_callbacks.jl +++ b/src/callbacks/get_callbacks.jl @@ -34,11 +34,15 @@ function get_diagnostics(parsed_args, atmos_model, Y, p, t_start, dt) num_netcdf_points = (180, 90, 50) end + z_sampling_method = + parsed_args["netcdf_output_at_levels"] ? CAD.Writers.LevelsMethod() : + CAD.Writers.FakePressureLevelsMethod() + netcdf_writer = CAD.NetCDFWriter( axes(Y.c), p.output_dir, - num_points = num_netcdf_points, - disable_vertical_interpolation = parsed_args["netcdf_output_at_levels"], + num_points = num_netcdf_points; + z_sampling_method, ) writers = (hdf5_writer, netcdf_writer) diff --git a/src/diagnostics/Diagnostics.jl b/src/diagnostics/Diagnostics.jl index 6ba8aa44cc5..de6e3c1e939 100644 --- a/src/diagnostics/Diagnostics.jl +++ b/src/diagnostics/Diagnostics.jl @@ -47,8 +47,7 @@ include(joinpath("..", "utils", "abbreviations.jl")) import ClimaDiagnostics: DiagnosticVariable, ScheduledDiagnostic, - average_pre_output_hook!, - DiagnosticsCallback + average_pre_output_hook! import ClimaDiagnostics.DiagnosticVariables: descriptive_short_name