diff --git a/config.default.yaml b/config.default.yaml index 22edfb76a..43189f318 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -53,8 +53,9 @@ cluster_options: distribute_cluster: ['load'] # Distributes cluster nodes per country according to ['load'],['pop'] or ['gdp'] out_logging: true # When "True", logging is printed to console aggregation_strategies: - generators: - p_nom_max: sum # use "min" for more conservative assumptions + generators: # use "min" for more conservative assumptions + p_nom: sum + p_nom_max: sum p_nom_min: sum p_min_pu: mean marginal_cost: mean @@ -100,7 +101,7 @@ electricity: co2limit: 7.75e+7 # European default, 0.05 * 3.1e9*0.5, needs to be adjusted for Africa co2base: 1.487e+9 # European default, adjustment to Africa necessary agg_p_nom_limits: data/agg_p_nom_minmax.csv - hvdc_as_lines: true # should HVDC lines be modeled as `Line` or as `Link` component? + hvdc_as_lines: false # should HVDC lines be modeled as `Line` or as `Link` component? operational_reserve: # like https://genxproject.github.io/GenX/dev/core/#Reserves activate: false diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 931743cc8..f161e7dc4 100644 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -65,8 +65,9 @@ cluster_options: distribute_cluster: ['load'] # ['load'],['pop'] or ['gdp'] out_logging: true # When true, logging is printed to console aggregation_strategies: - generators: - p_nom_max: sum # use "min" for more conservative assumptions + generators: # use "min" for more conservative assumptions + p_nom: sum + p_nom_max: sum p_nom_min: sum p_min_pu: mean marginal_cost: mean @@ -113,7 +114,7 @@ electricity: co2limit: 7.75e+7 # 0.05 * 3.1e9*0.5 co2base: 1.487e+9 agg_p_nom_limits: data/agg_p_nom_minmax.csv - hvdc_as_lines: true # should HVDC lines be modeled as `Line` or as `Link` component? + hvdc_as_lines: false # should HVDC lines be modeled as `Line` or as `Link` component? operational_reserve: # like https://genxproject.github.io/GenX/dev/core/#Reserves activate: false diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 8227d7dde..29fceb464 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -101,7 +101,9 @@ Upcoming Release * Improve line augmentation for network expansion explorations. Use k-edge augmenation for AC lines and random sampling for long HVDC lines: `PR #427 `_ -* Fix minor bug in clustering about missing prefix assignment `PR #434 ` +* Fix minor bug in clustering about missing prefix assignment `PR #434 `_ + +* Fix major aggregation bug and adjust config: `PR #435 `_ PyPSA-Africa 0.0.2 (6th April 2022) ===================================== diff --git a/test/config.test1.yaml b/test/config.test1.yaml index a8d39daf0..48425421e 100644 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -69,8 +69,9 @@ cluster_options: distribute_cluster: ['load'] # ['load'],['pop'] or ['gdp'] out_logging: true # When true, logging is printed to console aggregation_strategies: - generators: - p_nom_max: sum # use "min" for more conservative assumptions + generators: # use "min" for more conservative assumptions + p_nom: sum + p_nom_max: sum p_nom_min: sum p_min_pu: mean marginal_cost: mean @@ -117,7 +118,7 @@ electricity: co2limit: 7.75e+7 # 0.05 * 3.1e9*0.5 co2base: 1.487e+9 agg_p_nom_limits: data/agg_p_nom_minmax.csv - hvdc_as_lines: true # should HVDC lines be modeled as `Line` or as `Link` component? + hvdc_as_lines: true # should HVDC lines be modeled as `Line` or as `Link` component? operational_reserve: # like https://genxproject.github.io/GenX/dev/core/#Reserves activate: false