Do not exercise diagnostics when disabled

config/default_configs/default_config.yml

@@ -259,6 +259,9 @@ override_τ_precip:
 output_default_diagnostics:
   help: "Output the default diagnostics associated to the selected atmospheric model"
   value: true
+enable_diagnostics:
+  help: "Set to false to fully disable the diagnostics"
+  value: true
 netcdf_output_at_levels:
   help: "Do not perform any vertical interpolation in the output NetCDF files. Instead, interpolate horizontally and output the level. "
   value: true

src/solver/solve.jl

@@ -103,7 +103,7 @@ function solve_atmos!(simulation)
         maxrss_str = prettymemory(maxrss())
         @info "Memory currently used (after solve!) by the process (RSS): $maxrss_str"
 
-        foreach(close, output_writers)
+        isnothing(output_writers) || foreach(close, output_writers)
     end
 end
 

src/solver/type_getters.jl

@@ -663,17 +663,21 @@ function get_simulation(config::AtmosConfig)
     @info "get_callbacks: $s"
 
     # Initialize diagnostics
-    s = @timed_str begin
-        scheduled_diagnostics, writers = get_diagnostics(
-            config.parsed_args,
-            atmos,
-            Y,
-            p,
-            t_start,
-            sim_info.dt,
-        )
+    if config.parsed_args["enable_diagnostics"]
+        s = @timed_str begin
+            scheduled_diagnostics, writers = get_diagnostics(
+                config.parsed_args,
+                atmos,
+                Y,
+                p,
+                t_start,
+                sim_info.dt,
+            )
+        end
+        @info "initializing diagnostics: $s"
+    else
+        writers = nothing
     end
-    @info "initializing diagnostics: $s"
 
     continuous_callbacks = tuple()
     discrete_callbacks = callback
@@ -705,13 +709,15 @@ function get_simulation(config::AtmosConfig)
     end
     @info "init integrator: $s"
 
-    s = @timed_str begin
-        integrator = ClimaDiagnostics.IntegratorWithDiagnostics(
-            integrator,
-            scheduled_diagnostics,
-        )
+    if config.parsed_args["enable_diagnostics"]
+        s = @timed_str begin
+            integrator = ClimaDiagnostics.IntegratorWithDiagnostics(
+                integrator,
+                scheduled_diagnostics,
+            )
+        end
+        @info "Added diagnostics: $s"
     end
-    @info "Added diagnostics: $s"
 
     reset_graceful_exit(output_dir)