longterm mean fluxes now also averaged

da/analysis/time_avg_fluxes.py

@@ -17,11 +17,12 @@ import datetime
 from da.analysis.daily_fluxes import daily_avg
 from da.analysis.monthly_fluxes import monthly_avg
 from da.analysis.yearly_fluxes import yearly_avg
+from da.analysis.longterm_fluxes import longterm_avg
 
 def time_avg(dacycle,avg='transcom'):
     """ Function to create a set of averaged files in a folder, needed to make longer term means """
     
-    if avg not in ['transcom','olson','country']:
+    if avg not in ['transcom','olson','country','flux1x1']:
         raise IOError,'Choice of averaging invalid'
 
     analysisdir = dacycle['dir.analysis']
@@ -37,6 +38,8 @@ def time_avg(dacycle,avg='transcom'):
     if new_year(dacycle):
         yearly_avg(analysisdir,avg)
 
+    longterm_avg(analysisdir,avg)
+
 def new_month(dacycle):
     """ check whether we just entered a new month"""
 
@@ -63,9 +66,8 @@ if __name__ == "__main__":
     dacycle.setup()
     dacycle.parse_times()
 
-    while dacycle['time.end'] < dacycle['time.finish']:
-
-        time_avg(dacycle,avg='transcom')
-        time_avg(dacycle,avg='olson')
-        dacycle.advance_cycle_times()
+    time_avg(dacycle,avg='transcom')
+    time_avg(dacycle,avg='olson')
+    time_avg(dacycle,avg='country')
+    time_avg(dacycle,avg='flux1x1')