-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow load shifting input and output capacity to be set independent f…
…rom each other (#2981) * Adding sliders in UI for demand load shifting * changes to sliders * Use new input_capacity_from_share attribute to read input_capacity during node calculation * Setting max rate to 100 and setting up start value gql's for output shares * Dont set start_value_gql to unneccessary value * Dont set start_value_gql, set start_value * Final changes to input capacity share for DSR load shifting * Add failsafe if either input or output capacity of load shifiting is 0 * Update load shifting DSR input capacity inputs Inputs are now specified by the user as share of peak capacity * Update start_value_gql for input capacity of load shifting DSR * Bump Atlas to quintel/atlas@2db914b --------- Co-authored-by: Kas Kranenburg <[email protected]> Co-authored-by: Mathijs Bijkerk <[email protected]>
- Loading branch information
3 people
authored
Dec 19, 2023
1 parent
a93d61b
commit b615a7c
Showing
14 changed files
with
215 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
...energy/nodes/industry/industry_final_demand_for_chemical_dsr_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
...hs/energy/nodes/industry/industry_final_demand_for_metal_dsr_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
...hs/energy/nodes/industry/industry_final_demand_for_other_dsr_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
...nergy/nodes/industry/industry_final_demand_for_other_ict_dsr_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 16 additions & 2 deletions
18
...exibility/industry/capacity_of_industry_chemical_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_on = IF( | ||
| MIN( | ||
| USER_INPUT(), | ||
| INPUT_VALUE(input_capacity_of_industry_chemical_flexibility_load_shifting_electricity) | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| EACH( | ||
| UPDATE(V(industry_final_demand_for_chemical_dsr_load_shifting_electricity), availability, (USER_INPUT() / 100.0)), | ||
| UPDATE(V(industry_final_demand_for_chemical_dsr_load_shifting_electricity), number_of_units, 1.0), | ||
| UPDATE(V(industry_final_demand_for_chemical_dsr_load_shifting_electricity), number_of_units, load_shifting_on), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_chemical_dsr_load_shifting_electricity,availability) * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
18 changes: 16 additions & 2 deletions
18
.../flexibility/industry/capacity_of_industry_metal_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_on = IF( | ||
| MIN( | ||
| USER_INPUT(), | ||
| INPUT_VALUE(input_capacity_of_industry_metal_flexibility_load_shifting_electricity) | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| EACH( | ||
| UPDATE(V(industry_final_demand_for_metal_dsr_load_shifting_electricity), availability, (USER_INPUT() / 100.0)), | ||
| UPDATE(V(industry_final_demand_for_metal_dsr_load_shifting_electricity), number_of_units, 1.0), | ||
| UPDATE(V(industry_final_demand_for_metal_dsr_load_shifting_electricity), number_of_units, load_shifting_on), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_metal_dsr_load_shifting_electricity,availability) * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
18 changes: 16 additions & 2 deletions
18
.../flexibility/industry/capacity_of_industry_other_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_on = IF( | ||
| MIN( | ||
| USER_INPUT(), | ||
| INPUT_VALUE(input_capacity_of_industry_other_flexibility_load_shifting_electricity) | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| EACH( | ||
| UPDATE(V(industry_final_demand_for_other_dsr_load_shifting_electricity), availability, (USER_INPUT() / 100.0)), | ||
| UPDATE(V(industry_final_demand_for_other_dsr_load_shifting_electricity), number_of_units, 1.0), | ||
| UPDATE(V(industry_final_demand_for_other_dsr_load_shifting_electricity), number_of_units, load_shifting_on), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_other_dsr_load_shifting_electricity,availability) * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
18 changes: 16 additions & 2 deletions
18
...xibility/industry/capacity_of_industry_other_ict_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_on = IF( | ||
| MIN( | ||
| USER_INPUT(), | ||
| INPUT_VALUE(input_capacity_of_industry_other_ict_flexibility_load_shifting_electricity) | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| EACH( | ||
| UPDATE(V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity), availability, (USER_INPUT() / 100.0)), | ||
| UPDATE(V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity), number_of_units, 1.0), | ||
| UPDATE(V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity), number_of_units, load_shifting_on), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity,availability) * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
34 changes: 34 additions & 0 deletions
34
...ity/industry/input_capacity_of_industry_chemical_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # Users specify the combined effect of availablity * input share, which is used to update the input share | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_enabled = IF( | ||
| MIN( | ||
| INPUT_VALUE(capacity_of_industry_chemical_flexibility_load_shifting_electricity), | ||
| USER_INPUT() | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| availability = INPUT_VALUE(capacity_of_industry_chemical_flexibility_load_shifting_electricity); | ||
| input_share = DIVIDE(USER_INPUT(), availability); | ||
|
|
||
| EACH( | ||
| UPDATE( | ||
| V(industry_final_demand_for_chemical_dsr_load_shifting_electricity, merit_order), input_capacity_from_share, | ||
| input_share | ||
| ), | ||
| UPDATE(V(industry_final_demand_for_chemical_dsr_load_shifting_electricity), number_of_units, load_shifting_enabled), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_chemical_dsr_load_shifting_electricity,"merit_order.input_capacity_from_share * availability") * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
34 changes: 34 additions & 0 deletions
34
...bility/industry/input_capacity_of_industry_metal_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # Users specify the combined effect of availablity * input share, which is used to update the input share | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_enabled = IF( | ||
| MIN( | ||
| INPUT_VALUE(capacity_of_industry_metal_flexibility_load_shifting_electricity), | ||
| USER_INPUT() | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| availability = INPUT_VALUE(capacity_of_industry_metal_flexibility_load_shifting_electricity); | ||
| input_share = DIVIDE(USER_INPUT(), availability); | ||
|
|
||
| EACH( | ||
| UPDATE( | ||
| V(industry_final_demand_for_metal_dsr_load_shifting_electricity, merit_order), input_capacity_from_share, | ||
| input_share | ||
| ), | ||
| UPDATE(V(industry_final_demand_for_metal_dsr_load_shifting_electricity), number_of_units, load_shifting_enabled), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_metal_dsr_load_shifting_electricity,"merit_order.input_capacity_from_share * availability") * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
34 changes: 34 additions & 0 deletions
34
...bility/industry/input_capacity_of_industry_other_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # Users specify the combined effect of availablity * input share, which is used to update the input share | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_enabled = IF( | ||
| MIN( | ||
| INPUT_VALUE(capacity_of_industry_other_flexibility_load_shifting_electricity), | ||
| USER_INPUT() | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| availability = INPUT_VALUE(capacity_of_industry_other_flexibility_load_shifting_electricity); | ||
| input_share = DIVIDE(USER_INPUT(), availability); | ||
|
|
||
| EACH( | ||
| UPDATE( | ||
| V(industry_final_demand_for_other_dsr_load_shifting_electricity, merit_order), input_capacity_from_share, | ||
| input_share | ||
| ), | ||
| UPDATE(V(industry_final_demand_for_other_dsr_load_shifting_electricity), number_of_units, load_shifting_enabled), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_other_dsr_load_shifting_electricity,"merit_order.input_capacity_from_share * availability") * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |
34 changes: 34 additions & 0 deletions
34
...ty/industry/input_capacity_of_industry_other_ict_flexibility_load_shifting_electricity.ad
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Load shifting is disabled is either the input (increased load) or the output (decreased load) capacity is set to 0.0% | ||
| # Load shifting output capacity = availability * peak capacity | ||
| # Load shifting input capacity = availablity * input share * peak capacity | ||
| # Users specify the combined effect of availablity * input share, which is used to update the input share | ||
| # For more information see https://docs.energytransitionmodel.com/contrib/load-shifting | ||
|
|
||
| - query = | ||
| load_shifting_enabled = IF( | ||
| MIN( | ||
| INPUT_VALUE(capacity_of_industry_other_ict_flexibility_load_shifting_electricity), | ||
| USER_INPUT() | ||
| ) == 0.0, | ||
| -> { 0.0 }, | ||
| -> { 1.0 } | ||
| ); | ||
|
|
||
| availability = INPUT_VALUE(capacity_of_industry_other_ict_flexibility_load_shifting_electricity); | ||
| input_share = DIVIDE(USER_INPUT(), availability); | ||
|
|
||
| EACH( | ||
| UPDATE( | ||
| V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity, merit_order), input_capacity_from_share, | ||
| input_share | ||
| ), | ||
| UPDATE(V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity), number_of_units, load_shifting_enabled), | ||
| ) | ||
|
|
||
| - priority = 0 | ||
| - max_value = 50.0 | ||
| - min_value = 0.0 | ||
| - start_value_gql = present:V(industry_final_demand_for_other_ict_dsr_load_shifting_electricity,"merit_order.input_capacity_from_share * availability") * 100.0 | ||
| - step_value = 1.0 | ||
| - unit = % | ||
| - update_period = future |