Merge pull request #143 from nismod/update/cluster_weather_calculations

updated paths
nismod · Dec 4, 2018 · 304cf61 · 304cf61
2 parents af70573 + f7c9e5f
commit 304cf61
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/energy_demand/scripts/s_write_dummy_data.py b/energy_demand/scripts/s_write_dummy_data.py
@@ -40,7 +40,7 @@ def dummy_sectoral_load_profiles(local_paths, path_main):
         Main path
     """
     create_folders_to_file(
-        os.path.join(local_paths['ss_load_profile_txt'], "dumm"), "_processed_data")
+        os.path.join(local_paths['ss_load_profile_txt'], "dumm"), "energy_demand", "_processed_data")
 
     paths = data_loader.load_paths(path_main)
 
@@ -98,8 +98,8 @@ def post_install_setup_minimum(args):
     local_paths = data_loader.get_local_paths(path_local_data)
 
     # Create folders to input data
-    raw_folder = os.path.join(path_local_data, '_raw_data')
-    processed_folder = os.path.join(path_local_data, '_processed_data')
+    raw_folder = os.path.join(path_local_data, 'energy_demand', '_raw_data')
+    processed_folder = os.path.join(path_local_data, 'energy_demand', '_processed_data')
 
     basic_functions.create_folder(raw_folder)
     basic_functions.create_folder(processed_folder)

diff --git a/energy_demand/scripts/smif_data_related/generate_data_version.py b/energy_demand/scripts/smif_data_related/generate_data_version.py
@@ -53,26 +53,28 @@ def package_data(
 
     # Zip minimum files
     _raw_folders_data_minimal = [
+        '_old_data',
         'coefficients',
+        'dimensions',
         'initial_conditions',
-        'interval_definitions',
-        '00_user_defined_variables',
-        'interventions',
-        'planning',
+        'initial_inputs',
+        'energy_demand_minimal',
+        'narratives',
+        'parameters',
+        'scenarios',
         'strategies']
 
     # Zip maximum files
     _raw_folders_data_full = [
-        '_raw_data',
+        '_old_data',
         'coefficients',
+        'dimensions',
         'initial_conditions',
-        'interval_definitions',
-        '00_user_defined_variables',
-        '00_user_defined_variables_SCENARIO',
         'interventions',
+        'initial_inputs',
+        'energy_demand',
         'narratives',
-        'planning',
-        'region_definitions',
+        'parameters',
         'scenarios',
         'strategies']
 
@@ -95,10 +97,8 @@ def package_data(
     # Add folder _raw_data_minimal' and rename it
     # -------------------------------------------
     folders_to_add = (
-        ('_raw_data_minimal', '_raw_data'),
-        ('scenarios_minimal', 'scenarios'),
-        ('region_definitions_minimal', 'region_definitions'),
-        ('narratives_minimal', 'narratives'))
+        ('energy_demand_minimal', 'energy_demand'),
+        ('scenarios_minimal', 'scenarios'))
 
     zip_handler_minimum = zipfile.ZipFile(os.path.join(data_folder_path, zip_name_minimum), "a")