From 25df310ffa5516f96c80d2f93a18708b27a7650b Mon Sep 17 00:00:00 2001
From: Wouter Peters <wouter.peters@wur.nl>
Date: Tue, 15 May 2012 14:33:56 +0000
Subject: [PATCH] removed faulty scaling of ocean cov, now also reading new
CTDAS covs
---
da/ct/statevector.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/da/ct/statevector.py b/da/ct/statevector.py
index 511b4a94..ccfed8f5 100755
--- a/da/ct/statevector.py
+++ b/da/ct/statevector.py
@@ -67,7 +67,10 @@ class CtStateVector(StateVector):
f_bio = io.CT_Read(file_bio_cov,'read')
cov_ocn = f_ocn.GetVariable('CORMAT')
- cov_bio = f_bio.GetVariable('qprior')
+ if f_bio.variables.has_key('covariance'):
+ cov_bio = f_bio.GetVariable('covariance') # newly created CTDAS covariance files
+ else:
+ cov_bio = f_bio.GetVariable('qprior') # old CarbonTracker covariance files
dummy = f_ocn.close()
dummy = f_bio.close()
@@ -82,7 +85,7 @@ class CtStateVector(StateVector):
nbio = cov_bio.shape[0]
fullcov[0:nbio,0:nbio] = cov_bio
- fullcov[nbio:nbio+nocn,nbio:nbio+nocn] = 0.16 *np.dot(cov_ocn,cov_ocn)
+ fullcov[nbio:nbio+nocn,nbio:nbio+nocn] = cov_ocn
fullcov[nocn+nbio,nocn+nbio] = 1.e-10
--
GitLab