diff --git a/datasets/nl2023/efficiencies/households_space_heater_hybrid_heatpump_air_water_electricity_efficiency.csv b/datasets/nl2023/efficiencies/households_space_heater_hybrid_heatpump_air_water_electricity_efficiency.csv index ea28205210..8db0bc6cb4 100644 --- a/datasets/nl2023/efficiencies/households_space_heater_hybrid_heatpump_air_water_electricity_efficiency.csv +++ b/datasets/nl2023/efficiencies/households_space_heater_hybrid_heatpump_air_water_electricity_efficiency.csv @@ -1,4 +1,4 @@ key,share -input.network_gas,1.53587913957917E-01 -input.electricity,1.53893106553106E-01 -input.ambient_heat,6.92518979488977E-01 \ No newline at end of file +input.network_gas,1.62163856582690E-01 +input.electricity,1.86185535173166E-01 +input.ambient_heat,6.51650608244144E-01 \ No newline at end of file diff --git a/datasets/nl2023/efficiencies/households_water_heater_hybrid_heatpump_air_water_electricity_efficiency.csv b/datasets/nl2023/efficiencies/households_water_heater_hybrid_heatpump_air_water_electricity_efficiency.csv index a3c42cee76..f1929f74e9 100644 --- a/datasets/nl2023/efficiencies/households_water_heater_hybrid_heatpump_air_water_electricity_efficiency.csv +++ b/datasets/nl2023/efficiencies/households_water_heater_hybrid_heatpump_air_water_electricity_efficiency.csv @@ -1,4 +1,4 @@ key,share -input.network_gas,2.64994257684226E-01 -input.electricity,1.83751435578943E-01 -input.ambient_heat,5.51254306736831E-01 \ No newline at end of file +input.network_gas,1.00000000000000E+00 +input.electricity,0.00000000000000E+00 +input.ambient_heat,0.00000000000000E+00 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_electricity_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_electricity_parent_share.csv index 5ae5eb9e15..317f43d53d 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_electricity_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_electricity_parent_share.csv @@ -1,7 +1,7 @@ key,share -households_final_demand_for_cooling_electricity,1.74442272589000E-02 -households_final_demand_for_space_heating_electricity,1.41332525618111E-01 -households_final_demand_for_hot_water_electricity,7.89117402886700E-02 -households_final_demand_for_cooking_electricity,3.66316528640784E-02 -households_final_demand_for_lighting_electricity,9.71106712866610E-02 -households_final_demand_for_applicances_electricity,6.28569182683579E-01 \ No newline at end of file +households_final_demand_for_cooling_electricity,1.76994573116794E-02 +households_final_demand_for_space_heating_electricity,1.76496686762675E-01 +households_final_demand_for_hot_water_electricity,3.23388136990158E-02 +households_final_demand_for_cooking_electricity,3.71676180607669E-02 +households_final_demand_for_lighting_electricity,9.85315173574029E-02 +households_final_demand_for_applicances_electricity,6.37765906808460E-01 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_electricity_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_electricity_parent_share.csv index a56b6e5512..c126d41b9c 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_electricity_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_electricity_parent_share.csv @@ -1,6 +1,6 @@ key,share -households_water_heater_heatpump_air_water_electricity,4.98754607356419E-01 -households_water_heater_heatpump_ground_water_electricity,7.90668813655589E-02 -households_water_heater_resistive_electricity,4.04251724275038E-01 -households_water_heater_hybrid_heatpump_air_water_electricity,1.79267870029840E-02 +households_water_heater_heatpump_air_water_electricity,6.52366325863845E-01 +households_water_heater_heatpump_ground_water_electricity,1.11126926854109E-01 +households_water_heater_resistive_electricity,2.36506747282046E-01 +households_water_heater_hybrid_heatpump_air_water_electricity,0.00000000000000E+00 households_water_heater_heatpump_surface_water_water_ts_electricity,0.00000000000000E+00 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_network_gas_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_network_gas_parent_share.csv index 602caeef05..30bc21ac86 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_network_gas_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_for_hot_water_network_gas_parent_share.csv @@ -1,4 +1,4 @@ key,share -households_water_heater_combined_network_gas,9.97067376896118E-01 +households_water_heater_combined_network_gas,9.92198731771223E-01 households_water_heater_network_gas,0.00000000000000E+00 -households_water_heater_hybrid_heatpump_air_water_electricity,2.93262310388158E-03 \ No newline at end of file +households_water_heater_hybrid_heatpump_air_water_electricity,7.80126822877674E-03 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_electricity_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_electricity_parent_share.csv index e6df938042..b163827f3b 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_electricity_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_electricity_parent_share.csv @@ -1,6 +1,6 @@ key,share -households_space_heater_electricity,3.92259951157488E-01 -households_space_heater_heatpump_air_water_electricity,5.00658809437908E-01 -households_space_heater_heatpump_ground_water_electricity,8.58068643157003E-02 -households_space_heater_hybrid_heatpump_air_water_electricity,2.12743750889039E-02 +households_space_heater_electricity,5.18304995130804E-01 +households_space_heater_heatpump_air_water_electricity,3.83243045452293E-01 +households_space_heater_heatpump_ground_water_electricity,6.03277571712002E-02 +households_space_heater_hybrid_heatpump_air_water_electricity,3.81242022457029E-02 households_space_heater_heatpump_surface_water_water_ts_electricity,0.00000000000000E+00 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_network_gas_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_network_gas_parent_share.csv index 88df7930aa..97322a9f27 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_network_gas_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_for_space_heating_network_gas_parent_share.csv @@ -1,4 +1,4 @@ key,share households_space_heater_network_gas,0.00000000000000E+00 -households_space_heater_combined_network_gas,9.98388428119897E-01 -households_space_heater_hybrid_heatpump_air_water_electricity,1.61157188010273E-03 \ No newline at end of file +households_space_heater_combined_network_gas,9.96779565819889E-01 +households_space_heater_hybrid_heatpump_air_water_electricity,3.22043418011121E-03 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_network_gas_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_network_gas_parent_share.csv index 313b2aaf31..b2aff88c3b 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_network_gas_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_network_gas_parent_share.csv @@ -1,5 +1,5 @@ key,share -households_final_demand_for_cooking_network_gas,2.40718986006603E-02 +households_final_demand_for_cooking_network_gas,2.39827395498925E-02 households_final_demand_for_cooling_network_gas,0.00000000000000E+00 -households_final_demand_for_hot_water_network_gas,2.65438604839786E-01 -households_final_demand_for_space_heating_network_gas,7.10489496559554E-01 \ No newline at end of file +households_final_demand_for_hot_water_network_gas,2.81630299756507E-01 +households_final_demand_for_space_heating_network_gas,6.94386960693601E-01 \ No newline at end of file diff --git a/datasets/nl2023/shares/energy/residences_final_demand_steam_hot_water_parent_share.csv b/datasets/nl2023/shares/energy/residences_final_demand_steam_hot_water_parent_share.csv index 520b21cd26..b96dbb4f31 100644 --- a/datasets/nl2023/shares/energy/residences_final_demand_steam_hot_water_parent_share.csv +++ b/datasets/nl2023/shares/energy/residences_final_demand_steam_hot_water_parent_share.csv @@ -1,3 +1,3 @@ key,share -households_final_demand_for_hot_water_steam_hot_water,4.31089916038495E-01 -households_final_demand_for_space_heating_steam_hot_water,5.68910083961505E-01 \ No newline at end of file +households_final_demand_for_hot_water_steam_hot_water,4.38476898806052E-01 +households_final_demand_for_space_heating_steam_hot_water,5.61523101193948E-01 \ No newline at end of file diff --git a/graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.converter.ad b/graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.ad similarity index 60% rename from graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.converter.ad rename to graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.ad index f1c101aa25..4be1885d65 100644 --- a/graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_space_heater_heatpump_air_water_electricity.ad @@ -1,14 +1,16 @@ -- input.ambient_heat = 0.777777777777778 -- input.electricity = 0.222222222222222 +- input.ambient_heat = 0.714286 +- input.electricity = 0.285714 - output.cooling = 0.0 - output.loss = elastic - output.useable_heat = 1.0 - groups = [ - direct_emissions, demand_driven, heat_production, etmoses, merit_household_space_heating_producers, - application_group, aggregator_producer, lv_net_demand, wacc_households, merit_order_csv_include, - costs_building_and_installations_households, ht_delivery_system_households + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_space_heating_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households, ht_delivery_system_households ] - use = energetic +- sector_label = households_space_heating - presentation_group = heat_pumps - availability = 0.0 - full_load_hours = 0.0 @@ -16,28 +18,27 @@ - construction_time = 0.0 - cost_of_installing = 0.0 - decommissioning_costs = 0.0 -- fixed_operation_and_maintenance_costs_per_year = 100.0 -- initial_investment = 9098.0 +- fixed_operation_and_maintenance_costs_per_year = 50.0 +- initial_investment = 10590.0 - technical_lifetime = 15.0 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.02 - fever.alias_of = households_water_heater_heatpump_air_water_electricity -- fever.base_cop = 2.323 -- fever.capacity.electricity = 0.0025889967637540458 -- fever.cop_per_degree = 0.0578 +- fever.base_cop = 3.0584 +- fever.capacity.electricity = 0.002889 +- fever.cop_per_degree = 0.0593 - fever.defer_for = 4 - fever.efficiency_balanced_with = ambient_heat - fever.efficiency_based_on = electricity - fever.group = space_heating -- fever.type = producer - fever.technology_curve_type = tech_constant -- storage.cost_per_mwh = 154736.8 +- fever.type = producer +- storage.cost_per_mwh = 0.0 - storage.decay = 0.0 - storage.volume = 0.0 - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.01 +- heat_output_capacity = 0.0078 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 -- sector_label = households_space_heating diff --git a/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.converter.ad b/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad similarity index 72% rename from graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.converter.ad rename to graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad index 6bc3910b73..6c7f6b8648 100644 --- a/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_space_heater_hybrid_heatpump_air_water_electricity.ad @@ -1,14 +1,15 @@ -- output.cooling = 0.0 - output.loss = elastic - output.useable_heat.ambient_heat = 1.0 - output.useable_heat.electricity = 1.0 - output.useable_heat.network_gas = 1.07 - groups = [ - direct_emissions, demand_driven, heat_production, etmoses, merit_household_space_heating_producers, - application_group, aggregator_producer, lv_net_demand, wacc_households, merit_order_csv_include, - costs_building_and_installations_households, mt_delivery_system_households + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_space_heating_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households, mt_delivery_system_households ] - use = energetic +- sector_label = households_space_heating - presentation_group = heat_pumps - graph_methods = [input] - availability = 0.0 @@ -17,32 +18,31 @@ - construction_time = 0.0 - cost_of_installing = 0.0 - decommissioning_costs = 0.0 -- fixed_operation_and_maintenance_costs_per_year = 200.0 -- initial_investment = 3819.0 +- fixed_operation_and_maintenance_costs_per_year = 50.0 +- initial_investment = 6931.5 - technical_lifetime = 15.0 - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.02 - fever.alias_of = households_water_heater_hybrid_heatpump_air_water_electricity -- fever.base_cop = 2.323 -- fever.capacity.electricity = 0.0018327326043130307 +- fever.base_cop = 3.0584 +- fever.capacity.electricity = 0.001704 - fever.capacity.network_gas = 0.022 -- fever.cop_cutoff = 2.6 -- fever.cop_per_degree = 0.0578 +- fever.cop_cutoff = 2.600238 +- fever.cop_per_degree = 0.0593 - fever.defer_for = 4 - fever.efficiency_balanced_with = ambient_heat - fever.efficiency_based_on = electricity - fever.group = space_heating -- fever.type = producer - fever.technology_curve_type = tech_constant +- fever.type = producer - network_gas.profile = self: network_gas_input_curve - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.004900000000000001 +- heat_output_capacity = 0.02354 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 -- sector_label = households_space_heating ~ input.electricity = EFFICIENCY(households_space_heater_hybrid_heatpump_air_water_electricity, input, electricity) ~ input.network_gas = EFFICIENCY(households_space_heater_hybrid_heatpump_air_water_electricity, input, network_gas) diff --git a/graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.converter.ad b/graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.ad similarity index 63% rename from graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.converter.ad rename to graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.ad index d5f9f1c90b..a0201f7f16 100644 --- a/graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_water_heater_heatpump_air_water_electricity.ad @@ -1,13 +1,15 @@ -- input.ambient_heat = 0.666666666666667 -- input.electricity = 0.333333333333333 +- input.ambient_heat = 0.565217 +- input.electricity = 0.434783 - output.loss = elastic - output.useable_heat = 1.0 - groups = [ - direct_emissions, demand_driven, heat_production, etmoses, merit_household_hot_water_producers, - application_group, aggregator_producer, lv_net_demand, wacc_households, merit_order_csv_include, - costs_building_and_installations_households + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_hot_water_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households ] - use = energetic +- sector_label = households_hot_water - presentation_group = heat_pumps - availability = 0.0 - full_load_hours = 0.0 @@ -21,20 +23,19 @@ - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.02 -- fever.base_cop = 1.86 -- fever.capacity.electricity = 0.002588997 -- fever.cop_per_degree = 0.043 +- fever.base_cop = 2.1044 +- fever.capacity.electricity = 0.002889 +- fever.cop_per_degree = 0.04074 - fever.efficiency_balanced_with = ambient_heat - fever.efficiency_based_on = electricity - fever.group = households_hot_water -- fever.type = producer - fever.technology_curve_type = default -- storage.cost_per_mwh = 50713.75 +- fever.type = producer +- storage.cost_per_mwh = 0.0 - storage.decay = 0.0 -- storage.volume = 0.005 +- storage.volume = 0.008723 - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.01 +- heat_output_capacity = 0.0078 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 -- sector_label = households_hot_water diff --git a/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.converter.ad b/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad similarity index 74% rename from graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.converter.ad rename to graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad index 9082f7e897..6b94f399b7 100644 --- a/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_water_heater_hybrid_heatpump_air_water_electricity.ad @@ -1,14 +1,15 @@ -- output.cooling = 0.0 - output.loss = elastic -- output.useable_heat.ambient_heat = 1 -- output.useable_heat.electricity = 1 +- output.useable_heat.ambient_heat = 1.0 +- output.useable_heat.electricity = 1.0 - output.useable_heat.network_gas = 0.9 - groups = [ - direct_emissions, demand_driven, heat_production, etmoses, merit_household_hot_water_producers, - application_group, aggregator_producer, lv_net_demand, wacc_households, merit_order_csv_include, - costs_building_and_installations_households + direct_emissions, demand_driven, heat_production, + etmoses, merit_household_hot_water_producers, application_group, + aggregator_producer, lv_net_demand, wacc_households, + merit_order_csv_include, costs_building_and_installations_households ] - use = energetic +- sector_label = households_hot_water - presentation_group = heat_pumps - graph_methods = [input] - availability = 0.0 @@ -23,24 +24,23 @@ - variable_operation_and_maintenance_costs_for_ccs_per_full_load_hour = 0.0 - variable_operation_and_maintenance_costs_per_full_load_hour = 0.0 - wacc = 0.02 -- fever.base_cop = 1.86 -- fever.capacity.electricity = 0.001294498 +- fever.base_cop = 2.1044 +- fever.capacity.electricity = 0.001704 - fever.capacity.network_gas = 0.022 - fever.cop_cutoff = 6.0 -- fever.cop_per_degree = 0.043 +- fever.cop_per_degree = 0.04074 - fever.efficiency_balanced_with = ambient_heat - fever.efficiency_based_on = electricity - fever.group = households_hot_water -- fever.type = producer - fever.technology_curve_type = default +- fever.type = producer - network_gas.profile = self: network_gas_input_curve - network_gas.type = consumer - electricity_output_capacity = 0.0 - free_co2_factor = 0.0 -- heat_output_capacity = 0.0049 +- heat_output_capacity = 0.02354 - households_supplied_per_unit = 1.0 - takes_part_in_ets = 0.0 -- sector_label = households_hot_water ~ input.electricity = EFFICIENCY(households_water_heater_hybrid_heatpump_air_water_electricity, input, electricity) ~ input.network_gas = EFFICIENCY(households_water_heater_hybrid_heatpump_air_water_electricity, input, network_gas)