added dhw and electrical demand to results importer and sanity check to importer
This commit is contained in:
parent
f0a1d378b2
commit
1cc72119c9
|
@ -70,8 +70,8 @@ class InselMonthlyEnergyBalance:
|
|||
total_dhw_demand += total_day * _DAYS_A_MONTH[day_type][month] * demand
|
||||
domestic_hot_water_demand.append(total_dhw_demand * area)
|
||||
|
||||
building.domestic_hot_water_heat_demand = \
|
||||
pd.DataFrame(domestic_hot_water_demand, columns=[f'{building.name} domestic hot water demand Wh'])
|
||||
building.domestic_hot_water_heat_demand[cte.MONTH] = \
|
||||
pd.DataFrame(domestic_hot_water_demand, columns=[cte.INSEL_MEB])
|
||||
|
||||
def _electrical_demand(self):
|
||||
for building in self._city.buildings:
|
||||
|
@ -103,10 +103,8 @@ class InselMonthlyEnergyBalance:
|
|||
total_appliances += total_day * _DAYS_A_MONTH[day_type][month] * thermal_zone.appliances.density
|
||||
appliances_demand.append(total_appliances * area)
|
||||
|
||||
building.lighting_electrical_demand = pd.DataFrame(lighting_demand,
|
||||
columns=[f'{building.name} lighting electrical demand Wh'])
|
||||
building.appliances_electrical_demand = pd.DataFrame(appliances_demand,
|
||||
columns=[f'{building.name} appliances electrical demand Wh'])
|
||||
building.lighting_electrical_demand[cte.MONTH] = pd.DataFrame(lighting_demand, columns=[cte.INSEL_MEB])
|
||||
building.appliances_electrical_demand[cte.MONTH] = pd.DataFrame(appliances_demand, columns=[cte.INSEL_MEB])
|
||||
|
||||
def enrich(self):
|
||||
for building in self._city.buildings:
|
||||
|
|
Loading…
Reference in New Issue
Block a user