Changeset 79729d5 in flex_extract.git for source/python/classes/EcFlexpart.py

Timestamp:

Mar 8, 2019, 4:07:28 PM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

d727af2

Parents:

82c2959

Message:

switched from python2 to python3

File:

• source/python/classes/EcFlexpart.py (modified) (9 diffs)

source/python/classes/EcFlexpart.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
@@ -278 +278 @@
         i = 0
         for ty, st, ti in zip(ftype, fstep, ftime):
-            btlist = range(len(ftime))
+            btlist = list(range(len(ftime)))
             if self.basetime == 12:
                 btlist = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
@@ -398 +398 @@
             self.params['OG__ML'][0] += '/U/V/ETADOT'
         elif gauss and not eta:
-            self.params['GG__SL'] = ['Q', 'ML', '1', \
-                                     '{}'.format((int(self.resol) + 1) / 2)]
+            self.params['GG__SL'] = ['Q', 'ML', '1',
+                                     '{}'.format((int(self.resol) + 1) // 2)]
             self.params['SH__ML'] = ['U/V/D', 'ML', self.glevelist, 'OFF']
         elif not gauss and not eta:
@@ -408 +408 @@
                            'use this combination only for debugging!')
             self.params['GG__SL'] = ['Q', 'ML', '1',
-                                     '{}'.format((int(self.resol) + 1) / 2)]
+                                     '{}'.format((int(self.resol) + 1) // 2)]
             self.params['GG__ML'] = ['U/V/D/ETADOT', 'ML', self.glevelist,
-                                     '{}'.format((int(self.resol) + 1) / 2)]
+                                     '{}'.format((int(self.resol) + 1) // 2)]
 
         if omega:
@@ -668 +668 @@
             # ftype contains field types such as
             #     [AN, FC, PF, CV]
-            for pk, pv in self.params.iteritems():
+            for pk, pv in self.params.items():
                 # pk contains one of these keys of params
                 #     [SH__ML, SH__SL, GG__ML, GG__SL, OG__ML, OG__SL,
@@ -993 +993 @@
             # create correct timestamp from the three time informations
             cdate = str(codes_get(gid, 'date'))
-            time = codes_get(gid, 'time')/100 # integer
+            time = codes_get(gid, 'time') // 100  # integer
             step = codes_get(gid, 'step') # integer
             ctime = '{:0>2}'.format(time)
@@ -1255 +1255 @@
         # times into seperate end files)
         print('... write disaggregated precipitation to files.')
+        # index variable of disaggregated fields
         it = 0
+        # loop over times and write original time step and the two newly
+        # generated sub time steps for each loop
         for date in date_list:
             for step in step_list:
@@ -1434 +1437 @@
             # remove old fort.* files and open new ones
             # they are just valid for a single product
-            for k, f in fdict.iteritems():
+            for k, f in fdict.items():
                 fortfile = os.path.join(c.inputdir, 'fort.' + k)
                 silent_remove(fortfile)
@@ -1441 +1444 @@
             # create correct timestamp from the three time informations
             cdate = str(codes_get(gid, 'date'))
-            ctime = '{:0>2}'.format(codes_get(gid, 'time')/100)
+            ctime = '{:0>2}'.format(codes_get(gid, 'time') // 100)
             cstep = '{:0>3}'.format(codes_get(gid, 'step'))
             timestamp = datetime.strptime(cdate + ctime, '%Y%m%d%H')