diff --git a/hub_api/workflow/insel_montly_energy_balance.py b/hub_api/workflow/insel_montly_energy_balance.py index 51bf6e8..ed54fdb 100644 --- a/hub_api/workflow/insel_montly_energy_balance.py +++ b/hub_api/workflow/insel_montly_energy_balance.py @@ -124,22 +124,12 @@ class InselMonthlyEnergyBalance(Resource, Config): 'yearly_cooling_peak_load': building.cooling_peak_load[cte.YEAR], 'monthly_heating_peak_load': building.heating_peak_load[cte.MONTH], 'yearly_heating_peak_load': building.heating_peak_load[cte.YEAR], - 'monthly_cooling_consumption': building.cooling_consumption[cte.MONTH], - 'yearly_cooling_consumption': building.cooling_consumption[cte.YEAR], - 'monthly_heating_consumption': building.heating_consumption[cte.MONTH], - 'yearly_heating_consumption': building.heating_consumption[cte.YEAR], 'monthly_lighting_electrical_demand': building.lighting_electrical_demand[cte.MONTH], 'yearly_lighting_electrical_demand': building.lighting_electrical_demand[cte.YEAR], 'monthly_appliances_electrical_demand': building.appliances_electrical_demand[cte.MONTH], 'yearly_appliances_electrical_demand': building.appliances_electrical_demand[cte.YEAR], - 'monthly_onsite_electrical_production': building.onsite_electrical_production[cte.MONTH], - 'yearly_onsite_electrical_production': building.onsite_electrical_production[cte.YEAR], - 'monthly_domestic_hot_water_consumption': building.domestic_hot_water_consumption[cte.MONTH], - 'yearly_domestic_hot_water_consumption': building.domestic_hot_water_consumption[cte.YEAR], - 'monthly_domestic_hot_water_demand': building.domestic_hot_water_heat_demand[cte.MONTH], - 'yearly_domestic_hot_water_demand': building.domestic_hot_water_heat_demand[cte.YEAR], - 'monthly_distribution_systems_electrical_consumption': building.domestic_hot_water_consumption[cte.MONTH], - 'yearly_distribution_systems_electrical_consumption': building.domestic_hot_water_consumption[cte.MONTH] + 'monthly_domestic_hot_water_heat_demand': building.domestic_hot_water_heat_demand[cte.MONTH], + 'yearly_domestic_hot_water_heat_demand': building.domestic_hot_water_heat_demand[cte.YEAR], } shutil.rmtree(tmp_path) return Response(json.dumps({'result': 'succeed', 'results': results}), status=200, headers=response_token)