decreased loop length by 1.0 so that routine does not crash

da/analysis/expand_fluxes.py

@@ -543,7 +543,7 @@ def SaveWeeklyAvgTCData(DaCycle, StateVector):
                 tcdata              = np.array(tcdata)
                 cov                 = tcdata.transpose().dot(tcdata)/(StateVector.nmembers-1) 
 
-                print vname,cov.sum()
+                #print vname,cov.sum()
 
                 tcdata              = cov
 
@@ -725,8 +725,8 @@ def SaveTimeAvgData(DaCycle,infile,avg='monthly'):
 # Open input file specified from the command line
 #
     if not os.path.exists(infile):
-        print "Needed input file (%s) not found. Please create this first:"%infile
-        print "returning..."
+        logging.error( "Needed input file (%s) not found. Please create this first:"%infile )
+        logging.error( "returning..." )
         return None 
     else:
         pass
@@ -839,7 +839,7 @@ if __name__ == "__main__":
     StateVector = CtStateVector(DaCycle)
     dummy       = StateVector.Initialize()
 
-    while DaCycle['time.start'] < DaCycle['time.finish']:
+    while DaCycle['time.end'] < DaCycle['time.finish']:
 
         savedas_1x1=SaveWeeklyAvg1x1Data(DaCycle, StateVector)
         savedas_state=SaveWeeklyAvgStateData(DaCycle, StateVector)
@@ -852,8 +852,8 @@ if __name__ == "__main__":
 
     for avg in ['monthly','yearly','longterm']:
 
-        savedas_1x1     = SaveTimeAvgData(DaCycle,savedas_1x1,avg)
-        savedas_state   = SaveTimeAvgData(DaCycle,savedas_state,avg)
+        #savedas_1x1     = SaveTimeAvgData(DaCycle,savedas_1x1,avg)
+        #savedas_state   = SaveTimeAvgData(DaCycle,savedas_state,avg)
         savedas_tc      = SaveTimeAvgData(DaCycle,savedas_tc,avg)
         savedas_tcext   = SaveTimeAvgData(DaCycle,savedas_tcext,avg)