Merge 45fdb7f into d09f6c0

nismod · Feb 7, 2018 · f3ea15a · f3ea15a
2 parents d09f6c0 + 45fdb7f
commit f3ea15a
Show file tree

Hide file tree

Showing 121 changed files with 8,515 additions and 5,534 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ __pycache__/*
 *.eggs/
 .installed.cfg
 *.egg-info
+*.prof
 
 # Unittest and coverage
 htmlcov/*

diff --git a/README.rst b/README.rst
@@ -58,7 +58,7 @@ run every time the model is run with different assumptions (Section 1.2).
 2. Navigate to the folder where the python code is saved. Open a command and type into
    a command line (in a virtual environment):
 
-   ``setup.py develop``
+   ``python setup.py develop``
 
 3. Install HIRE from within the console with the command
 
@@ -70,25 +70,6 @@ run every time the model is run with different assumptions (Section 1.2).
    Note: The `post_install_setup` generates new folders in the 
    ``energy_data_folder``.
 
-
-1.2 Scenario Set-up 
-----------------
-
-
-1. For every scenario run, the energy demand module needs to be
-   initialised from the command line as follows:
-
-   ``energy_demand scenario_initialisation -d path/to/energy_data_folder``
-
-   Note: Upon scenario initialisation, data gets saved in the ``_process_data`` 
-   folder which contain assumption specific data.
-
-2. Run the model from the console with the command
-
-   ``energy_demand run -d path/to/energy_data_folder``
-
-
-
 2. Running the model with smif
 ========================
 
@@ -106,7 +87,7 @@ Other help
 ==========
 To change the logger level of an individual sector model with smif, type:
 
-`smif -v run modelrun_id` or `smif -vv run modelrun_id`
+``smif -v run modelrun_id`` or ``smif -vv run modelrun_id``
 
 Literature
 ========================

diff --git a/config_data/01-Datasets_used_for_configuration/01-Fuel_sources/ECUK_Tables_2016.xlsx b/config_data/01-Datasets_used_for_configuration/01-Fuel_sources/ECUK_Tables_2016.xlsx
diff --git a/config_data/01-configuration_datasets/01-fuel/ECUK_Tables_2016.xlsx b/config_data/01-configuration_datasets/01-fuel/ECUK_Tables_2016.xlsx
diff --git a/...ion/01-Fuel_sources/ECUK_Tables_2017.xlsx → ...on_datasets/01-fuel/ECUK_Tables_2017.xlsx b/...ion/01-Fuel_sources/ECUK_Tables_2017.xlsx → ...on_datasets/01-fuel/ECUK_Tables_2017.xlsx
diff --git a/..._related/07-Energy fact sheet/1750754.pdf → ...ng_stock/07-Energy fact sheet/1750754.pdf b/..._related/07-Energy fact sheet/1750754.pdf → ...ng_stock/07-Energy fact sheet/1750754.pdf
diff --git a/...per - 2013 - Housing Energy Fact File.pdf → ...per - 2013 - Housing Energy Fact File.pdf b/...per - 2013 - Housing Energy Fact File.pdf → ...per - 2013 - Housing Energy Fact File.pdf
diff --git a/...eet/uk_housing_fact_file_2013_tables.xlsx → ...eet/uk_housing_fact_file_2013_tables.xlsx b/...eet/uk_housing_fact_file_2013_tables.xlsx → ...eet/uk_housing_fact_file_2013_tables.xlsx
diff --git a/...t/CABE Dwelling Size Study - Datasets.url → ...t/CABE Dwelling Size Study - Datasets.url b/...t/CABE Dwelling Size Study - Datasets.url → ...t/CABE Dwelling Size Study - Datasets.url
diff --git a/...-size-study_dbrawdataanalysis_May2011.xls → ...-size-study_dbrawdataanalysis_May2011.xls b/...-size-study_dbrawdataanalysis_May2011.xls → ...-size-study_dbrawdataanalysis_May2011.xls
diff --git a/...o 2015- housing stock report - GOV.UK.url → ...o 2015- housing stock report - GOV.UK.url b/...o 2015- housing stock report - GOV.UK.url → ...o 2015- housing stock report - GOV.UK.url
diff --git a/...nnex_tables_v2_got_dw_data_from_here.xlsx → ...nnex_tables_v2_got_dw_data_from_here.xlsx b/...nnex_tables_v2_got_dw_data_from_here.xlsx → ...nnex_tables_v2_got_dw_data_from_here.xlsx
diff --git a/...Chapter_1_-_figures_and_annex_tables.xlsx → ...Chapter_1_-_figures_and_annex_tables.xlsx b/...Chapter_1_-_figures_and_annex_tables.xlsx → ...Chapter_1_-_figures_and_annex_tables.xlsx
diff --git a/...nd_base_data/efficiencies_definition.xlsx → ...s/technology_efficiencies_definition.xlsx b/...nd_base_data/efficiencies_definition.xlsx → ...s/technology_efficiencies_definition.xlsx
diff --git a/..._spatial_index/spatial_index_example.xlsx → ...-spatial_index/spatial_index_example.xlsx b/..._spatial_index/spatial_index_example.xlsx → ...-spatial_index/spatial_index_example.xlsx
diff --git a/config_data/README.txt b/config_data/README.txt
@@ -1,5 +1,11 @@
 Folders
 ----------------------
-_test_data			Folder with data used for tests
-scenario_and_base_data		Folder where scenaric input is provided
-submodel_..			Folders containing fuels and switches
+01-configuration_datasets  Original used datasets for model configuration
+02-spatial_index           Spatial index for spatial explicit diffusion
+submodel_industry		   Fuels, loadprofiles etc. for industry submodel
+submodel_residential       Fuels, loadprofiles etc. for residential submodel
+submodel_service           Fuels, loadprofiles etc. for service submodel
+
+Files
+----------------------
+technology_definition       Files to define all technologies
diff --git a/config_data/_scrap.csv b/config_data/_scrap.csv
diff --git a/config_data/_test_data/test_csv.csv b/config_data/_test_data/test_csv.csv
diff --git a/config_data/scenario_and_base_data/README.txt b/config_data/scenario_and_base_data/README.txt
diff --git a/config_data/scenario_and_base_data/technology_base_scenario.csv b/config_data/scenario_and_base_data/technology_base_scenario.csv
diff --git a/...dustry/data_industry_by_fuel_end_uses.csv → config_data/submodel_industry/is_fuel.csv b/...dustry/data_industry_by_fuel_end_uses.csv → config_data/submodel_industry/is_fuel.csv
diff --git a/...model_industry/switches_fuel_scenaric.csv → ..._data/submodel_industry/switches_fuel.csv b/...model_industry/switches_fuel_scenaric.csv → ..._data/submodel_industry/switches_fuel.csv
diff --git a/config_data/submodel_industry/switches_fuel_scenaric.1.csv b/config_data/submodel_industry/switches_fuel_scenaric.1.csv
@@ -1,2 +1,5 @@
 enduse,enduse_fueltype_replace,technology_install,switch_yr,fuel_share_switched_ey
 is_space_heating,gas,boiler_electricity,2050,0.5
+
+
+is_space_heating,gas,heat_pumps_electricity,2050,0.9
diff --git a/config_data/submodel_industry/switches_industry.1.csv b/config_data/submodel_industry/switches_industry.1.csv
@@ -0,0 +1,4 @@
+enduse,tech,service_share_ey,switch_yr
+is_space_heating,boiler_gas,0.2,2050
+is_space_heating,boiler_gas,0.1,2050
+is_space_heating,heat_pumps_electricity,0.9,2050
diff --git a/...l_industry/switches_industry_scenaric.csv → ...a/submodel_industry/switches_industry.csv b/...l_industry/switches_industry_scenaric.csv → ...a/submodel_industry/switches_industry.csv
diff --git a/...ta/submodel_residential/_EXCELFILES/HES/HES 24-Hour Chooser -(VALUE_DATA_TAKEN_FROM).xlsm b/...ta/submodel_residential/_EXCELFILES/HES/HES 24-Hour Chooser -(VALUE_DATA_TAKEN_FROM).xlsm
diff --git a/config_data/submodel_residential/_EXCELFILES/HES/lp_elec_primary_heating_ReportHES.xlsx b/config_data/submodel_residential/_EXCELFILES/HES/lp_elec_primary_heating_ReportHES.xlsx
diff --git a/..._residential/_EXCELFILES/lp_bossmann_storage_heater/lp_elec_primary_heating_Bossmann.xlsx b/..._residential/_EXCELFILES/lp_bossmann_storage_heater/lp_elec_primary_heating_Bossmann.xlsx
diff --git a/config_data/submodel_residential/capacity_installations.1.csv b/config_data/submodel_residential/capacity_installations.1.csv
@@ -0,0 +1,2 @@
+enduse,technology_install,swich_yr,installed_capacity
+rs_space_heating,boiler_gas,2030,1000
diff --git a/config_data/submodel_residential/lp_elec_storage_heating_Bossmann.csv b/config_data/submodel_residential/lp_elec_storage_heating_Bossmann.csv
@@ -0,0 +1,4 @@
+daytype,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+workday,0.108216433,0.118236473,0.118236473,0.118236473,0.112224449,0.085170341,0.06012024,0.04008016,0.01002004,0,0,0,0.001002004,0.008016032,0.01002004,0.016032064,0.017034068,0.006012024,0.002004008,0,0.00501002,0.022044088,0.06012024,0.082164329
+holiday,0.108216433,0.118236473,0.118236473,0.118236473,0.112224449,0.085170341,0.06012024,0.04008016,0.01002004,0,0,0,0.001002004,0.008016032,0.01002004,0.016032064,0.017034068,0.006012024,0.002004008,0,0.00501002,0.022044088,0.06012024,0.082164329
+peakday,0.108216433,0.118236473,0.118236473,0.118236473,0.112224449,0.085170341,0.06012024,0.04008016,0.01002004,0,0,0,0.001002004,0.008016032,0.01002004,0.016032064,0.017034068,0.006012024,0.002004008,0,0.00501002,0.022044088,0.06012024,0.082164329
diff --git a/...sidential/lp_elec_primary_heating_HES.csv → ...sidential/lp_elec_storage_heating_HES.csv b/...sidential/lp_elec_primary_heating_HES.csv → ...sidential/lp_elec_storage_heating_HES.csv
diff --git a/config_data/submodel_residential/lp_elec_storage_heating_HESReport.csv b/config_data/submodel_residential/lp_elec_storage_heating_HESReport.csv
@@ -0,0 +1,4 @@
+daytype,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+workday,0.089082969,0.087336245,0.090247453,0.082678311,0.080349345,0.073362445,0.054730713,0.048908297,0.051819505,0.04657933,0.029112082,0.027947598,0.015720524,0.002911208,0.002328967,0.000291121,0.001746725,0.011644833,0.014556041,0.022707424,0.022707424,0.027947598,0.033770015,0.081513828
+holiday,0.089082969,0.087336245,0.090247453,0.082678311,0.080349345,0.073362445,0.054730713,0.048908297,0.051819505,0.04657933,0.029112082,0.027947598,0.015720524,0.002911208,0.002328967,0.000291121,0.001746725,0.011644833,0.014556041,0.022707424,0.022707424,0.027947598,0.033770015,0.081513828
+peakday,0.089082969,0.087336245,0.090247453,0.082678311,0.080349345,0.073362445,0.054730713,0.048908297,0.051819505,0.04657933,0.029112082,0.027947598,0.015720524,0.002911208,0.002328967,0.000291121,0.001746725,0.011644833,0.014556041,0.022707424,0.022707424,0.027947598,0.033770015,0.081513828
diff --git a/...ata/submodel_residential/rs_fuel_data.csv → config_data/submodel_residential/rs_fuel.csv b/...ata/submodel_residential/rs_fuel_data.csv → config_data/submodel_residential/rs_fuel.csv
diff --git a/config_data/submodel_residential/switches_fuel.1.csv b/config_data/submodel_residential/switches_fuel.1.csv
@@ -0,0 +1,5 @@
+enduse,enduse_fueltype_replace,technology_install,switch_yr,fuel_share_switched_ey
+rs_space_heating,gas,heat_pumps_electricity,2050,0.9
+
+try
+rs_space_heating,gas,boiler_hydrogen,2050,0.99
diff --git a/...el_residential/switches_fuel_scenaric.csv → ...ta/submodel_residential/switches_fuel.csv b/...el_residential/switches_fuel_scenaric.csv → ...ta/submodel_residential/switches_fuel.csv
diff --git a/config_data/submodel_residential/switches_service.1.csv b/config_data/submodel_residential/switches_service.1.csv
@@ -0,0 +1,8 @@
+enduse,tech,service_share_ey,switch_yr
+rs_space_heating,boiler_hydrogen,0.2,2050
+rs_space_heating,heat_pumps_electricity,0.7,2050
+
+THROWS ERROR
+
+rs_space_heating,boiler_gas,0.7,2050
+rs_space_heating,heat_pumps_electricity,0.1,2050
diff --git a/config_data/submodel_residential/switches_service.csv b/config_data/submodel_residential/switches_service.csv
@@ -0,0 +1,3 @@
+enduse,tech,service_share_ey,switch_yr
+rs_space_heating,boiler_hydrogen,0.7,2050
+rs_space_heating,heat_pumps_electricity,0.1,2050
diff --git a/config_data/submodel_residential/switches_service_scenaric.csv b/config_data/submodel_residential/switches_service_scenaric.csv
diff --git a/...service/data_service_by_fuel_end_uses.csv → ...les/data_service_by_fuel_end_uses _55.csv b/...service/data_service_by_fuel_end_uses.csv → ...les/data_service_by_fuel_end_uses _55.csv
diff --git a/config_data/submodel_service/_alternative_fuels_tables/data_service_by_fuel_end_uses_55a.csv b/config_data/submodel_service/_alternative_fuels_tables/data_service_by_fuel_end_uses_55a.csv
@@ -0,0 +1,9 @@
+fuel_id,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas
+None,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1,750,1184,402,1031,378,103,1106,774,552,31,179,51,339,111,9,79,16,21,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,75,2,60,355,4,20,29,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,20,0,319,10,0,26,0,0
+2,51,19,7,14,41,0,200,381,62,5,26,3,17,19,1,60,20,14,34,21,6,50,30,9,235,104,17,47,49,16,108,69,11,154,94,27,85,161,54,139,76,33,320,654,318,39,68,4,33,521,4,39,59,6,6,68,23,96,5,10,231,58,43,1,28,2,6,0,0,761,10,29,53,6,0,6,148,0,1,763,203,84,94,24,216,51,7,64,232,96,0,0,0,0,0,0,0,0,0
+3,84,96,19,3,89,8,71,52,317,8,12,4,2,42,1,33,11,6,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,6,0,2,290,0,33,11,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,9,0,0,0,0,0,20,0,0,9,0,0,0,0,0
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/config_data/submodel_service/shape_service_cooling - Copy.csv b/config_data/submodel_service/shape_service_cooling - Copy.csv
@@ -0,0 +1,2 @@
+0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+0.010989011,0.010989011,0.010989011,0.013736264,0.027472527,0.043956044,0.054945055,0.057692308,0.06043956,0.068681319,0.076923077,0.082417582,0.082417582,0.082417582,0.085164835,0.085164835,0.057692308,0.024725275,0.010989011,0.010989011,0.010989011,0.010989011,0.008241758,0.010989011
diff --git a/config_data/submodel_service/shape_service_cooling.csv b/config_data/submodel_service/shape_service_cooling.csv
@@ -1,2 +1,4 @@
-0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
-0.010989011,0.010989011,0.010989011,0.013736264,0.027472527,0.043956044,0.054945055,0.057692308,0.06043956,0.068681319,0.076923077,0.082417582,0.082417582,0.082417582,0.085164835,0.085164835,0.057692308,0.024725275,0.010989011,0.010989011,0.010989011,0.010989011,0.008241758,0.010989011
+daytype,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+workday,0.010989011,0.010989011,0.010989011,0.013736264,0.027472527,0.043956044,0.054945055,0.057692308,0.06043956,0.068681319,0.076923077,0.082417582,0.082417582,0.082417582,0.085164835,0.085164835,0.057692308,0.024725275,0.010989011,0.010989011,0.010989011,0.010989011,0.008241758,0.010989011
+holiday,0.010989011,0.010989011,0.010989011,0.013736264,0.027472527,0.043956044,0.054945055,0.057692308,0.06043956,0.068681319,0.076923077,0.082417582,0.082417582,0.082417582,0.085164835,0.085164835,0.057692308,0.024725275,0.010989011,0.010989011,0.010989011,0.010989011,0.008241758,0.010989011
+peakday,0.010989011,0.010989011,0.010989011,0.013736264,0.027472527,0.043956044,0.054945055,0.057692308,0.06043956,0.068681319,0.076923077,0.082417582,0.082417582,0.082417582,0.085164835,0.085164835,0.057692308,0.024725275,0.010989011,0.010989011,0.010989011,0.010989011,0.008241758,0.010989011
diff --git a/config_data/submodel_service/ss_fuel.csv b/config_data/submodel_service/ss_fuel.csv
@@ -0,0 +1,9 @@
+fuel_id,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_space_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_water_heating,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_cooling_humidification,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_fans,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_lighting,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_catering,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_small_power,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_ICT_equipment,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_cooled_storage,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_electricity,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas,ss_other_gas
+None,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage,community_arts_leisure,education,emergency_services,health,hospitality,military,offices,retail,storage
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1,750,1184,402,1031,378,103,1106,774,552,31,179,51,339,111,9,79,16,21,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,75,2,60,355,4,20,29,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,20,0,319,10,0,26,0,0
+2,51,19,7,14,41,0,200,381,62,5,26,3,17,19,1,60,20,14,34,21,6,50,30,9,235,104,17,47,49,16,108,69,11,154,94,27,85,161,54,139,76,33,320,654,318,39,68,4,33,521,4,39,59,6,6,68,23,96,5,10,231,58,43,1,28,2,6,0,0,761,10,29,53,6,0,6,148,0,1,763,203,84,94,24,216,51,7,64,232,96,0,0,0,0,0,0,0,0,0
+3,84,96,19,3,89,8,71,52,317,8,12,4,2,42,1,33,11,6,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,6,0,2,290,0,33,11,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,9,0,0,0,0,0,20,0,0,9,0,0,0,0,0
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/...bmodel_service/switches_fuel_scenaric.csv → ...data/submodel_service/switches_fuel.1.csv b/...bmodel_service/switches_fuel_scenaric.csv → ...data/submodel_service/switches_fuel.1.csv
@@ -1,2 +1,2 @@
 enduse,enduse_fueltype_replace,technology_install,switch_yr,fuel_share_switched_ey
-ss_space_heating,gas,boiler_hydrogen,2030,0.5,1
+ss_space_heating,gas,heat_pumps_electricity,2050,0.9
diff --git a/...odel_service/switches_fuel_scenaric.1.csv → ...g_data/submodel_service/switches_fuel.csv b/...odel_service/switches_fuel_scenaric.1.csv → ...g_data/submodel_service/switches_fuel.csv
@@ -1,2 +1 @@
 enduse,enduse_fueltype_replace,technology_install,switch_yr,fuel_share_switched_ey
-ss_space_heating,gas,hydrogen_boiler,2030,0.5,1
diff --git a/config_data/submodel_service/switches_service.1.csv b/config_data/submodel_service/switches_service.1.csv
@@ -0,0 +1,4 @@
+enduse,tech,service_share_ey,switch_yr
+ss_space_heating,heat_pumps_electricity,0.7,2050
+
+ss_space_heating,heat_pumps_electricity,0.7,2050
diff --git a/config_data/submodel_service/switches_service.csv b/config_data/submodel_service/switches_service.csv
@@ -0,0 +1,2 @@
+enduse,tech,service_share_ey,switch_yr
+ss_space_heating,heat_pumps_electricity,0.7,2050