Merge pull request #721 from PyPSA/hotmaps-fallback-field
industry distribution: use EPRTR as fallback if ETS missing
This commit is contained in:
commit
1a60dcb734
@ -12,6 +12,8 @@ Upcoming Release
|
|||||||
|
|
||||||
* Updated Global Energy Monitor LNG terminal data to March 2023 version.
|
* 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)
|
PyPSA-Eur 0.8.1 (27th July 2023)
|
||||||
================================
|
================================
|
||||||
|
|
||||||
|
@ -115,7 +115,9 @@ def build_nodal_distribution_key(hotmaps, regions, countries):
|
|||||||
facilities = hotmaps.query("country == @country and Subsector == @sector")
|
facilities = hotmaps.query("country == @country and Subsector == @sector")
|
||||||
|
|
||||||
if not facilities.empty:
|
if not facilities.empty:
|
||||||
emissions = facilities["Emissions_ETS_2014"]
|
emissions = facilities["Emissions_ETS_2014"].fillna(
|
||||||
|
hotmaps["Emissions_EPRTR_2014"]
|
||||||
|
)
|
||||||
if emissions.sum() == 0:
|
if emissions.sum() == 0:
|
||||||
key = pd.Series(1 / len(facilities), facilities.index)
|
key = pd.Series(1 / len(facilities), facilities.index)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user