Merge pull request #149 from nismod/p3_scenarios

P3 scenarios
nismod · Dec 12, 2018 · ad242e2 · ad242e2
2 parents e092f66 + 92477d4
commit ad242e2
Show file tree

Hide file tree

Showing 60 changed files with 553 additions and 46,345 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,15 +45,15 @@ cover/*
 MANIFEST
 
 # Model configuration
-*.ini
+#*.ini
 
 # Files and folders to ignore
 model_output/*.csv
 model_output/*.pdf
 data/data_scripts/*.csv
 data/data_scripts/*.txt
 energy_demand/data/*
-wrapperconfig.ini
+#wrapperconfig.ini
 _raw_data
 _processed_data
 config_data/*

diff --git a/energy_demand/basic/lookup_tables.py b/energy_demand/basic/lookup_tables.py
@@ -196,8 +196,7 @@ def basic_lookups():
 
     lookups['diffusion_type'] = {
         0: 'linear',
-        1: 'sigmoid'
-    }
+        1: 'sigmoid'}
 
     lookups['fueltypes'] = {
         'solid_fuel': 0,

diff --git a/energy_demand/config_data/01-validation_datasets/01_national_elec_2015/elec_demand_2015.csv b/energy_demand/config_data/01-validation_datasets/01_national_elec_2015/elec_demand_2015.csv
diff --git a/...ata/01-validation_datasets/02_subnational_elec/MSOA_domestic_electricity_2015_cleaned.csv b/...ata/01-validation_datasets/02_subnational_elec/MSOA_domestic_electricity_2015_cleaned.csv
diff --git a/...data/01-validation_datasets/02_subnational_elec/MSOA_non_dom_electricity_2015_cleaned.csv b/...data/01-validation_datasets/02_subnational_elec/MSOA_non_dom_electricity_2015_cleaned.csv
diff --git a/...sets/02_subnational_elec/Sub-national_electricity_consumption_statistics_2005-16 (8).xlsx b/...sets/02_subnational_elec/Sub-national_electricity_consumption_statistics_2005-16 (8).xlsx