bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

hierarchical clustering: account for changes from merging master

Browse Source
This commit is contained in:
martacki 2022-06-27 21:02:45 +02:00
parent 50a518a155
commit 29fe0fb7fb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/cluster_network.py
View File

@ -12,6 +12,7 @@ Relevant Settings
.. code:: yaml .. code:: yaml
clustering: clustering:
cluster_network:
aggregation_strategies: aggregation_strategies:
focus_weights: focus_weights:

7
scripts/simplify_network.py
View File

@ -14,7 +14,8 @@ Relevant Settings
.. code:: yaml .. code:: yaml
clustering: clustering:
simplify: simplify_network:
cluster_network:
aggregation_strategies: aggregation_strategies:
costs: costs:
@ -415,7 +416,7 @@ if __name__ == "__main__":
busmaps = [trafo_map, simplify_links_map, stub_map] busmaps = [trafo_map, simplify_links_map, stub_map]
cluster_config = snakemake.config.get('clustering', {}).get('simplify_network', {}) cluster_config = snakemake.config.get('clustering', {}).get('simplify_network', {})
if cluster_config.get('clustering', {}).get('simplify', {}).get('to_substations', False): if cluster_config.get('clustering', {}).get('simplify_network', {}).get('to_substations', False):
n, substation_map = aggregate_to_substations(n, aggregation_strategies) n, substation_map = aggregate_to_substations(n, aggregation_strategies)
busmaps.append(substation_map) busmaps.append(substation_map)
@ -429,7 +430,7 @@ if __name__ == "__main__":
for carrier in carriers: for carrier in carriers:
buses_i = list(set(n.buses.index)-set(n.generators.query("carrier == @carrier").bus)) buses_i = list(set(n.buses.index)-set(n.generators.query("carrier == @carrier").bus))
logger.info(f'clustering preparaton (hac): aggregating {len(buses_i)} buses of type {carrier}.') logger.info(f'clustering preparaton (hac): aggregating {len(buses_i)} buses of type {carrier}.')
n, busmap_hac = aggregate_to_substations(n, buses_i) n, busmap_hac = aggregate_to_substations(n, aggregation_strategies, buses_i)
busmaps.append(busmap_hac) busmaps.append(busmap_hac)
if snakemake.wildcards.simpl: if snakemake.wildcards.simpl: