Merge pull request #930 from PyPSA/cl-meoh-unit
bugfix: correct units of subtracted chlorine and methanol
This commit is contained in:
commit
3f6f17cef6
@ -10,6 +10,8 @@ Release Notes
|
||||
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
|
||||
EU28 ammonia demand can be correctly subtracted in the rule
|
||||
|
@ -408,15 +408,15 @@ def chemicals_industry():
|
||||
df.loc["methane", sector] -= ammonia_total * params["MWh_CH4_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"]
|
||||
df.loc["hydrogen", sector] -= chlorine_total * params["MWh_H2_per_tCl"]
|
||||
df.loc["elec", sector] -= chlorine_total * params["MWh_elec_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"] * 1e3
|
||||
|
||||
# subtract methanol demand
|
||||
# subtract methanol demand (in MtMeOH/a)
|
||||
methanol_total = params["methanol_production_today"]
|
||||
df.loc["methane", sector] -= methanol_total * params["MWh_CH4_per_tMeOH"]
|
||||
df.loc["elec", sector] -= methanol_total * params["MWh_elec_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"] * 1e3
|
||||
|
||||
# MWh/t material
|
||||
df.loc[sources, sector] = df.loc[sources, sector] / s_out
|
||||
|
Loading…
Reference in New Issue
Block a user