No commit message

No commit message

da/cosmo/pipeline.py

@@ -61,11 +61,11 @@ def forward_pipeline(dacycle, platform, dasystem, samples, statevector, obsopera
     else:
         sam = False
 
-#    if 'forward.savestate.dir' in dacycle:
-    fwddir = os.path.join(dacycle['dir.da_run'],'output',dacycle['time.start'])
-    #else:
-     #   logging.debug("No forward.savestate.dir key found in rc-file, proceeding with self-constructed prior parameters")
-      #  fwddir = False
+    if 'forward.savestate.dir' in dacycle:
+        fwddir = dacycle['forward.savestate.dir']
+    else:
+        logging.debug("No forward.savestate.dir key found in rc-file, proceeding with self-constructed prior parameters")
+        fwddir = False
 
     if 'forward.savestate.legacy' in dacycle:
         legacy = (dacycle['forward.savestate.legacy'].upper() in ["TRUE","T","YES","Y"])

template.py

@@ -29,7 +29,8 @@ from da.tools.initexit import start_logger, validate_opts_args, parse_options, C
 from da.cosmo.pipeline import ensemble_smoother_pipeline, header, footer
 from da.platform.maunaloa import MaunaloaPlatform 
 from da.baseclasses.dasystem import DaSystem 
-from da.cosmo.statevector import StateVector 
+from da.cosmo.covariances import CO2StateVector 
+#from da.cosmo.statevector import StateVector 
 from da.cosmo.obspack_globalviewplus2 import ObsPackObservations
 #from da.cosmo.obs import Obs 
 from da.carbondioxide.optimizer import CO2Optimizer
@@ -59,7 +60,7 @@ dasystem = DaSystem(dacycle['da.system.rc'])
 obsoperator = ObservationOperator(dacycle['da.obsoperator.rc'])
 #samples     = Obs()
 samples     = ObsPackObservations()
-statevector = StateVector()
+statevector = CO2StateVector()
 optimizer = CO2Optimizer()
 
 ##########################################################################################

template.rc

@@ -30,11 +30,12 @@
 
 time.start          : 2013-04-01 00:00:00
 time.finish         : 2013-04-07 23:00:00
-!time.finish         : 2013-05-01 00:00:00
 
 ! Whether to restart the CTDAS system from a previous cycle, or to start the sequence fresh. Valid entries are T/F/True/False/TRUE/FALSE
 
-time.restart        : False
+time.restart        : F
+!time.restart        : T
+da.restart.tstamp   : 2013-04-01 00:00:00
 
 ! The length of a cycle is given in days, such that the integer 7 denotes the typically used weekly cycle. Valid entries are integers > 1