From 9b3f8e9fd756680962039f7ba9837dd5f38aabf6 Mon Sep 17 00:00:00 2001
From: Nils Brueggemann <nils.brueggemann@mpimet.mpg.de>
Date: Tue, 18 Mar 2025 16:47:13 +0100
Subject: [PATCH] pyicon_params.py: Improved handling of params.
---
pyicon/params_default.json | 4 ++++
pyicon/pyicon_params.py | 7 ++++++-
quickstart/00_do_all.sh | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 pyicon/params_default.json
diff --git a/pyicon/params_default.json b/pyicon/params_default.json
new file mode 100644
index 0000000..84371d2
--- /dev/null
+++ b/pyicon/params_default.json
@@ -0,0 +1,4 @@
+{
+ "path_grid": "~/pyicon_data/grids/",
+ "path_example_data": "~/pyicon_data/pyicon_example_data_download/"
+}
diff --git a/pyicon/pyicon_params.py b/pyicon/pyicon_params.py
index da436aa..d69b87e 100644
--- a/pyicon/pyicon_params.py
+++ b/pyicon/pyicon_params.py
@@ -8,6 +8,7 @@ fname = os.path.join(os.path.dirname(__file__), 'params_default.json')
#else:
# print(f'File {fname} does not exist.')
try:
+ print(f"Loading default parameters from {fname}.")
with open(fname, 'r') as f:
params_default = json.load(f)
except:
@@ -15,11 +16,12 @@ except:
HOME = os.path.expanduser('~')
params_default = {
"path_grid": f"{HOME}/pyicon_data/grids/",
- "path_example_data": f"{HOME}/pyicon_data/pyicon_example_data_download/"
+ "path_example_data": f"{HOME}/pyicon_data/icon_example_data_download/"
}
fname = os.path.join(os.path.dirname(__file__), 'params_user.json')
if os.path.isfile(fname):
+ print(f"Loading user parameters from {fname}.")
with open(fname, 'r') as f:
params_user = json.load(f)
else:
@@ -30,3 +32,6 @@ try:
params = params_default | params_user
except:
params = params_default
+
+for key in ['path_grid', 'path_example_data']:
+ params[key] = os.path.expanduser(params[key])
\ No newline at end of file
diff --git a/quickstart/00_do_all.sh b/quickstart/00_do_all.sh
index e986541..3ca39dd 100755
--- a/quickstart/00_do_all.sh
+++ b/quickstart/00_do_all.sh
@@ -24,3 +24,4 @@ cp path_data.txt ${path_data}/pyicon_output/
./06_quickplots.sh
echo "Output written to ${source_dir}/swift.dkrz.de/example_data_r2b4/pyicon_output/"
+echo "All done!"
--
GitLab