Renamed 'data_directory' to 'data_dir'.

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_*
 

config.yaml

-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:

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'])
 

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'])

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'])