From 313fd30b8e41f93f0c0cd063777903d4c95525b2 Mon Sep 17 00:00:00 2001 From: ivar <amvdw95@gmail.com> Date: Fri, 11 May 2012 10:59:39 +0000 Subject: [PATCH] added MixingratioToPermil --- da/ctc13/obspack.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/da/ctc13/obspack.py b/da/ctc13/obspack.py index 3428b192..fc5765b8 100755 --- a/da/ctc13/obspack.py +++ b/da/ctc13/obspack.py @@ -138,8 +138,10 @@ class ObsPackObservations(Observation): """ Adds model simulated values to the mixing ratio objects """ import da.tools.io4 as io + import da.tools.MixingratioToPermil as mtp from numpy import array + if not os.path.exists(filename): msge = "Sample output filename for observations could not be found : %s" % filename ; logging.error(msge) msg = "Did the sampling step succeed?" ; logging.error(msg) @@ -169,21 +171,11 @@ class ObsPackObservations(Observation): trjoin = [''.join(trspecies[i,:])] tr_species.append(trjoin[0].strip()) tr_species=array(tr_species) - print obs_species + print 'obs_species',obs_species print 'trspecies',tr_species - simulated=simulated*1.e6 - - - trlength=len(simulated[0,:]) - memlength=trlength/2 - print simulated[:,0:memlength] - print simulated[:,memlength:trlength] - print simulated[:,39] - print simulated[:,79] - print 1000.*((simulated[:,79]/simulated[:,39]/0.011112)-1.) - - simulated[:,memlength:trlength]=1000.*((simulated[:,memlength:trlength]/simulated[:,0:memlength]/0.011112)-1.) - print simulated + + simulated = mtp.MixingratioToPermil(filename,simulated) + for id,obs_specie,val in zip(ids,obs_species,simulated): print id,obs_ids print obs_specie, tr_species @@ -589,17 +581,17 @@ if __name__ == "__main__": import logging from da.tools.initexit import CycleControl from da.ct.dasystem import CtDaSystem - from da.ctgridded.statevector import CtGriddedStateVector + from da.ct.statevector import CtStateVector sys.path.append('../../') logging.root.setLevel(logging.DEBUG) - DaCycle = CycleControl(args={'rc':'../../dagriddedjet.rc'}) + DaCycle = CycleControl(args={'rc':'../../da.rc'}) DaCycle.Initialize() DaCycle.ParseTimes() - DaSystem = CtDaSystem('../rc/carbontracker.rc') + DaSystem = CtDaSystem('../../carbontracker.rc') DaSystem.Initialize() DaCycle.DaSystem = DaSystem -- GitLab