updated data generation script and wrapper file

nismod · Mar 18, 2019 · 116f798 · 116f798
1 parent 11913c8
commit 116f798
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/energy_demand/read_write/data_loader.py b/energy_demand/read_write/data_loader.py
@@ -1262,7 +1262,11 @@ def ss_read_shapes_enduse_techs(ss_shapes_dh, ss_shapes_yd):
 
     return ss_all_tech_shapes_dh, ss_all_tech_shapes_yd
 
-def read_scenario_data(path_to_csv, value_name='value', region_name='region'):
+def read_scenario_data(
+        path_to_csv,
+        value_name='value',
+        region_name='region'
+    ):
     """Function to read in scenario data
     """
     data = {}

diff --git a/energy_demand/scripts/smif_data_related/generate_data_version.py b/energy_demand/scripts/smif_data_related/generate_data_version.py
@@ -33,7 +33,7 @@ def zipit(dir_list, zip_name):
 
 def package_data(
         version_name,
-        data_folder_path#="C:/Users/cenv0553/ed/data"
+        data_folder_path
     ):
     """
     verions_name : str
@@ -151,9 +151,9 @@ def package_data(
     zip_handler_full = zipfile.ZipFile(os.path.join(data_folder_path, zip_name_full), "a")
 
     # Add units file
-    full_file_path = os.path.join(data_folder_path, 'units.txt')
-    zip_handler_full.write(full_file_path, arcname='units.txt')
-    zip_handler_minimum.write(full_file_path, arcname='units.txt')
+    #full_file_path = os.path.join(data_folder_path, 'units.txt')
+    #zip_handler_full.write(full_file_path, arcname='units.txt')
+    #zip_handler_minimum.write(full_file_path, arcname='units.txt')
 
     # Add other files to full data
     files_to_add_full = [
@@ -177,4 +177,4 @@ def package_data(
     """
     # Map command line arguments to function arguments.
     #package_data(*sys.argv[1:])
-    package_data('v0.8.9', 'C:/Users/cenv0553/ED/data')
+    package_data('v0.9.2', 'C:/Users/cenv0553/nismod2/data/energy_demand')