diff --git a/gqueries/general/merit/lv/lv_households_cooker_load_curve.gql b/gqueries/general/merit/lv/lv_households_cooker_load_curve.gql index 1626ae4e50..b39ec23002 100644 --- a/gqueries/general/merit/lv/lv_households_cooker_load_curve.gql +++ b/gqueries/general/merit/lv/lv_households_cooker_load_curve.gql @@ -1,8 +1,6 @@ - query = - SUM_CURVES(V( - households_cooker_halogen_electricity, - households_cooker_induction_electricity, - households_cooker_resistive_electricity, + V( + households_final_demand_for_cooking_electricity, electricity_input_curve - )) + ) - unit = curve diff --git a/gqueries/general/merit/lv/lv_households_lighting_load_curve.gql b/gqueries/general/merit/lv/lv_households_lighting_load_curve.gql index a7cfa184cb..b6e43f3d3f 100644 --- a/gqueries/general/merit/lv/lv_households_lighting_load_curve.gql +++ b/gqueries/general/merit/lv/lv_households_lighting_load_curve.gql @@ -1,8 +1,6 @@ - query = - SUM_CURVES(V( - households_lighting_efficient_fluorescent_electricity, - households_lighting_incandescent_electricity, - households_lighting_led_electricity, + V( + households_final_demand_for_lighting_electricity, electricity_input_curve - )) + ) - unit = curve diff --git a/graphs/energy/nodes/households/households_cooker_halogen_electricity.converter.ad b/graphs/energy/nodes/households/households_cooker_halogen_electricity.converter.ad index c37280355c..3c779f98e9 100644 --- a/graphs/energy/nodes/households/households_cooker_halogen_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_cooker_halogen_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.loss = elastic - output.useable_heat = 0.6 -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_cooker_induction_electricity.converter.ad b/graphs/energy/nodes/households/households_cooker_induction_electricity.converter.ad index 5dea0d7971..a45cee770a 100644 --- a/graphs/energy/nodes/households/households_cooker_induction_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_cooker_induction_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.loss = elastic - output.useable_heat = 0.85 -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_cooker_resistive_electricity.converter.ad b/graphs/energy/nodes/households/households_cooker_resistive_electricity.converter.ad index 0803ddce16..8c123379dd 100644 --- a/graphs/energy/nodes/households/households_cooker_resistive_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_cooker_resistive_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.loss = elastic - output.useable_heat = 0.55 -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_final_demand_for_cooking_electricity.ad b/graphs/energy/nodes/households/households_final_demand_for_cooking_electricity.ad index fed57fb59c..71a0a75e95 100644 --- a/graphs/energy/nodes/households/households_final_demand_for_cooking_electricity.ad +++ b/graphs/energy/nodes/households/households_final_demand_for_cooking_electricity.ad @@ -1,3 +1,6 @@ - use = energetic -- groups = [] +- groups = [lv_net_demand] - free_co2_factor = 0.0 +- merit_order.group = households_appliances +- merit_order.level = lv +- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_final_demand_for_lighting_electricity.ad b/graphs/energy/nodes/households/households_final_demand_for_lighting_electricity.ad index fed57fb59c..6eece20c99 100644 --- a/graphs/energy/nodes/households/households_final_demand_for_lighting_electricity.ad +++ b/graphs/energy/nodes/households/households_final_demand_for_lighting_electricity.ad @@ -1,3 +1,6 @@ - use = energetic -- groups = [] +- groups = [lv_net_demand] - free_co2_factor = 0.0 +- merit_order.group = households_appliances +- merit_order.level = lv +- merit_order.type = consumer \ No newline at end of file diff --git a/graphs/energy/nodes/households/households_lighting_efficient_fluorescent_electricity.converter.ad b/graphs/energy/nodes/households/households_lighting_efficient_fluorescent_electricity.converter.ad index 737766f84c..aa69da6cee 100644 --- a/graphs/energy/nodes/households/households_lighting_efficient_fluorescent_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_lighting_efficient_fluorescent_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.light = 0.25 - output.loss = elastic -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_lighting_incandescent_electricity.converter.ad b/graphs/energy/nodes/households/households_lighting_incandescent_electricity.converter.ad index 47fc366c63..3faceacd62 100644 --- a/graphs/energy/nodes/households/households_lighting_incandescent_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_lighting_incandescent_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.light = 0.05 - output.loss = elastic -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer diff --git a/graphs/energy/nodes/households/households_lighting_led_electricity.converter.ad b/graphs/energy/nodes/households/households_lighting_led_electricity.converter.ad index 925050db34..0f6c6fcdfb 100644 --- a/graphs/energy/nodes/households/households_lighting_led_electricity.converter.ad +++ b/graphs/energy/nodes/households/households_lighting_led_electricity.converter.ad @@ -1,8 +1,5 @@ - use = energetic - output.light = 0.5 - output.loss = elastic -- groups = [application_group, lv_net_demand] +- groups = [application_group] - free_co2_factor = 0.0 -- merit_order.group = households_appliances -- merit_order.level = lv -- merit_order.type = consumer