From 9aefaadcad4f37803b25dccec9574c3b437be4e6 Mon Sep 17 00:00:00 2001 From: Anne Philipp <anne.philipp@univie.ac.at> Date: Fri, 14 Dec 2018 01:04:07 +0100 Subject: [PATCH] renamed function get_cmdline_args --- source/python/mods/get_mars_data.py | 4 ++-- source/python/mods/prepare_flexpart.py | 4 ++-- source/python/mods/tools.py | 4 ++-- source/python/submit.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/python/mods/get_mars_data.py b/source/python/mods/get_mars_data.py index d96075b..9805570 100755 --- a/source/python/mods/get_mars_data.py +++ b/source/python/mods/get_mars_data.py @@ -69,7 +69,7 @@ from datetime import datetime, timedelta sys.path.append(os.path.dirname(os.path.abspath( inspect.getfile(inspect.currentframe()))) + '/../') import _config -from tools import (my_error, normal_exit, get_cmdline_arguments, +from tools import (my_error, normal_exit, get_cmdline_args, read_ecenv, make_dir) from classes.EcFlexpart import EcFlexpart from classes.UioFiles import UioFiles @@ -97,7 +97,7 @@ def main(): ''' - args = get_cmdline_arguments() + args = get_cmdline_args() c = ControlFile(args.controlfile) env_parameter = read_ecenv(_config.PATH_ECMWF_ENV) diff --git a/source/python/mods/prepare_flexpart.py b/source/python/mods/prepare_flexpart.py index 0b95534..1ef589c 100755 --- a/source/python/mods/prepare_flexpart.py +++ b/source/python/mods/prepare_flexpart.py @@ -65,7 +65,7 @@ import _config from checks import check_ppid from classes.UioFiles import UioFiles from classes.ControlFile import ControlFile -from tools import clean_up, get_cmdline_arguments, read_ecenv, make_dir +from tools import clean_up, get_cmdline_args, read_ecenv, make_dir from classes.EcFlexpart import EcFlexpart ecapi = 'ecmwf' not in socket.gethostname() @@ -92,7 +92,7 @@ def main(): ''' - args = get_cmdline_arguments() + args = get_cmdline_args() c = ControlFile(args.controlfile) env_parameter = read_ecenv(_config.PATH_ECMWF_ENV) diff --git a/source/python/mods/tools.py b/source/python/mods/tools.py index 6cbc2f1..03ae957 100644 --- a/source/python/mods/tools.py +++ b/source/python/mods/tools.py @@ -31,7 +31,7 @@ # used in different places in flex_extract. # # @Module Content: -# - get_cmdline_arguments +# - get_cmdline_args # - clean_up # - my_error # - normal_exit @@ -100,7 +100,7 @@ def none_or_int(value): return None return int(value) -def get_cmdline_arguments(): +def get_cmdline_args(): '''Decomposes the command line arguments and assigns them to variables. Apply default values for non mentioned arguments. diff --git a/source/python/submit.py b/source/python/submit.py index 55a4b89..99b3202 100755 --- a/source/python/submit.py +++ b/source/python/submit.py @@ -50,7 +50,7 @@ import collections # software specific classes and modules from flex_extract import _config -from mods.tools import (normal_exit, get_cmdline_arguments, +from mods.tools import (normal_exit, get_cmdline_args, submit_job_to_ecserver, read_ecenv) from mods.get_mars_data import get_mars_data from mods.prepare_flexpart import prepare_flexpart @@ -74,7 +74,7 @@ def main(): ''' - args = get_cmdline_arguments() + args = get_cmdline_args() c = ControlFile(args.controlfile) env_parameter = read_ecenv(_config.PATH_ECMWF_ENV) -- GitLab