From fae40b03a966c0d393d01e6a377cd41fc7a19a60 Mon Sep 17 00:00:00 2001
From: thopri <thopri@noc.ac.uk>
Date: Wed, 25 Mar 2020 13:45:01 +0000
Subject: [PATCH] added log statements to show CMEMS behaviour more clearly
---
pynemo/profile.py | 7 +++++++
unit_tests/unit_test.py | 3 +++
2 files changed, 10 insertions(+)
diff --git a/pynemo/profile.py b/pynemo/profile.py
index ab394b1..12f69dd 100644
--- a/pynemo/profile.py
+++ b/pynemo/profile.py
@@ -97,6 +97,8 @@ def download_cmems(setup_filepath=0):
Setup = setup.Setup(setup_filepath) # default settings file
settings = Setup.settings
+ if settings['download_static'] == False:
+ logger.info('CMEMS static data download not requested')
if settings['download_static'] == True:
for re in range(settings['num_retry']):
logger.info('CMEMS Static data requested: downloading static data now.... (this may take awhile)')
@@ -121,6 +123,8 @@ def download_cmems(setup_filepath=0):
sys.exit(static)
dl_cmems.clean_up(settings)
# subset downloaded static grid files to match downloaded CMEMS data
+ if settings['subset_static'] == False:
+ logger.info('CMEMS subset static data not requested')
if settings['subset_static'] == True:
logger.info('CMEMS subset static data requested: subsetting now......')
subset_static = dl_cmems.subset_static(settings)
@@ -132,6 +136,9 @@ def download_cmems(setup_filepath=0):
sys.exit(subset_static)
dl_cmems.clean_up(settings)
+ if settings['download_cmems'] == False:
+ logger.info('CMEMS Boundary data download not requested')
+
if settings['download_cmems'] == True:
logger.info('CMEMS Boundary data requested: starting download process....')
diff --git a/unit_tests/unit_test.py b/unit_tests/unit_test.py
index 2f041ad..1daf0fe 100644
--- a/unit_tests/unit_test.py
+++ b/unit_tests/unit_test.py
@@ -59,6 +59,9 @@ def test_salinty():
assert abs(sal_[sal_ != 0.0].max() - 35) <= 0.001
assert abs(sal_[sal_ != 0.0].min() - 35) <= 0.001
+# TODO: add in checking so that settings in the bdy file are checked to see if
+# U and V and SSH tests are required. e.g. ln_dyn2d is set to true.
+
def test_ssh():
test_files = glob.glob('unit_tests/test_outputs/*bdyT*')
if len(test_files) == 0:
--
GitLab