changed writing of posterior 1x1 degree fluxes, lag=nlag should have been lag=1

da/analysis/expand_fluxes.py

@@ -125,7 +125,7 @@ def SaveWeeklyAvg1x1Data(DaCycle, StateVector):
                 savedir                 = DaCycle['dir.output']
                 filename                = os.path.join(savedir,'savestate.nc')
                 dummy                   = StateVector.ReadFromFile(filename,qual=qual_short)
-                gridmean,gridvariance   = StateVector.StateToGrid(lag=nlag)
+                gridmean,gridvariance   = StateVector.StateToGrid(lag=1)
 
                 msg = 'Read posterior dataset from file %s, sds %d: '%(filename,nlag) ; logging.debug(msg)
 #
@@ -821,22 +821,22 @@ 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':'../../dagridded.rc'})
+    DaCycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
     DaCycle.Initialize()
     DaCycle.ParseTimes()
 
-    DaSystem    = CtDaSystem('../rc/carbontrackergridded.rc')
+    DaSystem    = CtDaSystem('../rc/carbontracker_ct09_opf.rc')
     DaSystem.Initialize()
 
     DaCycle.DaSystem    = DaSystem
 
-    StateVector = CtGriddedStateVector(DaCycle)
+    StateVector = CtStateVector(DaCycle)
     dummy       = StateVector.Initialize()
 
     while DaCycle['time.start'] < DaCycle['time.finish']: