now works on huygens, extra import needed at top-level

da/analysis/expand_fluxes.py

@@ -6,6 +6,7 @@ import os
 import getopt
 from datetime import datetime, timedelta
 from da.tools.general import CreateDirs
+from da.analysis.tools_country import countryinfo  # needed here
 import numpy as np
 from pylab import date2num, num2date
 
@@ -133,6 +134,7 @@ def SaveWeeklyAvg1x1Data(DaCycle, StateVector):
 #
 # if prior, do not multiply fluxes with parameters, otherwise do
 #
+            print gridensemble.shape,bio.shape,gridmean.shape
             biomapped=bio*gridmean 
             oceanmapped=ocean*gridmean 
             biovarmapped=bio*gridensemble
@@ -154,6 +156,7 @@ def SaveWeeklyAvg1x1Data(DaCycle, StateVector):
             savedict['count']=next
             ncf.AddData(savedict)
 
+	    print biovarmapped.shape
             savedict=ncf.StandardVar(varname='bio_flux_%s_ensemble'%qual_short)
             savedict['values']=biovarmapped.tolist()
             savedict['dims']=dimdate+dimensemble+dimgrid
@@ -1063,11 +1066,11 @@ if __name__ == "__main__":
 
     logging.root.setLevel(logging.DEBUG)
 
-    DaCycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
+    DaCycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-nam1x1-obspack-full-gridded.rc'})
     DaCycle.Initialize()
     DaCycle.ParseTimes()
 
-    DaSystem    = CtDaSystem('../rc/carbontracker_ct09_opf.rc')
+    DaSystem    = CtDaSystem('../rc/carbontracker_ct09_opfnew.rc')
     DaSystem.Initialize()
 
     DaCycle.DaSystem    = DaSystem
@@ -1078,9 +1081,9 @@ if __name__ == "__main__":
     while DaCycle['time.end'] < DaCycle['time.finish']:
 
         savedas_1x1=SaveWeeklyAvg1x1Data(DaCycle, StateVector)
-        #savedas_state=SaveWeeklyAvgStateData(DaCycle, StateVector)
-        #savedas_tc=SaveWeeklyAvgTCData(DaCycle, StateVector)
-        #savedas_tcext=SaveWeeklyAvgExtTCData(DaCycle)
+        savedas_state=SaveWeeklyAvgStateData(DaCycle, StateVector)
+        savedas_tc=SaveWeeklyAvgTCData(DaCycle, StateVector)
+        savedas_tcext=SaveWeeklyAvgExtTCData(DaCycle)
         savedas_olson=SaveWeeklyAvgAggData(DaCycle,region_aggregate='olson')
         savedas_transcom=SaveWeeklyAvgAggData(DaCycle,region_aggregate='transcom')
         savedas_country=SaveWeeklyAvgAggData(DaCycle,region_aggregate='country')
@@ -1095,9 +1098,6 @@ if __name__ == "__main__":
         savedas_state   = SaveTimeAvgData(DaCycle,savedas_state,avg)
         savedas_tc      = SaveTimeAvgData(DaCycle,savedas_tc,avg)
         savedas_tcext   = SaveTimeAvgData(DaCycle,savedas_tcext,avg)
-        savedas_olson   = SaveTimeAvgData(DaCycle,savedas_olson,avg)
-        savedas_transcom   = SaveTimeAvgData(DaCycle,savedas_transcom,avg)
-        savedas_country    = SaveTimeAvgData(DaCycle,savedas_country,avg)
 
     sys.exit(0)