From def61ae769e4b099544005b60b6bfbb9cbb6e257 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 14 Aug 2023 12:39:33 +0200 Subject: [PATCH 1/2] industry distribution: use EPRTR as fallback if ETS missing --- doc/release_notes.rst | 2 ++ scripts/build_industrial_distribution_key.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 70a73e2f..b6db1b90 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -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) ================================ diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py index e93e43c2..65ed8da9 100644 --- a/scripts/build_industrial_distribution_key.py +++ b/scripts/build_industrial_distribution_key.py @@ -115,7 +115,7 @@ 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: From 0d096d7388e90c3fe4fb931d3a2d9147169e010e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:40:04 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_industrial_distribution_key.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py index 65ed8da9..979a1493 100644 --- a/scripts/build_industrial_distribution_key.py +++ b/scripts/build_industrial_distribution_key.py @@ -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"].fillna(hotmaps["Emissions_EPRTR_2014"]) + emissions = facilities["Emissions_ETS_2014"].fillna( + hotmaps["Emissions_EPRTR_2014"] + ) if emissions.sum() == 0: key = pd.Series(1 / len(facilities), facilities.index) else: