From 91bd0358189f07df744b8c76524eddd72b76ed77 Mon Sep 17 00:00:00 2001
From: Michael <m.langguth@fz-juelich.de>
Date: Tue, 9 Feb 2021 14:04:38 +0100
Subject: [PATCH] Include automatic destination_dir-construction to the
generation of the runscript for data extraction.
---
.../HPC_scripts/data_extraction_era5_template.sh | 4 ++--
video_prediction_tools/config_runscripts/config_extraction.py | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh b/video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh
index b6f3ea20..491cd229 100644
--- a/video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh
+++ b/video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh
@@ -35,14 +35,14 @@ if [ -z ${VIRTUAL_ENV} ]; then
fi
fi
-# Declare path-variables
+# Declare path-variables (dest_dir will be set and configured automatically via generate_runscript.py)
source_dir=/p/fastdata/slmet/slmet111/met_data/ecmwf/era5/nc/
dest_dir=/p/scratch/deepacf/video_prediction_shared_folder/extractedData/
year="2010"
# Run data extraction
-srun python ../main_scripts/main_data_extraction.py --source_dir ${source_dir}/${year}/ --destination_dir ${dest_dir}/${year}/
+srun python ../main_scripts/main_data_extraction.py --source_dir ${source_dir}/${year}/ --destination_dir ${dest_dir}
diff --git a/video_prediction_tools/config_runscripts/config_extraction.py b/video_prediction_tools/config_runscripts/config_extraction.py
index eb1dc311..8943b005 100644
--- a/video_prediction_tools/config_runscripts/config_extraction.py
+++ b/video_prediction_tools/config_runscripts/config_extraction.py
@@ -48,6 +48,10 @@ class Config_Extraction(Config_runscript_base):
self.year = Config_Extraction.keyboard_interaction(year_req_str, Config_Extraction.check_year,
year_err, ntries = 2, test_arg="2012")
+ # set destination directory based on base directory which can be retrieved from the template runscript
+ base_dir = Config_Extraction.get_var_from_runscript(self.runscript_template, "destination_dir")
+ self.destination_dir = os.path.join(base_dir, "extracted_data", self.year)
+
#
# -----------------------------------------------------------------------------------
#
--
GitLab