Add airco heating

config/interface/input_elements/demand_households_heating.yml

@@ -84,7 +84,7 @@
   related_node: households_space_heater_hybrid_crude_oil_heatpump_air_water_electricity
   position: 105
   dependent_on: has_coal_oil_for_heating_built_environment
-  slide_key: demand_households_heating  
+  slide_key: demand_households_heating
 - key: households_heater_heatpump_pvt_electricity_share
   share_group: heating_households
   step_value: 0.1
@@ -135,6 +135,22 @@
   position: 170
   dependent_on: has_coal_oil_for_heating_built_environment
   slide_key: demand_households_heating
+- key: households_heater_hybrid_airconditioning_combined_network_gas_share
+  share_group: heating_households
+  step_value: 0.1
+  unit: "%"
+  interface_group: space_and_water_heating_technologies
+  related_node: households_space_heater_hybrid_airconditioning_combined_network_gas
+  position: 180
+  slide_key: demand_households_heating
+- key: households_heater_airconditioning_with_heat_pump_boiler_share
+  share_group: heating_households
+  step_value: 0.1
+  unit: "%"
+  interface_group: space_and_water_heating_technologies
+  related_node: households_space_heater_airconditioning_with_heat_pump_boiler
+  position: 190
+  slide_key: demand_households_heating
 
 - key: households_water_heater_solar_thermal_share
   step_value: 0.1

config/interface/input_elements/demand_households_heating_technologies.yml

@@ -1,11 +1,27 @@
 ---
+- key: households_heater_coal_heat_output_capacity
+  step_value: 0.1
+  unit: "kW"
+  interface_group: capacity
+  related_node: households_space_heater_coal
+  position: 5
+  dependent_on: has_coal_oil_for_heating_built_environment
+  slide_key: demand_households_heating_technologies
+- key: households_heater_crude_oil_heat_output_capacity
+  step_value: 0.1
+  unit: "kW"
+  interface_group: capacity
+  related_node: households_space_heater_crude_oil
+  position: 10
+  dependent_on: has_coal_oil_for_heating_built_environment
+  slide_key: demand_households_heating_technologies
 - key: households_heater_network_gas_heat_output_capacity
   step_value: 0.1
   unit: "kW"
   interface_group: capacity
   related_node: households_space_heater_network_gas
   position: 15
-  slide_key: demand_households_heating_technologies 
+  slide_key: demand_households_heating_technologies
 - key: households_heater_combined_network_gas_heat_output_capacity
   step_value: 0.1
   unit: "kW"
@@ -96,28 +112,26 @@
   interface_group: capacity
   related_node: households_space_heater_hybrid_hydrogen_heatpump_air_water_electricity
   position: 80
-  slide_key: demand_households_heating_technologies   
+  slide_key: demand_households_heating_technologies
 - key: households_heater_hybrid_crude_oil_heatpump_air_water_electricity_heat_output_capacity
   step_value: 0.1
   unit: "kW"
   interface_group: capacity
   related_node: households_space_heater_hybrid_crude_oil_heatpump_air_water_electricity
   position: 85
   dependent_on: has_coal_oil_for_heating_built_environment
-  slide_key: demand_households_heating_technologies     
-- key: households_heater_coal_heat_output_capacity
+  slide_key: demand_households_heating_technologies
+- key: households_heater_airconditioning_with_heat_pump_boiler_heat_output_capacity
   step_value: 0.1
   unit: "kW"
   interface_group: capacity
-  related_node: households_space_heater_coal
-  position: 5
-  dependent_on: has_coal_oil_for_heating_built_environment
+  related_node: households_space_heater_airconditioning_with_heat_pump_boiler
+  position: 90
   slide_key: demand_households_heating_technologies
-- key: households_heater_crude_oil_heat_output_capacity
+- key: households_heater_hybrid_airconditioning_combined_network_gas_heat_output_capacity
   step_value: 0.1
   unit: "kW"
   interface_group: capacity
-  related_node: households_space_heater_crude_oil
-  position: 10
-  dependent_on: has_coal_oil_for_heating_built_environment
-  slide_key: demand_households_heating_technologies                 
+  related_node: households_space_heater_hybrid_airconditioning_combined_network_gas
+  position: 95
+  slide_key: demand_households_heating_technologies

config/interface/output_element_series/residential_heating_technologies.yml

@@ -203,6 +203,30 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_before_1945_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 90
+  group: residences_before_1945
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_before_1945_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 95
+  group: residences_before_1945
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_before_1945_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies
 
 - label: households_space_heater_coal
   color: "#333333"
