Changeset 25b14be in flex_extract.git for source/python/classes

Timestamp:

Sep 23, 2018, 11:40:28 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

4971f63

Parents:

5d42acd

Message:

changed whole tree structure of flex_extract to have better overview

Location:

source/python/classes

Files:

• ControlFile.py (moved) (moved from python/ControlFile.py) (3 diffs)
• EcFlexpart.py (moved) (moved from python/EcFlexpart.py) (3 diffs)
• GribTools.py (moved) (moved from python/GribTools.py)
• MarsRetrieval.py (moved) (moved from python/MarsRetrieval.py) (3 diffs)
• UioFiles.py (moved) (moved from python/pythontest/TestInstallTar/flex_extract_v7.1/python/UioFiles.py) (5 diffs)
• __init__.py (added)

source/python/classes/ControlFile.py

@@ -143 +143 @@
         self.ecstorage = 0
         self.ectrans = 0
-        self.inputdir = '../work'
+        self.inputdir = _config.PATH_INPUT_DIR
         self.outputdir = self.inputdir
         self.ecmwfdatadir = _config.PATH_FLEXEXTRACT_DIR
@@ -177 +177 @@
             <nothing>
         '''
-        from tools import my_error
+        from mods.tools import my_error
 
         # read whole CONTROL file
@@ -331 +331 @@
             <nothing>
         '''
-        from tools import my_error
+        from mods.tools import my_error
         import numpy as np
 

source/python/classes/EcFlexpart.py

@@ -61 +61 @@
 #
 # @Class Attributes:
-#    - dtime
-#    - basetime
-#    - server
-#    - marsclass
-#    - stream
-#    - resol
-#    - accuracy
-#    - number
-#    - expver
-#    - glevelist
-#    - area
-#    - grid
-#    - level
-#    - levelist
-#    - types
-#    - dates
-#    - area
-#    - gaussian
-#    - params
-#    - inputdir
-#    - outputfilelist
+#
+#  TODO
 #
 #*******************************************************************************
 #pylint: disable=unsupported-assignment-operation
-# this is disabled because its an error in pylint for this specific case
+# this is disabled because for this specific case its an error in pylint
 #pylint: disable=consider-using-enumerate
 # this is not useful in this case
@@ -104 +85 @@
 import _config
 from GribTools import GribTools
-from tools import init128, to_param_id, silent_remove, product, my_error
+from mods.tools import init128, to_param_id, silent_remove, product, my_error
 from MarsRetrieval import MarsRetrieval
-import disaggregation
+import mods.disaggregation
 
 # ------------------------------------------------------------------------------
@@ -471 +452 @@
                         MR.data_retrieve()
                     elif request == 1:
-                        MR.print_info()
+                        MR.print_info(self.inputdir)
                     elif request == 2:
-                        MR.print_info()
+                        MR.print_info(self.inputdir)
                         MR.display_info()
                         MR.data_retrieve()

source/python/classes/MarsRetrieval.py

@@ -335 +335 @@
 
 
-    def print_info(self):
+    def print_info(self, inputdir):
         '''
         @Description:
@@ -345 +345 @@
                 For description see class documentation.
 
+            inputdir: string
+                The path where all data from the retrievals are stored.
+
         @Return:
             <nothing>
@@ -352 +355 @@
 
         # open a file to store all requests to
-        with open(os.path.join(_config.PATH_RUN_DIR,
+        with open(os.path.join(inputdir,
                                _config.FILE_MARS_REQUESTS), 'a') as f:
             f.write('mars\n')

source/python/classes/UioFiles.py

@@ -52 +52 @@
 # software specific module from flex_extract
 #import profiling
-from tools import silent_remove, get_list_as_string
+from mods.tools import silent_remove, get_list_as_string
 
 # ------------------------------------------------------------------------------
@@ -60 +60 @@
 class UioFiles(object):
     '''
-    Class to manipulate files. At initialisation it has the attribute
-    pattern which stores a regular expression pattern for the files associated
-    with the instance of the class.
+    Class to manipulate files. At initialisation it has the pattern
+    which stores a regular expression pattern for the files, the path
+    to the files and the files already.
     '''
     # --------------------------------------------------------------------------
@@ -88 +88 @@
         self.path = path
         self.pattern = pattern
-        self.files = None
+        self.files = []
 
         self.__list_files__(self.path)
@@ -95 +95 @@
 
     #@profiling.timefn
-    def __list_files__(self, path, callid=0):
+    def __list_files__(self, path):
         '''
         @Description:
@@ -108 +108 @@
                 Path to the files.
 
-            callid: integer
-                Id which tells the function if its the first call
-                or a recursive call. Default and first call is 0.
-                Everything different from 0 is ment to be a recursive case.
-
         @Return:
             <nothing>
         '''
-
-        # initialize variable in first function call
-        if callid == 0:
-            self.files = []
-
         # Get the absolute path
         path = os.path.abspath(path)
 
-        # get the file list of the path if its not a directory and
-        # if it contains the pattern
-        self.files.extend([os.path.join(path, k) for k in os.listdir(path)
-                           if fnmatch.fnmatch(k, self.pattern)])
-
-        # find possible sub-directories in the path
-        subdirs = [s for s in os.listdir(path)
-                   if os.path.isdir(os.path.join(path, s))]
-
-        # do recursive calls for sub-direcorties
-        if subdirs:
-            for subdir in subdirs:
-                self.__list_files__(os.path.join(path, subdir), callid=1)
+        # get all files in the dir and subdir as absolut path
+        for root, dirnames, filenames in os.walk(path):
+            for filename in fnmatch.filter(filenames, self.pattern):
+                self.files.append(os.path.join(root, filename))
 
         return