From d78702de060861ab62add7084e2d573c7c51a5a0 Mon Sep 17 00:00:00 2001 From: Wouter Peters <wouter.peters@wur.nl> Date: Mon, 24 Jun 2013 10:51:16 +0000 Subject: [PATCH] longterm mean fluxes now also averaged --- da/analysis/time_avg_fluxes.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/da/analysis/time_avg_fluxes.py b/da/analysis/time_avg_fluxes.py index 76994e1..c9a0bee 100755 --- a/da/analysis/time_avg_fluxes.py +++ b/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') -- GitLab