forked from s_ranjbar/city_retrofit
Added Reactivation and Deactivation Temps
This commit is contained in:
parent
702c8c4103
commit
7f21cc22c3
|
@ -157,6 +157,10 @@ class HeatPumpExport:
|
||||||
constants_dict = yaml.load(file, Loader=yaml.FullLoader)
|
constants_dict = yaml.load(file, Loader=yaml.FullLoader)
|
||||||
for key, value in constants_dict.items():
|
for key, value in constants_dict.items():
|
||||||
self._input_data[key] = value
|
self._input_data[key] = value
|
||||||
|
# compute water to water HP specific values
|
||||||
|
if self._water_temp is not None:
|
||||||
|
self._input_data["HPDisactivationTemperature"] = self._input_data["HPSupTemp"] - 5
|
||||||
|
self._input_data["HPReactivationTemperature"] = self._input_data["HPSupTemp"] - 18
|
||||||
|
|
||||||
# compute maximum demand. TODO: This should come from catalog in the future
|
# compute maximum demand. TODO: This should come from catalog in the future
|
||||||
max_demand = self._compute_max_demand()
|
max_demand = self._compute_max_demand()
|
||||||
|
|
|
@ -47,10 +47,7 @@ class TestEnergySystemsFactory(TestCase):
|
||||||
'FuelPrice': 0.12,
|
'FuelPrice': 0.12,
|
||||||
'FuelEF': 1887,
|
'FuelEF': 1887,
|
||||||
'FuelDensity': 0.717,
|
'FuelDensity': 0.717,
|
||||||
'HPSupTemp': 60,
|
'HPSupTemp': 60
|
||||||
# parameters below depend on HPSupTem
|
|
||||||
'HPDisactivationTemperature': 55,
|
|
||||||
'HPReactivationTemperature': 42
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EnergySystemsExportFactory(self._city, user_input, 'ClimateMaster 156 kW', self._output_path).export('water')
|
EnergySystemsExportFactory(self._city, user_input, 'ClimateMaster 156 kW', self._output_path).export('water')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user