minor changes to properly work on cartesius

da/analysis/daily_fluxes.py

@@ -42,7 +42,7 @@ def daily_avg(rundir,avg):
 
     for k,v in fileinfo.iteritems():
         cycle_file = os.path.join(weekdir,k)
-        for i in range(dt.days):
+        for i in range(abs(dt.days)):
             daily_file = os.path.join(daydir,'%s_fluxes.%s.nc'%(avg,(v+datetime.timedelta(days=i)).strftime('%Y-%m-%d')))
             if not os.path.lexists(daily_file):
                 os.symlink(cycle_file,daily_file)

da/analysis/expand_molefractions.py

@@ -127,6 +127,11 @@ def write_mole_fractions(dacycle):
             ncf_out = io.CT_CDF(copy_file, 'write')
 
             # Modify the attributes of the file to reflect added data from CTDAS properly
+
+	    try:
+	       host=os.environ['HOSTNAME']
+	    except:
+	       host='unknown'
      
 
             ncf_out.Caution = '==================================================================================='
@@ -135,7 +140,7 @@ def write_mole_fractions(dacycle):
             except:
                 ncf_out.History = '\nOriginal observation file modified by user %s on %s\n' % (os.environ['USER'], datetime.today().strftime('%F'),)
             ncf_out.CTDAS_info = 'Simulated values added from a CTDAS run by %s on %s\n' % (os.environ['USER'], datetime.today().strftime('%F'),)\
-                               + '\nCTDAS was run on platform %s' % (os.environ['HOST'],)\
+                               + '\nCTDAS was run on platform %s' % (host,)\
                                + '\nCTDAS job directory was %s' % (dacycle['dir.da_run'],)\
                                + '\nCTDAS Da System was %s' % (dacycle['da.system'],)\
                                + '\nCTDAS Da ObsOperator was %s' % (dacycle['da.obsoperator'],)

da/analysis/monthly_fluxes.py

@@ -30,13 +30,15 @@ def monthly_avg(rundir,avg):
         print "Creating new output directory " + monthdir
         os.makedirs(monthdir)
         sd = datetime.datetime(1999,1,1)
+
+    files_monthly = os.listdir(monthdir)
+    if files_monthly == []:
+        sd = datetime.datetime(1999,1,1)
     else: 
-        files_monthly = os.listdir(monthdir)
         files_monthly.sort()
         fm = files_monthly[-1]
         #sd = datetime.datetime(int(fm[9:13]),int(fm[14:16]),1)
         sd = datetime.datetime.strptime(fm.split('.')[-2],'%Y-%m')
-    print sd
             
     files = [f for f in files if '-' in f]
 
@@ -50,7 +52,8 @@ def monthly_avg(rundir,avg):
     
     if sd > datetime.datetime(1999,2,1):
         sd = sd + relativedelta(months=+1)
-    else: sd = datetime.datetime(min(years),1,1)
+    else: 
+        sd = datetime.datetime(min(years),1,1)
     ed = datetime.datetime(max(years)+1,1,1)
 
     while sd < ed: 

da/analysis/yearly_fluxes.py

@@ -24,15 +24,19 @@ def yearly_avg(rundir,avg):
         raise IOError,'rundir requested (%s) does not exist, exiting...'%rundir
 
     monthdir = os.path.join(rundir , 'data_%s_monthly'%avg )
-    files  = os.listdir(monthdir)
     yeardir = os.path.join(rundir,'data_%s_yearly'%avg)
     if not os.path.exists(yeardir):
         print "Creating new output directory " + yeardir
         os.makedirs(yeardir)
         sd = datetime.datetime(1999,1,1)
+
+    files_yearly = os.listdir(yeardir)
+    if files_yearly == []:
+        sd = datetime.datetime(1999,1,1)
     else: 
-        files_yearly = os.listdir(monthdir)
         files_yearly.sort()
+        fm = files_yearly[-1]
+        sd = datetime.datetime.strptime(fm.split('.')[-2],'%Y')
             
     files = [f for f in files if '-' in f]