From 118b1c65817f9e05dfc1d9770c65665df2cf67a4 Mon Sep 17 00:00:00 2001 From: thopri <thopri@noc.ac.uk> Date: Thu, 26 Mar 2020 08:58:43 +0000 Subject: [PATCH] fixed command line parsing issue --- pynemo/pynemo_exe.py | 2 +- pynemo/reader/ncml.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pynemo/pynemo_exe.py b/pynemo/pynemo_exe.py index 3f4e2a8..b441a3e 100644 --- a/pynemo/pynemo_exe.py +++ b/pynemo/pynemo_exe.py @@ -18,7 +18,7 @@ def main(): setup_file = '' mask_gui = False try: - opts, dummy_args = getopt.getopt(sys.argv[1:], "h:s:d:g", ["help", "setup=", "download_cmems=", "mask_gui"]) + opts, dummy_args = getopt.getopt(sys.argv[1:], "hsdg", ["help", "setup=", "download_cmems=", "mask_gui"]) except getopt.GetoptError: print("usage: pynemo -g -s -d <namelist.bdy> ") sys.exit(2) diff --git a/pynemo/reader/ncml.py b/pynemo/reader/ncml.py index aba198d..7275f05 100644 --- a/pynemo/reader/ncml.py +++ b/pynemo/reader/ncml.py @@ -41,16 +41,19 @@ except ImportError: import sys from pynemo import nemo_bdy_setup as setup -Setup = setup.Setup(sys.argv[2]) # default settings file -settings = Setup.settings -if 'use_cmems' in settings: - if settings['use_cmems'] == True: - time_counter_const = "time" - if settings['use_cmems'] == False: +try: + Setup = setup.Setup(sys.argv[2]) # default settings file + settings = Setup.settings + if 'use_cmems' in settings: + if settings['use_cmems'] == True: + time_counter_const = "time" + if settings['use_cmems'] == False: + time_counter_const = "time_counter" + if 'use_cmems' not in settings: time_counter_const = "time_counter" -if 'use_cmems' not in settings: + del settings, Setup +except IndexError: time_counter_const = "time_counter" -del settings, Setup class Reader(object): """ This class is the high level of object for the NCML reader, from here using grid type -- GitLab