From c750890e93ffe722073bbff3401b3fbf88fccffb Mon Sep 17 00:00:00 2001
From: Wouter Peters <wouter.peters@wur.nl>
Date: Mon, 3 Sep 2012 14:43:46 +0000
Subject: [PATCH] change to allow non-masked time series too
---
da/analysis/summarize_obs.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/da/analysis/summarize_obs.py b/da/analysis/summarize_obs.py
index 0d62c24..f69effa 100755
--- a/da/analysis/summarize_obs.py
+++ b/da/analysis/summarize_obs.py
@@ -124,8 +124,8 @@ def SummarizeObs(DaCycle,printfmt='html'):
date = f.GetVariable('time')
obs = f.GetVariable('value')*1e6
mdm = f.GetVariable('modeldatamismatch')*1e6
- simulated = f.GetVariable('modelsamplesmean')*1e6
- simulated_std = f.GetVariable('modelsamplesstandarddeviation')*1e6
+ simulated = f.GetVariable('modelsamplesmean_forecast')*1e6
+ simulated_std = f.GetVariable('modelsamplesstandarddeviation_forecast')*1e6
pydates = [dt.datetime(1970,1,1)+dt.timedelta(seconds=int(d)) for d in date]
@@ -148,7 +148,7 @@ def SummarizeObs(DaCycle,printfmt='html'):
f.lab_abbr,
f.site_country,
location,
- len(mdm.compressed()),
+ len(np.ma.compressed(mdm)),
mdm.mean(),
np.sqrt((simulated_std**2).mean()),
diff,diffstd,
@@ -156,10 +156,6 @@ def SummarizeObs(DaCycle,printfmt='html'):
diffwinter,diffwinterstd)
table.append(ss)
- lons.append(f.site_longitude)
- lats.append(f.site_latitude)
- names.append(f.site_code)
- nobs.append(len(mdm.compressed()))
f.close()
if printfmt == 'tex':
@@ -357,7 +353,7 @@ if __name__ == '__main__': # started as script
DaCycle.DaSystem = DaSystem
- #q=SummarizeObs(DaCycle)
+ q=SummarizeObs(DaCycle)
while DaCycle['time.start'] < DaCycle['time.finish']:
--
GitLab