Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand

This commit is contained in:
Fabian Neumann 2024-05-20 21:01:16 +02:00
commit 476349292c
2 changed files with 3 additions and 7 deletions

View File

@ -305,6 +305,8 @@ Upcoming Release
* Clarify that the rolling-horizon setting ``solving: rolling_horizon:`` only works for the rule :mod:`solve_operations_network` and not for networks with sector-coupling or investment variables. * Clarify that the rolling-horizon setting ``solving: rolling_horizon:`` only works for the rule :mod:`solve_operations_network` and not for networks with sector-coupling or investment variables.
* Fix non steel related coal demand during transition (using `sector_ratios_fraction_future`).
PyPSA-Eur 0.10.0 (19th February 2024) PyPSA-Eur 0.10.0 (19th February 2024)
===================================== =====================================

View File

@ -3240,13 +3240,7 @@ def add_industry(n, costs):
p_set=p_set, p_set=p_set,
) )
primary_steel = get( if (industrial_demand["coke"].sum() + industrial_demand["coal"].sum()) != 0:
snakemake.config["industry"]["St_primary_fraction"], investment_year
)
dri_steel = get(snakemake.config["industry"]["DRI_fraction"], investment_year)
bof_steel = primary_steel - dri_steel
if bof_steel > 0:
add_carrier_buses(n, "coal") add_carrier_buses(n, "coal")
mwh_coal_per_mwh_coke = 1.366 # from eurostat energy balance mwh_coal_per_mwh_coke = 1.366 # from eurostat energy balance