Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
9f8642d0b5
4
main.py
4
main.py
|
@ -13,7 +13,7 @@ from sra_engine import SraEngine
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
file_path = (Path(__file__).parent / 'input_files' / 'selected_building.geojson')
|
file_path = (Path(__file__).parent / 'data' / 'selected_building.geojson')
|
||||||
climate_reference_city = 'Montreal'
|
climate_reference_city = 'Montreal'
|
||||||
weather_file = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw'
|
weather_file = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw'
|
||||||
weather_format = 'epw'
|
weather_format = 'epw'
|
||||||
|
@ -23,7 +23,7 @@ try:
|
||||||
attic_heated_case = 0
|
attic_heated_case = 0
|
||||||
basement_heated_case = 1
|
basement_heated_case = 1
|
||||||
|
|
||||||
out_path = (Path(__file__).parent / 'output_files')
|
out_path = (Path(__file__).parent / 'outputs')
|
||||||
tmp_folder = (Path(__file__).parent / 'tmp')
|
tmp_folder = (Path(__file__).parent / 'tmp')
|
||||||
|
|
||||||
print('[simulation start]')
|
print('[simulation start]')
|
||||||
|
|
|
@ -92,7 +92,8 @@ class Results:
|
||||||
if value * appliances.density * thermal_zone.total_floor_area > peak_appliances:
|
if value * appliances.density * thermal_zone.total_floor_area > peak_appliances:
|
||||||
peak_appliances = value * appliances.density * thermal_zone.total_floor_area
|
peak_appliances = value * appliances.density * thermal_zone.total_floor_area
|
||||||
|
|
||||||
monthly_electricity_peak = [0.9 * peak_lighting + 0.7 * peak_appliances]*12
|
#todo:check with Pilar. Peak cannot be multiplied by 12. I deleted it. Is el. peak not saved in building?
|
||||||
|
monthly_electricity_peak = [0.9 * peak_lighting + 0.7 * peak_appliances]
|
||||||
conditioning_peak = []
|
conditioning_peak = []
|
||||||
for i, value in enumerate(building.heating_peak_load[cte.MONTH][cte.HEATING_PEAK_LOAD]):
|
for i, value in enumerate(building.heating_peak_load[cte.MONTH][cte.HEATING_PEAK_LOAD]):
|
||||||
if cooling * building.cooling_peak_load[cte.MONTH][cte.COOLING_PEAK_LOAD][i] > heating * value:
|
if cooling * building.cooling_peak_load[cte.MONTH][cte.COOLING_PEAK_LOAD][i] > heating * value:
|
||||||
|
|
|
@ -18,7 +18,7 @@ class SraEngine:
|
||||||
self._output_file_path = output_file_path
|
self._output_file_path = output_file_path
|
||||||
self._weather_file = weather_file
|
self._weather_file = weather_file
|
||||||
if platform.system() == 'Linux':
|
if platform.system() == 'Linux':
|
||||||
self._executable = 'citysim_sra'
|
self._executable = 'sra'
|
||||||
elif platform.system() == 'Windows':
|
elif platform.system() == 'Windows':
|
||||||
self._executable = 'shortwave_integer'
|
self._executable = 'shortwave_integer'
|
||||||
ExportsFactory('sra', self._city, output_file_path, weather_file=self._weather_file, weather_format='epw').export()
|
ExportsFactory('sra', self._city, output_file_path, weather_file=self._weather_file, weather_format='epw').export()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user