No commit message

No commit message

da/stilt/expand_fluxes.py

@@ -559,7 +559,7 @@ def save_weekly_avg_tc_data(dacycle, statevector):
         # Now convert other variables that were inside the flux_1x1 file
 
         vardict = ncf_in.variables
-        for vname, vprop in vardict.iteritems():
+        for vname, vprop in vardict.items():
 
             data = ncf_in.get_variable(vname)[index]
 
@@ -684,7 +684,7 @@ def save_weekly_avg_ext_tc_data(dacycle):
         # Now convert other variables that were inside the tcfluxes.nc file
 
         vardict = ncf_in.variables
-        for vname, vprop in vardict.iteritems():
+        for vname, vprop in vardict.items():
 
             data = ncf_in.get_variable(vname)[index]
 
@@ -896,7 +896,7 @@ def save_weekly_avg_agg_data(dacycle, region_aggregate='olson'):
         # Now convert other variables that were inside the statevector file
 
         vardict = ncf_in.variables
-        for vname, vprop in vardict.iteritems():
+        for vname, vprop in vardict.items():
             if vname == 'latitude': continue
             elif vname == 'longitude': continue
             elif vname == 'date': continue

da/stilt/obspack.py

@@ -228,7 +228,7 @@ class ObsPackObservations(Observations):
             dim10char = f.add_dim('string_of10chars', 10)
             dimcalcomp = f.add_dim('calendar_components', 6)
 
-            for key, value in self.site_move.iteritems():
+            for key, value in self.site_move.items():
                 msg = "Site is moved by %3.2f degrees latitude and %3.2f degrees longitude" % value
                 f.add_attribute(key, msg)
 
@@ -396,7 +396,7 @@ class ObsPackObservations(Observations):
         site_foot = {} # option added to check for available footprints per observation
         site_incalt = {} # option to increase sampling altitude for sites specified in sites and weights file
         co_filter = {}
-        for key, value in sites_weights.iteritems():
+        for key, value in sites_weights.items():
             if 'co2_' in key or 'sf6' in key:  # to be fixed later, do not yet know how to parse valid keys from rc-files yet.... WP
                 sitename, sitecategory = key, value
                 sitename = sitename.strip()
@@ -548,7 +548,7 @@ class ObsPackObservations(Observations):
             f.close()
             #return outfile
 
-        for key, value in self.site_move.iteritems():
+        for key, value in self.site_move.items():
             msg = "Site is moved by %3.2f degrees latitude and %3.2f degrees longitude" % value
             f.add_attribute(key, msg)