From 1ad7035ec42b1a81a1590e433fb7fce162d0d05d Mon Sep 17 00:00:00 2001 From: ekatef Date: Wed, 25 Oct 2023 16:28:38 +0300 Subject: [PATCH 1/6] Fix a column for Poland --- scripts/build_retro_cost.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index 2176a3b6..1d8da59c 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -155,6 +155,7 @@ def prepare_building_stock_data(): building_data["type"].replace( { "Covered area: heated [Mm²]": "Heated area [Mm²]", + "Construction features (U-value)": "Construction features (U-values)", "Windows ": "Window", "Windows": "Window", "Walls ": "Wall", From 2952d99dfa8a92ae75982971c6697c2798738a75 Mon Sep 17 00:00:00 2001 From: ekatef Date: Wed, 25 Oct 2023 16:42:05 +0300 Subject: [PATCH 2/6] Fix column with total values --- scripts/build_retro_cost.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index 1d8da59c..d121e7bd 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -203,7 +203,7 @@ def prepare_building_stock_data(): # heated floor area ---------------------------------------------------------- area = building_data[ - (building_data.type == "Heated area [Mm²]") & (building_data.detail != "Total") + (building_data.type == "Heated area [Mm²]") & (building_data.subsector != "Total") ] area_tot = area[["country", "sector", "value"]].groupby(["country", "sector"]).sum() area = pd.concat( From f24bd461736162654d186543556fcb91dcfb2674 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 14:11:48 +0000 Subject: [PATCH 3/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_retro_cost.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index d121e7bd..5e2fc17d 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -203,7 +203,8 @@ def prepare_building_stock_data(): # heated floor area ---------------------------------------------------------- area = building_data[ - (building_data.type == "Heated area [Mm²]") & (building_data.subsector != "Total") + (building_data.type == "Heated area [Mm²]") + & (building_data.subsector != "Total") ] area_tot = area[["country", "sector", "value"]].groupby(["country", "sector"]).sum() area = pd.concat( From 55807898a07f17d66c32a22d3b577385f6d2d230 Mon Sep 17 00:00:00 2001 From: martacki Date: Wed, 25 Oct 2023 16:23:41 +0200 Subject: [PATCH 4/6] update solar global radiation according to TABULA project --- scripts/build_retro_cost.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index 5e2fc17d..53e74b7b 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -102,7 +102,7 @@ solar_energy_transmittance = ( ) # solar global radiation [kWh/(m^2a)] solar_global_radiation = pd.Series( - [246, 401, 246, 148], + [271, 392, 271, 160], index=["east", "south", "west", "north"], name="solar_global_radiation [kWh/(m^2a)]", ) From 8ec0664253938034f0b055a20efc1ade4d6f9421 Mon Sep 17 00:00:00 2001 From: ekatef Date: Wed, 25 Oct 2023 20:33:59 +0300 Subject: [PATCH 5/6] Move column fix for u-values for Poland --- scripts/build_retro_cost.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index d121e7bd..bdabbd2c 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -155,7 +155,6 @@ def prepare_building_stock_data(): building_data["type"].replace( { "Covered area: heated [Mm²]": "Heated area [Mm²]", - "Construction features (U-value)": "Construction features (U-values)", "Windows ": "Window", "Windows": "Window", "Walls ": "Wall", @@ -165,6 +164,12 @@ def prepare_building_stock_data(): }, inplace=True, ) + building_data["feature"].replace( + { + "Construction features (U-value)": "Construction features (U-values)", + }, + inplace=True, + ) building_data.country_code = building_data.country_code.str.upper() building_data["subsector"].replace( From a31b421c1286884bba658f3d2cab6cd5498de34c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:35:10 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_retro_cost.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index a57ab81a..f5313c21 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -169,7 +169,7 @@ def prepare_building_stock_data(): "Construction features (U-value)": "Construction features (U-values)", }, inplace=True, - ) + ) building_data.country_code = building_data.country_code.str.upper() building_data["subsector"].replace(