Skip to content

Commit

Permalink
Merge pull request #721 from PyPSA/hotmaps-fallback-field
Browse files Browse the repository at this point in the history
industry distribution: use EPRTR as fallback if ETS missing
  • Loading branch information
fneum authored Aug 14, 2023
2 parents 1c1d45b + 0d096d7 commit 1a60dcb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Upcoming Release

* Updated Global Energy Monitor LNG terminal data to March 2023 version.

* For industry distribution, use EPRTR as fallback if ETS data is not available.

PyPSA-Eur 0.8.1 (27th July 2023)
================================

Expand Down
4 changes: 3 additions & 1 deletion scripts/build_industrial_distribution_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ def build_nodal_distribution_key(hotmaps, regions, countries):
facilities = hotmaps.query("country == @country and Subsector == @sector")

if not facilities.empty:
emissions = facilities["Emissions_ETS_2014"]
emissions = facilities["Emissions_ETS_2014"].fillna(
hotmaps["Emissions_EPRTR_2014"]
)
if emissions.sum() == 0:
key = pd.Series(1 / len(facilities), facilities.index)
else:
Expand Down

0 comments on commit 1a60dcb

Please sign in to comment.