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

Merge branch 'wildcard-opts-config' of github.com:PyPSA/pypsa-eur into wildcard-opts-config

Browse Source
This commit is contained in:
virio-andreyana 2023-09-15 12:17:14 +02:00
commit 502b3a61ba
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/prepare_network.py
View File

@ -375,7 +375,9 @@ if __name__ == "__main__":
sel = c.df.carrier.str.contains(carrier) sel = c.df.carrier.str.contains(carrier)
c.df.loc[sel, attr] *= factor c.df.loc[sel, attr] *= factor
Ept_config = snakemake.params.costs["emission_prices"].get("co2_monthly_prices", False) Ept_config = snakemake.params.costs["emission_prices"].get(
"co2_monthly_prices", False
)
for o in opts: for o in opts:
if "Ept" in o or Ept_config: if "Ept" in o or Ept_config:
logger.info( logger.info(
@ -392,7 +394,9 @@ if __name__ == "__main__":
add_emission_prices(n, dict(co2=co2_wildcard)) add_emission_prices(n, dict(co2=co2_wildcard))
else: else:
logger.info("Setting CO2 prices according to config value.") logger.info("Setting CO2 prices according to config value.")
add_emission_prices(n, dict(co2=snakemake.params.costs["emission_prices"]["co2"])) add_emission_prices(
n, dict(co2=snakemake.params.costs["emission_prices"]["co2"])
)
ll_type, factor = snakemake.wildcards.ll[0], snakemake.wildcards.ll[1:] ll_type, factor = snakemake.wildcards.ll[0], snakemake.wildcards.ll[1:]
set_transmission_limit(n, ll_type, factor, costs, Nyears) set_transmission_limit(n, ll_type, factor, costs, Nyears)