new functionality added

gridded/da/analysis/time_avg_fluxes.py

@@ -17,6 +17,7 @@ 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 """
@@ -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"""
 

gridded/da/analysis/yearly_fluxes.py

@@ -20,7 +20,7 @@ def yearly_avg(rundir,avg):
 
     if avg not in ['transcom','olson','country','flux1x1']:
         raise IOError,'Choice of averaging invalid'
-    if no os.path.exists(rundir):
+    if not os.path.exists(rundir):
         raise IOError,'rundir requested (%s) does not exist, exiting...'%rundir
 
     monthdir = rundir + 'data_%s_monthly'%avg