From 6e12f88a6c46cd17d7ce43b54c4315a3a709a1cf Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Tue, 16 Aug 2022 05:56:16 +0100 Subject: [PATCH 1/5] Update bgcval2/analysis_timeseries.py Co-authored-by: Valeriu Predoi --- bgcval2/analysis_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgcval2/analysis_timeseries.py b/bgcval2/analysis_timeseries.py index 22699d02..3e01fce4 100755 --- a/bgcval2/analysis_timeseries.py +++ b/bgcval2/analysis_timeseries.py @@ -97,7 +97,7 @@ def build_list_of_suite_keys(suites, debug=True): paths_dir = os.path.dirname(os.path.realpath(__file__)) key_lists_dir = os.path.join(os.path.dirname(paths_dir), 'key_lists') - print('key_lists_dir', key_lists_dir) + print(f'analysis_timeseries: Directory where keys are stored: {key_lists_dir}') analysis_keys = {} for suite in suites: print(suite) From bd3012d8a1c772909f0d514e2a8f03352baea597 Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Tue, 16 Aug 2022 05:56:31 +0100 Subject: [PATCH 2/5] Update bgcval2/analysis_timeseries.py Co-authored-by: Valeriu Predoi --- bgcval2/analysis_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgcval2/analysis_timeseries.py b/bgcval2/analysis_timeseries.py index 3e01fce4..7d01b2a4 100755 --- a/bgcval2/analysis_timeseries.py +++ b/bgcval2/analysis_timeseries.py @@ -107,7 +107,7 @@ def build_list_of_suite_keys(suites, debug=True): print('build_list_of_suite_keys:\tlooking for suite yaml:', suite_yml) if not os.path.exists(suite_yml): - print('build_list_of_suite_keys:\tERROR: suite yaml:', suite_yml, 'does not exist') + print(f'analysis_timeseries: build_list_of_suite_keys:\tERROR: suite yaml: {suite_yml} file does not exist') sys.exit(1) # Open yml file: From 4755b353fcdd4d878e2c08b7406fc203be87fce7 Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Tue, 16 Aug 2022 05:56:43 +0100 Subject: [PATCH 3/5] Update bgcval2/analysis_timeseries.py Co-authored-by: Valeriu Predoi --- bgcval2/analysis_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgcval2/analysis_timeseries.py b/bgcval2/analysis_timeseries.py index 7d01b2a4..c397f380 100755 --- a/bgcval2/analysis_timeseries.py +++ b/bgcval2/analysis_timeseries.py @@ -123,7 +123,7 @@ def build_list_of_suite_keys(suites, debug=True): for key, keybool in keys_dict.items(): if debug and key in analysis_keys: - print('build_list_of_suite_keys:\tKey exists in multiple suites:', key) + print(f'build_list_of_suite_keys:\tKey {key} exists in multiple suites:') if key in analysis_keys and keybool != analysis_keys[key]: From 66f065a679f68d0a4cc234394c504959c0585ff0 Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Tue, 16 Aug 2022 05:56:57 +0100 Subject: [PATCH 4/5] Update bgcval2/analysis_timeseries.py Co-authored-by: Valeriu Predoi --- bgcval2/analysis_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgcval2/analysis_timeseries.py b/bgcval2/analysis_timeseries.py index c397f380..05b6c10b 100755 --- a/bgcval2/analysis_timeseries.py +++ b/bgcval2/analysis_timeseries.py @@ -127,7 +127,7 @@ def build_list_of_suite_keys(suites, debug=True): if key in analysis_keys and keybool != analysis_keys[key]: - print('build_list_of_suite_keys:\tERROR: conflick in input yamls:', key, keybool, '!=', analysis_keys[key]) + print(f'build_list_of_suite_keys:\tERROR: conflict in input yamls: {key}, {keybool} != {analysis_keys[key]}') sys.exit(1) if keybool: From f3085e59fbedbb472a2217ec4ffbe8f457e9a52b Mon Sep 17 00:00:00 2001 From: Lee de Mora Date: Tue, 16 Aug 2022 05:57:05 +0100 Subject: [PATCH 5/5] Update bgcval2/analysis_timeseries.py Co-authored-by: Valeriu Predoi --- bgcval2/analysis_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgcval2/analysis_timeseries.py b/bgcval2/analysis_timeseries.py index 05b6c10b..ba84b3aa 100755 --- a/bgcval2/analysis_timeseries.py +++ b/bgcval2/analysis_timeseries.py @@ -178,7 +178,7 @@ def analysis_timeseries( print('jobID:', jobID) print('suites:', suites) print('regions:', regions) - print('clean:', clean, 'annual:', annual, 'strictFileCheck:', strictFileCheck) + print(f'clean: {clean}, annual: {annual}, strictFileCheck: {strictFileCheck}') print('config_user:', config_user) # get runtime configuration