s_ranjbar/city_retrofit
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed boolean simulation type indicator

Browse Source
This commit is contained in:
Peter Yefi 2022-03-03 13:48:02 -05:00
parent c22d28fc89
commit dd26fb6fd5
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
exports/energy_systems/__pycache__/__init__.cpython-38.pyc Normal file
View File

Binary file not shown.

BIN
exports/energy_systems/__pycache__/heat_pump_export.cpython-38.pyc Normal file
View File

Binary file not shown.

2
exports/energy_systems/air_source_hp_export.py
View File

@ -22,7 +22,7 @@ class AirSourceHPExport(HeatPumpExport):
:param output_path: the file to hold insel simulation results
:param sim_type: the simulation type to run: 1 for series, 0 for parallel
"""
tmp_file = 'heat_pumps/as_series.txt' if sim_type == 1 else 'heat_pumps/as_parallel.txt'
tmp_file = 'heat_pumps/as_series.txt' if sim_type == 0 else 'heat_pumps/as_parallel.txt'
template_path = (base_path / tmp_file)
super().__init__(base_path, city, output_path, template_path)

2
exports/energy_systems/water_to_water_hp_export.py
View File

@ -21,7 +21,7 @@ class WaterToWaterHPExport(HeatPumpExport):
:param output_path: the file to hold insel simulation results
:param sim_type: the simulation type to run: 1 for series, 0 for parallel
"""
tmp_file = 'heat_pumps/w2w_series.txt' if sim_type == 1 else 'heat_pumps/w2w_parallel.txt'
tmp_file = 'heat_pumps/w2w_series.txt' if sim_type == 0 else 'heat_pumps/w2w_parallel.txt'
template_path = (base_path / tmp_file)
water_temp = (base_path / 'heat_pumps/wt_hourly3.txt')
super().__init__(base_path, city, output_path, template_path, water_temp)

4
exports/energy_systems_factory.py
View File

@ -15,14 +15,14 @@ class EnergySystemsExportFactory:
Exports factory class for energy systems
"""
def __init__(self, city, user_input, hp_model, output_path, sim_type=1, data_type='heat', base_path=None):
def __init__(self, city, user_input, hp_model, output_path, sim_type=0, data_type='heat', base_path=None):
"""
:param city: the city object
:param user_input: user provided input from UI
:param hp_model: the heat pump model to run
:param output_path: the file to hold simulation results
:param sim_type: the simulation type, 1 for series 0 for parallel
:param sim_type: the simulation type, 0 for series 1 for parallel
:param data_type: indicates whether cooling or heating data is used
:param base_path: the data directory of energy systems
"""