Changeset 0f89116 in flex_extract.git for Source/Python/Classes/ControlFile.py

Timestamp:

Dec 19, 2019, 8:07:12 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

a73c0f6

Parents:

0d99607

Message:

diverse changes due to PEP8 style guide and eliminating grib2flexpart; removed unused parameter

File:

• Source/Python/Classes/ControlFile.py (modified) (11 diffs)

Source/Python/Classes/ControlFile.py

@@ -38 +38 @@
 
 import os
-import re
 import sys
-import inspect
 
 # software specific classes and modules from flex_extract
+#pylint: disable=wrong-import-position
 sys.path.append('../')
 import _config
-from Mods.tools import my_error, silent_remove
+from Mods.tools import my_error
 from Mods.checks import (check_grid, check_area, check_levels, check_purefc,
                          check_step, check_mail, check_queue, check_pathes,
@@ -53 +52 @@
                          check_logicals_type, check_len_type_time_step,
                          check_addpar, check_job_chunk, check_number)
+#pylint: enable=wrong-import-position
 
 # ------------------------------------------------------------------------------
@@ -65 +65 @@
     from the MARS archive for driving FLEXPART are set in a CONTROL file.
     Some specific parameters like the start and end dates can be overwritten
-    by the command line parameters, but in generel all parameters needed
+    by the command line parameters, but in generall all parameters needed
     for a complete set of fields for FLEXPART can be set in the CONTROL file.
 
@@ -238 +238 @@
         Default value is ['${USER}'].
 
-    grib2flexpart : int 0
-        Switch to select generation of preprocessed FLEXPART files ".fp".
-        If it is selected, the program grib2flexpart will try
-        to convert the flex_extract output files into ".fp" format.
-
     ecstorage : int
         Switch to select storage of FLEXPART ready output files
@@ -334 +329 @@
         List of the names of logical switches which controls the flow
         of the program. Default list is ['gauss', 'omega', 'omegadiff', 'eta',
-        'etadiff', 'dpdeta', 'cwc', 'wrf', 'grib2flexpart', 'ecstorage',
+        'etadiff', 'dpdeta', 'cwc', 'wrf', 'ecstorage',
         'ectrans', 'debug', 'request', 'public', 'purefc', 'rrint', 'doubleelda']
     '''
@@ -400 +395 @@
         self.mailfail = ['${USER}']
         self.mailops = ['${USER}']
-        self.grib2flexpart = 0
         self.ecstorage = 0
         self.ectrans = 0
@@ -425 +419 @@
 
         self.logicals = ['gauss', 'omega', 'omegadiff', 'eta', 'etadiff',
-                         'dpdeta', 'cwc', 'wrf', 'grib2flexpart', 'ecstorage',
+                         'dpdeta', 'cwc', 'wrf', 'ecstorage',
                          'ectrans', 'debug', 'oper', 'request', 'public',
                          'purefc', 'rrint', 'doubleelda']
@@ -602 +596 @@
 
         self.outputdir, self.installdir = check_pathes(self.inputdir,
-             self.outputdir, self.installdir, self.flexextractdir)
+                                                       self.outputdir,
+                                                       self.installdir,
+                                                       self.flexextractdir)
 
         self.start_date, self.end_date = check_dates(self.start_date,
@@ -611 +607 @@
         self.levelist, self.level = check_levels(self.levelist, self.level)
 
-        self.step = check_step(self.step, self.mailfail)
+        self.step = check_step(self.step)
 
         self.maxstep = check_maxstep(self.maxstep, self.step)
@@ -649 +645 @@
         self.job_chunk = check_job_chunk(self.job_chunk)
 
-        self.number = check_number(self.number, self.mailfail)
+        self.number = check_number(self.number)
 
         return
@@ -695 +691 @@
 
         return sorted(l)
-