From 7456c491c55cef5da9ad72845bbfe2542c964467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=BChle=2C=20Laura=20Christine=20=28lakue103=29?=
<laura.kuehle@uni-duesseldorf.de>
Date: Tue, 1 Mar 2022 13:05:42 +0100
Subject: [PATCH] Renamed 'data_directory' to 'data_dir'.
---
Snakefile | 8 +++-----
config.yaml | 4 ++--
workflows/ANN_data.smk | 2 +-
workflows/ANN_training.smk | 2 +-
workflows/approximation.smk | 2 +-
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Snakefile b/Snakefile
index 06d6f8c..75ddd1e 100644
--- a/Snakefile
+++ b/Snakefile
@@ -8,21 +8,19 @@ if config['random_seed'] is not None:
module ann_data:
snakefile: DIR + '/ANN_data.smk'
- config: {**config['ANN_Data'], 'data_directory': config['data_directory']}
+ config: {**config['ANN_Data'], 'data_dir': config['data_dir']}
use rule * from ann_data as ANN_*
module ann_training:
snakefile: DIR + '/ANN_training.smk'
- config: {**config['ANN_Training'],
- 'data_directory': config['data_directory']}
+ config: {**config['ANN_Training'], 'data_dir':config['data_dir']}
use rule * from ann_training as ANN_*
module approximation:
snakefile: DIR + '/approximation.smk'
- config: {**config['Approximation'],
- 'data_directory': config['data_directory']}
+ config: {**config['Approximation'], 'data_dir': config['data_dir']}
use rule * from approximation as DG_*
diff --git a/config.yaml b/config.yaml
index 3dc239a..979aca1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,9 +1,9 @@
-data_directory: 'model-Feb14'
+data_dir: 'model-Mar01'
random_seed: 1234
# Parameter for Approximation with Troubled Cell Detection
Approximation:
- plot_dir: 'fig-Feb14'
+ plot_dir: 'fig-Mar01'
schemes:
Separation_Test:
diff --git a/workflows/ANN_data.smk b/workflows/ANN_data.smk
index 520dd65..ab8890f 100644
--- a/workflows/ANN_data.smk
+++ b/workflows/ANN_data.smk
@@ -5,7 +5,7 @@ configfile: 'config.yaml'
import ANN_Data_Generator, Initial_Condition
-DIR = config['data_directory']
+DIR = config['data_dir']
# if config['random_seed'] is not None:
# np.random.seed(config['random_seed'])
diff --git a/workflows/ANN_training.smk b/workflows/ANN_training.smk
index 9ca50db..23004ae 100644
--- a/workflows/ANN_training.smk
+++ b/workflows/ANN_training.smk
@@ -5,7 +5,7 @@ from ANN_Training import *
configfile: 'config.yaml'
-DIR = config['data_directory']
+DIR = config['data_dir']
MODELS = config['models']
# if config['random_seed'] is not None:
# np.random.seed(config['random_seed'])
diff --git a/workflows/approximation.smk b/workflows/approximation.smk
index 9af2c7c..dd47186 100644
--- a/workflows/approximation.smk
+++ b/workflows/approximation.smk
@@ -6,7 +6,7 @@ from DG_Approximation import DGScheme
configfile: 'config.yaml'
PLOTS = ['error', 'exact_and_approx', 'semilog_error', 'shock_tube']
-DIR = config['data_directory']
+DIR = config['data_dir']
SCHEMES = config['schemes']
# if config['random_seed'] is not None:
# np.random.seed(config['random_seed'])
--
GitLab