Changeset 27fe969 in flex_extract.git for source/python/mods

Timestamp:

Oct 3, 2018, 7:55:24 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

ca867de

Parents:

65748f4

Message:

put grib2flexpart part of code into its own function; changed function documentation of input controlfile parameter

Location:

source/python/mods

Files:

• get_mars_data.py (modified) (2 diffs)
• prepare_flexpart.py (modified) (2 diffs)
• tools.py (modified) (1 diff)

source/python/mods/get_mars_data.py

@@ -102 +102 @@
     @Input:
         c: instance of class ControlFile
-            Contains all the parameters of CONTROL file, which are e.g.:
-            DAY1(start_date), DAY2(end_date), DTIME, MAXSTEP, TYPE, TIME,
-            STEP, CLASS(marsclass), STREAM, NUMBER, EXPVER, GRID, LEFT,
-            LOWER, UPPER, RIGHT, LEVEL, LEVELIST, RESOL, GAUSS, ACCURACY,
-            OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA, SMOOTH, FORMAT,
-            ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS, ECFSDIR,
-            MAILOPS, MAILFAIL, GRIB2FLEXPART, FLEXPARTDIR, BASETIME
-            DATE_CHUNK, DEBUG, INPUTDIR, OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
-
+            Contains all the parameters of CONTROL file and
+            command line.
             For more information about format and content of the parameter
             see documentation.
@@ -219 +212 @@
 
     @Input:
-        c: instance of ControlFile
-            Contains all the parameters of CONTROL file, which are e.g.:
-            DAY1(start_date), DAY2(end_date), DTIME, MAXSTEP, TYPE, TIME,
-            STEP, CLASS(marsclass), STREAM, NUMBER, EXPVER, GRID, LEFT,
-            LOWER, UPPER, RIGHT, LEVEL, LEVELIST, RESOL, GAUSS, ACCURACY,
-            OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA, SMOOTH, FORMAT,
-            ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS, ECFSDIR,
-            MAILOPS, MAILFAIL, GRIB2FLEXPART, FLEXPARTDIR, BASETIME
-            DATE_CHUNK, DEBUG, INPUTDIR, OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
-
+        c: instance of class ControlFile
+            Contains all the parameters of CONTROL file and
+            command line.
             For more information about format and content of the parameter
             see documentation.

source/python/mods/prepare_flexpart.py

@@ -115 +115 @@
 
         c: instance of class ControlFile
-            Contains all the parameters of CONTROL file, which are e.g.:
-            DAY1(start_date), DAY2(end_date), DTIME, MAXSTEP, TYPE, TIME,
-            STEP, CLASS(marsclass), STREAM, NUMBER, EXPVER, GRID, LEFT,
-            LOWER, UPPER, RIGHT, LEVEL, LEVELIST, RESOL, GAUSS, ACCURACY,
-            OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA, SMOOTH, FORMAT,
-            ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS, ECFSDIR,
-            MAILOPS, MAILFAIL, GRIB2FLEXPART, FLEXPARTDIR, BASETIME
-            DATE_CHUNK, DEBUG, INPUTDIR, OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
-
+            Contains all the parameters of CONTROL file and
+            command line.
             For more information about format and content of the parameter
             see documentation.
@@ -176 +169 @@
     flexpart.create(inputfiles, c)
     flexpart.process_output(c)
+    if c.grib2flexpart:
+        # prepare environment for a FLEXPART run
+        # to convert grib to flexpart binary format
+        flexpart.prepare_fp_files(c)
 
     # check if in debugging mode, then store all files
     # otherwise delete temporary files
-    if int(c.debug) != 0:
+    if c.debug:
         print('\nTemporary files left intact')
     else:

source/python/mods/tools.py

@@ -164 +164 @@
     @Input:
         c: instance of class ControlFile
-            Contains all the parameters of CONTROL file, which are e.g.:
-            DAY1(start_date), DAY2(end_date), DTIME, MAXSTEP, TYPE, TIME,
-            STEP, CLASS(marsclass), STREAM, NUMBER, EXPVER, GRID, LEFT,
-            LOWER, UPPER, RIGHT, LEVEL, LEVELIST, RESOL, GAUSS, ACCURACY,
-            OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA, SMOOTH, FORMAT,
-            ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS, ECFSDIR,
-            MAILOPS, MAILFAIL, GRIB2FLEXPART, FLEXPARTDIR, BASETIME
-            DATE_CHUNK, DEBUG, INPUTDIR, OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
-
+            Contains all the parameters of CONTROL file and
+            command line.
             For more information about format and content of the parameter
             see documentation.