remove overrides

This commit is contained in:
lisazeyen 2023-08-22 11:00:25 +02:00
parent f5959618f0
commit 890c80e047

View File

@ -12,7 +12,7 @@ import re
import pandas as pd import pandas as pd
import pypsa import pypsa
from _helpers import override_component_attrs, update_config_with_sector_opts from _helpers import update_config_with_sector_opts
from add_existing_baseyear import add_build_year_to_new_assets from add_existing_baseyear import add_build_year_to_new_assets
from pypsa.descriptors import expand_series from pypsa.descriptors import expand_series
from pypsa.io import import_components_from_dataframe from pypsa.io import import_components_from_dataframe
@ -88,13 +88,12 @@ def concat_networks(years):
snakemake.input[f"network_{year}"] for year in years[1:] snakemake.input[f"network_{year}"] for year in years[1:]
] ]
# final concatenated network # final concatenated network
overrides = override_component_attrs(snakemake.input.overrides) n = pypsa.Network()
n = pypsa.Network(override_component_attrs=overrides)
# iterate over single year networks and concat to perfect foresight network # iterate over single year networks and concat to perfect foresight network
for i, network_path in enumerate(network_paths): for i, network_path in enumerate(network_paths):
year = years[i] year = years[i]
network = pypsa.Network(network_path, override_component_attrs=overrides) network = pypsa.Network(network_path)
network.lines["carrier"] = "AC" network.lines["carrier"] = "AC"
add_build_year_to_new_assets(network, year) add_build_year_to_new_assets(network, year)
@ -286,8 +285,8 @@ if __name__ == "__main__":
simpl="", simpl="",
opts="", opts="",
clusters="37", clusters="37",
ll=1.0, ll="v1.0",
sector_opts="cb40ex0-2190H-T-H-B-solar+p3-dist1", sector_opts="Co2L0-8760H-T-H-B-I-A-solar+p3-dist1",
) )
update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts) update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts)