Skip to content
Snippets Groups Projects
Commit 7456c491 authored by Laura Christine Kühle's avatar Laura Christine Kühle
Browse files

Renamed 'data_directory' to 'data_dir'.

parent 38896d50
No related branches found
No related tags found
No related merge requests found
...@@ -8,21 +8,19 @@ if config['random_seed'] is not None: ...@@ -8,21 +8,19 @@ if config['random_seed'] is not None:
module ann_data: module ann_data:
snakefile: DIR + '/ANN_data.smk' 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_* use rule * from ann_data as ANN_*
module ann_training: module ann_training:
snakefile: DIR + '/ANN_training.smk' snakefile: DIR + '/ANN_training.smk'
config: {**config['ANN_Training'], config: {**config['ANN_Training'], 'data_dir':config['data_dir']}
'data_directory': config['data_directory']}
use rule * from ann_training as ANN_* use rule * from ann_training as ANN_*
module approximation: module approximation:
snakefile: DIR + '/approximation.smk' snakefile: DIR + '/approximation.smk'
config: {**config['Approximation'], config: {**config['Approximation'], 'data_dir': config['data_dir']}
'data_directory': config['data_directory']}
use rule * from approximation as DG_* use rule * from approximation as DG_*
......
data_directory: 'model-Feb14' data_dir: 'model-Mar01'
random_seed: 1234 random_seed: 1234
# Parameter for Approximation with Troubled Cell Detection # Parameter for Approximation with Troubled Cell Detection
Approximation: Approximation:
plot_dir: 'fig-Feb14' plot_dir: 'fig-Mar01'
schemes: schemes:
Separation_Test: Separation_Test:
......
...@@ -5,7 +5,7 @@ configfile: 'config.yaml' ...@@ -5,7 +5,7 @@ configfile: 'config.yaml'
import ANN_Data_Generator, Initial_Condition import ANN_Data_Generator, Initial_Condition
DIR = config['data_directory'] DIR = config['data_dir']
# if config['random_seed'] is not None: # if config['random_seed'] is not None:
# np.random.seed(config['random_seed']) # np.random.seed(config['random_seed'])
......
...@@ -5,7 +5,7 @@ from ANN_Training import * ...@@ -5,7 +5,7 @@ from ANN_Training import *
configfile: 'config.yaml' configfile: 'config.yaml'
DIR = config['data_directory'] DIR = config['data_dir']
MODELS = config['models'] MODELS = config['models']
# if config['random_seed'] is not None: # if config['random_seed'] is not None:
# np.random.seed(config['random_seed']) # np.random.seed(config['random_seed'])
......
...@@ -6,7 +6,7 @@ from DG_Approximation import DGScheme ...@@ -6,7 +6,7 @@ from DG_Approximation import DGScheme
configfile: 'config.yaml' configfile: 'config.yaml'
PLOTS = ['error', 'exact_and_approx', 'semilog_error', 'shock_tube'] PLOTS = ['error', 'exact_and_approx', 'semilog_error', 'shock_tube']
DIR = config['data_directory'] DIR = config['data_dir']
SCHEMES = config['schemes'] SCHEMES = config['schemes']
# if config['random_seed'] is not None: # if config['random_seed'] is not None:
# np.random.seed(config['random_seed']) # np.random.seed(config['random_seed'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment