Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes

This commit is contained in:
ekatef 2023-10-25 20:34:43 +03:00
commit c1150dfab3

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)]",
) )
@ -208,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.subsector != "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(