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

Merge pull request #930 from PyPSA/cl-meoh-unit

Browse Source 
bugfix: correct units of subtracted chlorine and methanol
This commit is contained in:
Fabian Neumann 2024-02-16 12:40:37 +01:00 committed by GitHub
commit 3f6f17cef6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -10,6 +10,8 @@ Release Notes
Upcoming Release Upcoming Release
================ ================
* Bugfix: Correct units of subtracted chlorine and methanol demand in
:mod:`build_industry_sector_ratios`.
* Include all countries in ammonia production resource. This is so that the full * Include all countries in ammonia production resource. This is so that the full
EU28 ammonia demand can be correctly subtracted in the rule EU28 ammonia demand can be correctly subtracted in the rule

12
scripts/build_industry_sector_ratios.py
View File

@ -408,15 +408,15 @@ def chemicals_industry():
df.loc["methane", sector] -= ammonia_total * params["MWh_CH4_per_tNH3_SMR"] df.loc["methane", sector] -= ammonia_total * params["MWh_CH4_per_tNH3_SMR"]
df.loc["elec", sector] -= ammonia_total * params["MWh_elec_per_tNH3_SMR"] df.loc["elec", sector] -= ammonia_total * params["MWh_elec_per_tNH3_SMR"]
# subtract chlorine demand # subtract chlorine demand (in MtCl/a)
chlorine_total = params["chlorine_production_today"] chlorine_total = params["chlorine_production_today"]
df.loc["hydrogen", sector] -= chlorine_total * params["MWh_H2_per_tCl"] df.loc["hydrogen", sector] -= chlorine_total * params["MWh_H2_per_tCl"] * 1e3
df.loc["elec", sector] -= chlorine_total * params["MWh_elec_per_tCl"] df.loc["elec", sector] -= chlorine_total * params["MWh_elec_per_tCl"] * 1e3
# subtract methanol demand # subtract methanol demand (in MtMeOH/a)
methanol_total = params["methanol_production_today"] methanol_total = params["methanol_production_today"]
df.loc["methane", sector] -= methanol_total * params["MWh_CH4_per_tMeOH"] df.loc["methane", sector] -= methanol_total * params["MWh_CH4_per_tMeOH"] * 1e3
df.loc["elec", sector] -= methanol_total * params["MWh_elec_per_tMeOH"] df.loc["elec", sector] -= methanol_total * params["MWh_elec_per_tMeOH"] * 1e3
# MWh/t material # MWh/t material
df.loc[sources, sector] = df.loc[sources, sector] / s_out df.loc[sources, sector] = df.loc[sources, sector] / s_out