@@ -408,6 +432,30 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_1945_1964_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 190
+  group: residences_1945_1964
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1945_1964_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 195
+  group: residences_1945_1964
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1945_1964_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies
 
 - label: households_space_heater_coal
   color: "#333333"
@@ -613,6 +661,30 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_1965_1984_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 290
+  group: residences_1965_1984
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1965_1984_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 295
+  group: residences_1965_1984
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1965_1984_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies
 
 - label: households_space_heater_coal
   color: "#333333"
@@ -818,6 +890,30 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_1985_2004_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 390
+  group: residences_1985_2004
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1985_2004_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 395
+  group: residences_1985_2004
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_1985_2004_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies
 
 - label: households_space_heater_coal
   color: "#333333"
@@ -1023,6 +1119,30 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_2005_present_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 490
+  group: residences_2005_present
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_2005_present_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 495
+  group: residences_2005_present
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_2005_present_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies
 
 - label: households_space_heater_coal
   color: "#333333"
@@ -1228,3 +1348,27 @@
   dependent_on: 
   output_element_key: residential_heating_technologies
   key: number_of_houses_future_with_space_heater_hybrid_crude_oil_heatpump_air_water_electricity_residential_heating_technologies  
+- label: households_space_heater_airconditioning_with_heat_pump_boiler
+  color: "#3EB489"
+  order_by: 590
+  group: residences_future
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_future_with_space_heater_airconditioning_with_heat_pump_boiler_residential_heating_technologies
+- label: households_space_heater_hybrid_airconditioning_combined_network_gas
+  color: "#8A9A5B"
+  order_by: 595
+  group: residences_future
+  show_at_first: 
+  is_target_line: false
+  target_line_position: 
+  gquery: number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas
+  is_1990: 
+  dependent_on: 
+  output_element_key: residential_heating_technologies
+  key: number_of_houses_future_with_space_heater_hybrid_airconditioning_combined_network_gas_residential_heating_technologies

config/locales/interface/input_elements/en_demand_buildings.yml

@@ -376,8 +376,8 @@ en:
         for space heating.<br/><br/>
         An air heatpump uses electricity
         and ambient heat to generate heat. This heat can be transfered to water or air
-        and used in underfloor heating or airconditioning systems for space heating.
-        Air heatpumps are similar to airconditioners as they both use ambient air and electricity
+        and used in underfloor heating or air conditioning systems for space heating.
+        Air heatpumps are similar to air conditioners as they both use ambient air and electricity
         to cool the air inside a building. However, older air conditioners are often not
         equipped with the ability to provide space cooling and heating and operate under lower efficiencies
         compared to new air heatpumps. <br/><br/>
@@ -386,7 +386,7 @@ en:
         weather curve available in the ETM. The average of these hourly calculations (the Seasonal COP or 'SCOP') can be found
         in the technical and financial properties. <br/><br/>
         For more information you can view the
-        <a href="https://docs.energytransitionmodel.com/main/heat-pumps/#air-source-heat-pumps" target=\"_blank\">documentation</a>.
+        <a href="https://docs.energytransitionmodel.com/main/heat-pumps#air-to-water-heat-pumps" target="_blank">documentation</a>.
         To influence the efficiency of this heatpump you can go to the <a href="/scenario/costs/costs_heat/heating-in-houses-and-buildings">Costs & efficiencies</a> section
         or choose to adjust the <a href="/scenario/flexibility/flexibility_weather/temperature-and-full-load-hours" >weather curve</a>.
     buildings_cooling_heatpump_air_water_electricity_share:
@@ -396,11 +396,11 @@ en:
         for cooling. <br/><br/>
         An air heatpump uses electricity
         and ambient cold to generate heat or cold. This cold can be transfered to water or air
-        and used in underfloor heating or airconditioning systems for cooling. <br/><br/>
+        and used in underfloor heating or air conditioning systems for cooling. <br/><br/>
         Contrary to heating, the efficiency (COP) of this heat pump for cooling is
         fixed. You can view the efficiency in the technical and financial properties. <br/><br/>
         For more information you can view the
-        <a href="https://docs.energytransitionmodel.com/main/heat-pumps/#air-source-heat-pumps" target=\"_blank\">documentation</a>.
+        <a href="https://docs.energytransitionmodel.com/main/heat-pumps#air-to-water-heat-pumps" target="_blank">documentation</a>.
         To influence the efficiency of this heatpump you can go to the <a href="/scenario/costs/costs_heat/heating-in-houses-and-buildings">Costs & efficiencies</a> section
         or choose to adjust the <a href="/scenario/flexibility/flexibility_weather/temperature-and-full-load-hours" >weather curve</a>.
     buildings_space_heater_hybrid_heatpump_air_water_electricity_share: