diff --git a/carbontracker.rc b/carbontracker.rc index e0375e68097edda9bec6092f199b6b29078abd49..3b1b5d511f9ee91e076fdb29e5e1db1b844c0c93 100644 --- a/carbontracker.rc +++ b/carbontracker.rc @@ -3,7 +3,7 @@ !datadir : /lfs0/projects/co2/input/ datadir : /data/CO2/carbontracker/ct08/ obs.input.dir : ${datadir}/obsnc/with_fillvalue -obs.input.fname : obs_final.nc +obs.input.fname : obs_final ocn.covariance : ${datadir}/oif_p3_era40.dpco2.2000.01.hdf bio.covariance : ${datadir}/covariance_bio_olson19.nc deltaco2.prefix : oif_p3_era40.dpco2 diff --git a/da.rc b/da.rc index 6c651934d4f33c1da3d00f42c209987c49ee4fbf..8150ef18923b99580b073100e2ea9479041782db 100644 --- a/da.rc +++ b/da.rc @@ -2,20 +2,9 @@ time.restart : False time.start : 2000-01-01 00:00:00 -time.finish : 2000-01-08 00:00:00 +time.finish : 2000-01-15 00:00:00 time.cycle : 7 time.nlag : 2 dir.da_run : ${HOME}/tmp/test_da -! Info on the DA system used - -da.system : CarbonTracker -da.system.rc : carbontracker.rc -da.platform : maunaloa - - -! Info on the forward model to be used - -forecast.model : TM5 -forecast.model.rc : ${HOME}/Modeling/TM5/ct_new.rc forecast.nmembers : 2 diff --git a/da/baseclasses/dasystem.py b/da/baseclasses/dasystem.py index 8048ac552bd6dd2b7e32a900aa67f41e94ffb56b..1806f04ddcc053ca33b76483f9b1f3e44b44b2bf 100755 --- a/da/baseclasses/dasystem.py +++ b/da/baseclasses/dasystem.py @@ -27,8 +27,13 @@ class DaSystem(dict): to the dictionary """ + self.Identifier = 'CarbonTracker CO2' # the identifier gives the platform name + self.LoadRc(rcfilename) + msg = 'Data Assimilation System initialized: %s'%self.Identifier ; logging.debug(msg) + + def __str__(self): """ String representation of a DaInfo object @@ -52,7 +57,7 @@ class DaSystem(dict): self.RcFileName = RcFileName self.DaRcLoaded = True - msg = 'DA System Info rc-file (%s) loaded successfully'%self.RcFileName ; logging.info(msg) + msg = 'DA System Info rc-file (%s) loaded successfully'%self.RcFileName ; logging.debug(msg) return True diff --git a/da/baseclasses/platform.py b/da/baseclasses/platform.py index 5c93c537d28004d53dcf058056f41cfbc4512fce..d6c8069e2e4c775aba409866b9dbc8d3b1d16248 100755 --- a/da/baseclasses/platform.py +++ b/da/baseclasses/platform.py @@ -36,7 +36,7 @@ class PlatForm(object): def __str__(self): - return None + return self.Version def GetJobTemplate(self,joboptions={},block=False): """ diff --git a/da/platform/maunaloa.py b/da/platform/maunaloa.py index a30dca84479dc3c3f483cac81df04d5288e06582..3da7a8f9b6c478e6d027fe94f00b89a67be77000 100755 --- a/da/platform/maunaloa.py +++ b/da/platform/maunaloa.py @@ -18,11 +18,12 @@ from da.baseclasses.platform import PlatForm class MaunaloaPlatForm(PlatForm): def __init__(self): + self.Identifier = 'WUR maunaloa' # the identifier gives the platform name self.Version = '1.0' # the platform version used - msg1 = '%s platform object initialized'%self.Identifier ; logging.debug(msg1) - msg2 = '%s version: %s'%(self.Identifier,self.Version) ; logging.debug(msg2) + msg1 = 'Platform initialized: %s'%self.Identifier ; logging.info(msg1) + #msg2 = '%s version: %s'%(self.Identifier,self.Version) ; logging.info(msg2) if __name__ == "__main__": diff --git a/das.py b/das.py index 7edf76f66a1b6f1978f1da10517e74d22419a72c..ed014195be19847693b37ecb8ebd21dc1ec0e002 100755 --- a/das.py +++ b/das.py @@ -23,20 +23,20 @@ dummy = StartLogger() ### IMPORT THE APPLICATION SPECIFIC MODULES HERE, TO BE PASSED INTO THE MAIN PIPELINE!!! ## ########################################################################################### -#from da.platform.maunaloa import MaunaloaPlatForm -from da.platform.jet import JetPlatForm +from da.platform.maunaloa import MaunaloaPlatForm +#from da.platform.jet import JetPlatForm from da.ct.dasystem import CtDaSystem from da.ct.statevector import CtStateVector from da.ct.obs import CtObservations from da.tm5.observationoperator import TM5ObservationOperator from da.ct.optimizer import CtOptimizer -#PlatForm = MaunaloaPlatForm() -PlatForm = JetPlatForm() -DaSystem = CtDaSystem('carbontrackerjet.rc') -StateVector = CtStateVector() +PlatForm = MaunaloaPlatForm() +#PlatForm = JetPlatForm() +DaSystem = CtDaSystem('carbontracker.rc') +ObsOperator = TM5ObservationOperator('/Users/peters/Modeling/TM5/ct_new.rc') Samples = CtObservations() -ObsOperator = TM5ObservationOperator() +StateVector = CtStateVector() Optimizer = CtOptimizer() ##########################################################################################