Changeset 5bad6ec in flex_extract.git for source/python/mods

Timestamp:

Oct 5, 2018, 5:20:48 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

ae88f7d

Parents:

ca867de

Message:

added possibility to extract public datasets via an logical public parameter

Location:

source/python/mods

Files:

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

source/python/mods/get_mars_data.py

@@ -54 +54 @@
 sys.path.append('../')
 import _config
-from tools import my_error, normal_exit, get_cmdline_arguments, read_ecenv
+from tools import (my_error, normal_exit, get_cmdline_arguments,
+                   read_ecenv, make_dir)
 from classes.EcFlexpart import EcFlexpart
 from classes.UioFiles import UioFiles
@@ -114 +115 @@
 
     if not os.path.exists(c.inputdir):
-        os.makedirs(c.inputdir)
+        make_dir(c.inputdir)
 
     if c.request == 0 or c.request == 2:
@@ -125 +126 @@
 
     if ecapi:
-        server = ecmwfapi.ECMWFService("mars")
+        if c.public:
+            server = ecmwfapi.ECMWFDataServer()
+        else:
+            server = ecmwfapi.ECMWFService("mars")
     else:
         server = False
@@ -254 +258 @@
 
         try:
-            flexpart.retrieve(server, dates, c.request, c.inputdir)
+            flexpart.retrieve(server, dates, c.public, c.request, c.inputdir)
         except IOError:
             my_error(c.mailfail, 'MARS request failed')

source/python/mods/prepare_flexpart.py

@@ -63 +63 @@
 from classes.UioFiles import UioFiles
 from classes.ControlFile import ControlFile
-from tools import clean_up, get_cmdline_arguments, read_ecenv
+from tools import clean_up, get_cmdline_arguments, read_ecenv, make_dir
 from classes.EcFlexpart import EcFlexpart
 
@@ -153 +153 @@
     # create output dir if necessary
     if not os.path.exists(c.outputdir):
-        os.makedirs(c.outputdir)
+        make_dir(c.outputdir)
 
     # get all files with flux data to be deaccumulated

source/python/mods/tools.py

@@ -139 +139 @@
                         help="list all mars request in file mars_requests.dat \
                         and skip submission to mars")
+    parser.add_argument("--public", dest="public",
+                        type=none_or_int, default=None,
+                        help="public mode - retrieves the public datasets")
 
     # some arguments that override the default in the CONTROL file