Merge branch 'wildcard-opts-config' of github.com:PyPSA/pypsa-eur into wildcard-opts-config
This commit is contained in:
commit
502b3a61ba
@ -375,7 +375,9 @@ if __name__ == "__main__":
|
||||
sel = c.df.carrier.str.contains(carrier)
|
||||
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:
|
||||
if "Ept" in o or Ept_config:
|
||||
logger.info(
|
||||
@ -392,7 +394,9 @@ if __name__ == "__main__":
|
||||
add_emission_prices(n, dict(co2=co2_wildcard))
|
||||
else:
|
||||
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:]
|
||||
set_transmission_limit(n, ll_type, factor, costs, Nyears)
|
||||
|
Loading…
Reference in New Issue
Block a user