Fix warning in thirtymin_insts

CliMA · Jan 31, 2024 · c693763 · c693763
1 parent 01e2561
commit c693763
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/diagnostics/default_diagnostics.jl b/src/diagnostics/default_diagnostics.jl
@@ -238,9 +238,6 @@ function default_diagnostics(::PrognosticEDMFX, t_end; output_writer)
         "lmix",
     ]
 
-    thirtymin_insts(short_names...; output_writer) =
-        common_diagnostics(30 * 60, nothing, output_writer, short_names...;)
-
     edmfx_draft_diagnostics = [
         "arup",
         "rhoaup",
@@ -310,9 +307,6 @@ function default_diagnostics(::DiagnosticEDMFX, t_end; output_writer)
         "lmix",
     ]
 
-    thirtymin_insts(short_names...; output_writer) =
-        common_diagnostics(30 * 60, nothing, output_writer, short_names...;)
-
     diagnostic_edmfx_draft_diagnostics = [
         "arup",
         "rhoaup",

diff --git a/src/diagnostics/standard_diagnostic_frequencies.jl b/src/diagnostics/standard_diagnostic_frequencies.jl
@@ -218,3 +218,30 @@ Return a `ScheduledDiagnostics` that computes the hourly average for the given v
 """
 hourly_average(short_names; output_writer) =
     hourly_averages(short_names; output_writer)[1]
+
+"""
+    thirtymin_insts(short_names...; output_writer)
+
+Return a `ScheduledDiagnostics` that outputs the instantaneous value for the given variables
+every 30 minutes.
+"""
+function thirtymin_insts(short_names...; output_writer)
+    period = 30 * 60
+    return [
+        ScheduledDiagnosticTime(
+            variable = get_diagnostic_variable(short_name),
+            compute_every = period,
+            output_every = period, # seconds
+            output_writer = output_writer,
+        ) for short_name in short_names
+    ]
+end
+
+"""
+    hourly_average(short_names...; output_writer)
+
+Return a `ScheduledDiagnostics` that outputs the instantaneous value for the given variable
+every 30 minutes.
+"""
+thirtymin_inst(short_names; output_writer) =
+    thirtymin_insts(short_names; output_writer)[1]