diff --git a/Snakefile b/Snakefile index 06d6f8c54e8db875c6760e052cf66aeab42a614f..75ddd1e4a4809b1790f7732c90597a2081e68629 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 3dc239aca2443ec8d98d4d4ba24e75f26415c9a2..979aca1d07583d62e80fbf68abaea61f131135e7 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 520dd6530ccc87ad1a7fcd4c1bf021843e62fd39..ab8890f8639d0da20dbe26b212636c24e9b6dac7 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 9ca50dbbd0664b0ec4586f12410c881b60701c96..23004ae9945e3b989f3245fcf3e4321190b2cb29 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 9af2c7cf97acbd68e0ef28f8f25ef25180492037..dd47186f1121bd2f5b8fc17c89adbcce3a42218a 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'])