Commit 9ad0f3f9 authored by Ingrid Luijkx's avatar Ingrid Luijkx
Browse files

Changed expand_mixingratios to allow R and HPHR to be either matrix or vector...

Changed expand_mixingratios to allow R and HPHR to be either matrix or vector depending on algorithm choice (serial or bulk).
parent ad607933
......@@ -88,9 +88,16 @@ def WriteMixingRatios(DaCycle):
fc_obs_val = ncf_fc_in.GetVariable('observed')
fc_simulated = ncf_fc_in.GetVariable('modelsamplesmean_prior')
fc_simulated_ens = ncf_fc_in.GetVariable('modelsamplesdeviations_prior')
fc_flag = ncf_fc_in.GetVariable('flag')
fc_r = ncf_fc_in.GetVariable('modeldatamismatchvariance').diagonal()
fc_hphtr = ncf_fc_in.GetVariable('totalmolefractionvariance').diagonal()
fc_flag = ncf_fc_in.GetVariable('flag')
if not DaCycle.DaSystem.has_key('opt.algorithm'):
fc_r = ncf_fc_in.GetVariable('modeldatamismatchvariance')
fc_hphtr = ncf_fc_in.GetVariable('totalmolefractionvariance')
elif DaCycle.DaSystem['opt.algorithm'] == 'serial':
fc_r = ncf_fc_in.GetVariable('modeldatamismatchvariance')
fc_hphtr = ncf_fc_in.GetVariable('totalmolefractionvariance')
elif DaCycle.DaSystem['opt.algorithm'] == 'bulk':
fc_r = ncf_fc_in.GetVariable('modeldatamismatchvariance').diagonal()
fc_hphtr = ncf_fc_in.GetVariable('totalmolefractionvariance').diagonal()
filesitecode = ncf_fc_in.GetVariable('sitecode')
fc_sitecodes = netCDF4.chartostring(filesitecode).tolist()
......
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