From 444c3ce6ca54f4b6fc1c95aaa6e79867a16498e0 Mon Sep 17 00:00:00 2001
From: ivar <amvdw95@gmail.com>
Date: Fri, 10 Aug 2012 09:44:45 +0000
Subject: [PATCH] reintroduced R-scaling factor in obspack
---
da/ctc13/obspack.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/da/ctc13/obspack.py b/da/ctc13/obspack.py
index c3630d2..3e6c528 100755
--- a/da/ctc13/obspack.py
+++ b/da/ctc13/obspack.py
@@ -128,7 +128,7 @@ class ObsPackObservations(Observation):
alts = ncf.GetVariable('altitude').take(subselect,axis=0)
obs = ncf.GetVariable('value').take(subselect,axis=0)
if obsspecie == self.ObsPackCo2Dir:
- obs = obs*1.e6 #IV convert to ppm
+ obs = obs #*1.e6 #IV convert to ppm
species = ncf.GetAttribute('dataset_parameter')
#strategy = ncf.GetVariable('sampling_strategy').take(subselect,axis=0)
strategy = 1
@@ -186,7 +186,7 @@ class ObsPackObservations(Observation):
tr_species=array(tr_species)
if self.Co2_only:
- simulated = simulated*1.e6
+ simulated = simulated #*1.e6
if self.C13_only:
simulated = mtp.MixingratioToPermil(filename,simulated)
if self.Co2_C13_together:
@@ -414,10 +414,12 @@ class ObsPackObservations(Observation):
if SiteInfo.has_key(identifier):
msg = "Observation found (%s, %s)" % (obs.code, identifier,) ; logging.debug(msg)
- obs.mdm = SiteInfo[identifier]['error']
+ # obs.mdm = SiteInfo[identifier]['error']
if species=='co2c13':
# obs.mdmc13 = SiteInfo[identifier]['error_c13']
obs.mdm = SiteInfo[identifier]['error_c13']
+ else:
+ obs.mdm = SiteInfo[identifier]['error']*self.global_R_scaling
print obs,obs.mdm,species
obs.may_localize = SiteInfo[identifier]['may_localize']
obs.may_reject = SiteInfo[identifier]['may_reject']
--
GitLab