Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Pilar Monsalvete 2023-07-07 14:35:24 -04:00
commit c8379eeb38
2 changed files with 4 additions and 4 deletions

View File

@ -324,4 +324,4 @@ class Geojson:
for alias in building_aliases:
building.add_alias(alias)
building.volume = volume
return building
return building

View File

@ -40,13 +40,13 @@ class EpwWeatherParameters:
_ = file.readline().split(',')
line = file.readline().split(',')
number_records = int(line[1])
ground_temperature_ini = {}
ground_temperature_from_file = {}
for i in range(0, number_records):
depth_measurement_ground_temperature = line[i*16+2]
temperatures = []
for j in range(0, 12):
temperatures.append(float(line[i*16+j+6]))
ground_temperature_ini[depth_measurement_ground_temperature] = temperatures
ground_temperature_from_file[depth_measurement_ground_temperature] = temperatures
except SystemExit:
logging.error('Error: weather file %s not found. Please download it from https://energyplus.net/weather and place'
' it in folder data\\weather\\epw', self._path)
@ -79,7 +79,7 @@ class EpwWeatherParameters:
sys.stderr.write(f'Error: wrong formatting of weather file {self._path}\n')
sys.exit()
for building in self._city.buildings:
building.ground_temperature[cte.MONTH] = ground_temperature_ini
building.ground_temperature[cte.MONTH] = ground_temperature_from_file
ground_temperature = {}
for ground_temperature_set in building.ground_temperature[cte.MONTH]:
temperature = 0