mean flux files now expected as part of output

da/analysis/expand_fluxes.py

@@ -85,7 +85,7 @@ def SaveWeeklyAvg1x1Data(rundat):
 #
 # if not, process this week. Start by getting input data from TM5
 #
-        filename = os.path.join(rundat.inputdir,'flux1x1_%s_%s.nc'%(week.strftime('%Y%m%d%H'),(week+dt).strftime('%Y%m%d%H'),) )
+        filename = os.path.join(rundat.inputdir,'%s'%week.strftime('%Y%m%d'),'flux1x1_%s_%s.nc'%(week.strftime('%Y%m%d%H'),(week+dt).strftime('%Y%m%d%H'),) )
 
         file=io.CT_CDF(filename,'read')
         bio=array(file.GetVariable(rundat.namedict['background.co2.bio.flux']))