Add moving average points to conservation task

MPAS-Dev · Jul 17, 2024 · ff6c80d · ff6c80d
1 parent fe74bff
commit ff6c80d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/mpas_analysis/default.cfg b/mpas_analysis/default.cfg
@@ -331,6 +331,10 @@ fitColor1 = tab:blue
 #    land_ice_mass_flux_components : Mass fluxes from land ice
 plotTypes = ['absolute_energy_error', 'absolute_salt_error', 'total_mass_change']
 
+# Number of points over which to compute moving average(e.g., for monthly
+# output, movingAveragePoints=12 corresponds to a 12-month moving average
+# window)
+movingAveragePoints = 365
 
 [index]
 ## options related to producing nino index.

diff --git a/mpas_analysis/ocean/conservation.py b/mpas_analysis/ocean/conservation.py
@@ -468,9 +468,11 @@ def _make_plot(self, plot_type):
                 lineStyles.append(lineStylesBase[index])
 
         lineWidths = [3 for i in fields]
-        if config.has_option('timeSeries', 'movingAveragePoints'):
-            movingAveragePoints = config.getint('timeSeries',
-                                                'movingAveragePoints')
+        if config.has_option('timeSeriesConservation', 'movingAveragePoints'):
+            # We assume here that movingAveragePoints is given in months
+            # and conservation output has daily frequency
+            movingAveragePoints = \
+                config.getint('timeSeriesConservation', 'movingAveragePoints')
         else:
             movingAveragePoints = None