Added options for country and flux1x1 for time averages

da/analysis/daily_fluxes.py

@@ -18,7 +18,7 @@ import datetime
 def daily_avg(rundir,avg):
     """ Function to create a set of daily files in a folder, needed to make longer term means """
     
-    if avg not in ['transcom','olson']:
+    if avg not in ['transcom','olson','country','flux1x1']:
         raise IOError,'Choice of averaging invalid'
     if not os.path.exists(rundir):
         raise IOError,'rundir requested (%s) does not exist, exiting...'%rundir

da/analysis/monthly_fluxes.py

@@ -18,7 +18,7 @@ import subprocess
 def monthly_avg(rundir,avg):
     """ Function to average a set of files in a folder from daily to monthly means """
     
-    if avg not in ['transcom','olson']:
+    if avg not in ['transcom','olson','country','flux1x1']:
         raise IOError,'Choice of averaging invalid'
     if not os.path.exists(rundir):
         raise IOError,'rundir requested (%s) does not exist, exiting...'%rundir

da/analysis/yearly_fluxes.py

@@ -18,7 +18,7 @@ import subprocess
 def yearly_avg(rundir,avg):
     """ Function to average a set of files in a folder from monthly to yearly means """
 
-    if avg not in ['transcom','olson']:
+    if avg not in ['transcom','olson','country','flux1x1']:
         raise IOError,'Choice of averaging invalid'
     if not os.path.exists(rundir):
         raise IOError,'rundir requested (%s) does not exist, exiting...'%rundir