Merge pull request #767 from ekatef/retrofit_data_fixes

Minor fixes for retrofit calculations
This commit is contained in:
Fabian Neumann 2023-10-26 10:10:36 +02:00 committed by GitHub
commit f35ecbe4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -102,7 +102,7 @@ solar_energy_transmittance = (
) )
# solar global radiation [kWh/(m^2a)] # solar global radiation [kWh/(m^2a)]
solar_global_radiation = pd.Series( solar_global_radiation = pd.Series(
[246, 401, 246, 148], [271, 392, 271, 160],
index=["east", "south", "west", "north"], index=["east", "south", "west", "north"],
name="solar_global_radiation [kWh/(m^2a)]", name="solar_global_radiation [kWh/(m^2a)]",
) )
@ -164,6 +164,12 @@ def prepare_building_stock_data():
}, },
inplace=True, 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.country_code = building_data.country_code.str.upper()
building_data["subsector"].replace( building_data["subsector"].replace(
@ -202,7 +208,8 @@ def prepare_building_stock_data():
# heated floor area ---------------------------------------------------------- # heated floor area ----------------------------------------------------------
area = building_data[ 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_tot = area[["country", "sector", "value"]].groupby(["country", "sector"]).sum()
area = pd.concat( area = pd.concat(