Changed unit conversion J to kWh to match the units in data catalog

This commit is contained in:
Oriol Gavalda 2023-11-22 08:01:26 -05:00
parent 97218deefb
commit 4e8d09c067

View File

@ -54,7 +54,7 @@ class TotalOperationalCosts(CostBase):
fixed_gas_cost_year_0 = archetype.operational_cost.fuels[1].fixed_monthly * 12 * factor_residential
variable_gas_cost_year_0 = (
(building.heating_consumption[cte.YEAR][0] + building.domestic_hot_water_consumption[cte.YEAR][0])
/ 1000 * cte.WATTS_HOUR_TO_JULES * archetype.operational_cost.fuels[1].variable[0]
/ (1000 * cte.WATTS_HOUR_TO_JULES) * archetype.operational_cost.fuels[1].variable[0]
)
if self._configuration.fuel_type == 0:
electricity_heating = building.heating_consumption[cte.YEAR][0] / 1000
@ -74,7 +74,7 @@ class TotalOperationalCosts(CostBase):
peak_load_value = peak_electricity_load.max(axis=1)
peak_electricity_demand = peak_load_value[1] / 1000 # self._peak_electricity_demand adapted to kW
variable_electricity_cost_year_0 = \
total_electricity_consumption * cte.WATTS_HOUR_TO_JULES * archetype.operational_cost.fuels[0].variable[0]
total_electricity_consumption / cte.WATTS_HOUR_TO_JULES * archetype.operational_cost.fuels[0].variable[0]
peak_electricity_cost_year_0 = peak_electricity_demand * archetype.operational_cost.fuels[0].fixed_power * 12
monthly_electricity_cost_year_0 = archetype.operational_cost.fuels[0].fixed_monthly * 12 * factor_residential