From 8d93b0636ed77a7f5837ff8af8b52c70648e2cb3 Mon Sep 17 00:00:00 2001 From: Thomas Gilon Date: Thu, 4 Apr 2024 15:17:57 +0200 Subject: [PATCH] Fix fill missing in industry sector ratios intermediate --- doc/release_notes.rst | 2 ++ scripts/build_industry_sector_ratios_intermediate.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 8326f615..d07d1901 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -174,6 +174,8 @@ Upcoming Release * Fix index of existing capacities in `add_power_capacities_installed_before_baseyear` with `m` option. +* Fix fill missing data in `build_industry_sector_ratios_intermediate`. + PyPSA-Eur 0.10.0 (19th February 2024) ===================================== diff --git a/scripts/build_industry_sector_ratios_intermediate.py b/scripts/build_industry_sector_ratios_intermediate.py index 14e09505..d1525242 100644 --- a/scripts/build_industry_sector_ratios_intermediate.py +++ b/scripts/build_industry_sector_ratios_intermediate.py @@ -54,8 +54,10 @@ def build_industry_sector_ratios_intermediate(): today_sector_ratios_ct = ( group.droplevel(0) .T.reindex_like(future_sector_ratios) - .fillna(future_sector_ratios) ) + missing_mask = (today_sector_ratios_ct.isna().all()) + today_sector_ratios_ct.loc[:, missing_mask] = future_sector_ratios.loc[:, missing_mask] + today_sector_ratios_ct.loc[:, ~missing_mask] = today_sector_ratios_ct.loc[:, ~missing_mask].fillna(0) intermediate_sector_ratios[ct] = ( today_sector_ratios_ct * (1 - fraction_future) + future_sector_ratios * fraction_future