Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes for retrofit calculations #767

Merged
merged 7 commits into from
Oct 26, 2023
Merged

Minor fixes for retrofit calculations #767

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ad7035
Fix a column for Poland
ekatef Oct 25, 2023
2952d99
Fix column with total values
ekatef Oct 25, 2023
f24bd46
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 25, 2023
5580789
update solar global radiation according to TABULA project
martacki Oct 25, 2023
8ec0664
Move column fix for u-values for Poland
ekatef Oct 25, 2023
c1150df
Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrof…
ekatef Oct 25, 2023
a31b421
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/build_retro_cost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
)
# 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)]",
)
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -202,7 +203,8 @@ 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(
Expand Down