Commit 4f25a9b2 authored by Florentie, Liesbeth's avatar Florentie, Liesbeth
Browse files

include option to perform data assimilation with CO2 concentrations in ppm...

include option to perform data assimilation with CO2 concentrations in ppm instead of mol fraction + updated statevector ecoregion selection to exclude olson landtypes = water
parent 98e4c27b
......@@ -188,7 +188,7 @@ class ctsfObsPackObservations(ObsPackObservations):
del key, value
for obs in self.datalist: # first loop over all available data points to set flags correctly
obs.mdm = 1000.0 # default is very high model-data-mismatch, until explicitly set by script
obs.mdm = 1000.0 * self.obs_scaling # default is very high model-data-mismatch, until explicitly set by script
if obs.flag == 1: # flag is taken from the gv+ datasets: 1=background/representative, 0=local.
obs.flag = 0
elif obs.flag == 0:
......@@ -209,7 +209,7 @@ class ctsfObsPackObservations(ObsPackObservations):
else:
nr_obs_per_day = len([c.code for c in self.datalist if c.code == obs.code and c.xdate.day == obs.xdate.day and c.flag == 0])
logging.debug("Observation found (%s, %d), mdm category is: %0.2f, scaled with number of observations per day (%i), final mdm applied is: %0.2f." % (identifier, obs.id, site_info[identifier]['error'],nr_obs_per_day,site_info[identifier]['error']*sqrt(nr_obs_per_day)))
obs.mdm = site_info[identifier]['error'] * sqrt(nr_obs_per_day) * self.global_R_scaling
obs.mdm = site_info[identifier]['error'] * sqrt(nr_obs_per_day) * self.global_R_scaling * self.obs_scaling
obs.may_localize = site_info[identifier]['may_localize']
obs.may_reject = site_info[identifier]['may_reject']
obs.flag = 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment