added 'year' to 'minute' as constants in constants.py and adapted the code to that
This commit is contained in:
Pilar
parent
a7b7e6bb0d
commit
33ac71d5a6
|
|
@ -207,13 +207,13 @@ class Occupants:
|
|||
if self._complete_year_schedule is None:
|
||||
self._complete_year_schedule = []
|
||||
for i in range(1, 13):
|
||||
month_range = cal.monthrange(2018, i)
|
||||
month_range = cal.monthrange(2015, i)
|
||||
for day in range(1, month_range[1]+1):
|
||||
if cal.weekday(2018, i, day) < 5:
|
||||
if cal.weekday(2015, i, day) < 5:
|
||||
for j in range(0, 24):
|
||||
week_schedule = schedules['WD'][j]
|
||||
self._complete_year_schedule.append(week_schedule)
|
||||
elif cal.weekday(2018, i, day) == 5:
|
||||
elif cal.weekday(2015, i, day) == 5:
|
||||
for j in range(0, 24):
|
||||
week_schedule = schedules['Sat'][j]
|
||||
self._complete_year_schedule.append(week_schedule)
|
||||
|
|
|
|||
|
|
@ -215,6 +215,9 @@ class Polyhedron:
|
|||
:return: [x,y,z]
|
||||
"""
|
||||
if self._centroid is None:
|
||||
trimesh = self.trimesh
|
||||
if trimesh is None:
|
||||
return None
|
||||
self._centroid = self.trimesh.centroid
|
||||
return self._centroid
|
||||
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ class Building(CityObject):
|
|||
else:
|
||||
self._internal_walls.append(surface)
|
||||
|
||||
self._pv_plus_hp_installation = None
|
||||
|
||||
@property
|
||||
def grounds(self) -> [Surface]:
|
||||
"""
|
||||
|
|
@ -361,3 +363,11 @@ class Building(CityObject):
|
|||
if surface.type == 'Ground':
|
||||
self._floor_area += surface.perimeter_polygon.area
|
||||
return self._floor_area
|
||||
|
||||
@property
|
||||
def pv_plus_hp_installation(self):
|
||||
return self._pv_plus_hp_installation
|
||||
|
||||
@pv_plus_hp_installation.setter
|
||||
def pv_plus_hp_installation(self, value):
|
||||
self._pv_plus_hp_installation = value
|
||||
|
|
|
|||
|
|
@ -164,6 +164,20 @@ class City:
|
|||
self._buildings = []
|
||||
self._buildings.append(new_city_object)
|
||||
|
||||
def remove_city_object(self, city_object):
|
||||
"""
|
||||
Remove a CityObject from the city
|
||||
:param city_object:CityObject
|
||||
:return: None
|
||||
"""
|
||||
if city_object.type != 'building':
|
||||
raise NotImplementedError(city_object.type)
|
||||
if self._buildings is None or self._buildings == []:
|
||||
sys.stderr.write('Warning: impossible to remove city_object, the city is empty\n')
|
||||
else:
|
||||
if city_object in self._buildings:
|
||||
self._buildings.remove(city_object)
|
||||
|
||||
@property
|
||||
def srs_name(self):
|
||||
"""
|
||||
|
|
@ -210,12 +224,15 @@ class City:
|
|||
selected_region_lower_corner = [center[0] - radius, center[1] - radius, center[2] - radius]
|
||||
selected_region_upper_corner = [center[0] + radius, center[1] + radius, center[2] + radius]
|
||||
selected_region_city = City(selected_region_lower_corner, selected_region_upper_corner, srs_name=self.srs_name)
|
||||
selected_region_city.climate_file = self.climate_file
|
||||
# selected_region_city.climate_reference_city = self.climate_reference_city
|
||||
for city_object in self.city_objects:
|
||||
location = city_object.centroid
|
||||
distance = math.sqrt(math.pow(location[0]-center[0], 2) + math.pow(location[1]-center[1], 2)
|
||||
+ math.pow(location[2]-center[2], 2))
|
||||
if distance < radius:
|
||||
selected_region_city.add_city_object(city_object)
|
||||
if location is not None:
|
||||
distance = math.sqrt(math.pow(location[0]-center[0], 2) + math.pow(location[1]-center[1], 2)
|
||||
+ math.pow(location[2]-center[2], 2))
|
||||
if distance < radius:
|
||||
selected_region_city.add_city_object(city_object)
|
||||
return selected_region_city
|
||||
|
||||
@property
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
|
|||
import pandas as pd
|
||||
from city_model_structure.attributes.occupants import Occupants
|
||||
import calendar as cal
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class MonthlyToHourlyDemand:
|
||||
|
|
@ -25,17 +26,17 @@ class MonthlyToHourlyDemand:
|
|||
:return: [hourly_heating]
|
||||
"""
|
||||
# todo: this method and the insel model have to be reviewed for more than one thermal zone
|
||||
external_temp = self._building.external_temperature['hour']
|
||||
|
||||
external_temp = self._building.external_temperature[cte.HOUR]
|
||||
# todo: review index depending on how the schedules are defined, either 8760 or 24 hours
|
||||
for usage_zone in self._building.usage_zones:
|
||||
temp_set = float(usage_zone.heating_setpoint)
|
||||
temp_back = float(usage_zone.heating_setback)
|
||||
temp_set = float(usage_zone.heating_setpoint)-3
|
||||
temp_back = float(usage_zone.heating_setback)-3
|
||||
occupancy = Occupants().get_complete_year_schedule(usage_zone.schedules['Occupancy'])
|
||||
heating_schedule = self._conditioning_seasons['heating']
|
||||
|
||||
hourly_heating = []
|
||||
i = 0
|
||||
j = 0
|
||||
temp_grad_day = []
|
||||
for month in range(1, 13):
|
||||
temp_grad_month = 0
|
||||
|
|
@ -47,9 +48,15 @@ class MonthlyToHourlyDemand:
|
|||
for hour in range(0, 24):
|
||||
if external_temp_med < temp_set and heating_schedule[month-1] == 1:
|
||||
if occupancy[hour] > 0:
|
||||
temp_grad_day.append(temp_set - external_temp[key][i])
|
||||
hdd = temp_set - external_temp[key][i]
|
||||
if hdd < 0:
|
||||
hdd = 0
|
||||
temp_grad_day.append(hdd)
|
||||
else:
|
||||
temp_grad_day.append(temp_back - external_temp[key][i])
|
||||
hdd = temp_back - external_temp[key][i]
|
||||
if hdd < 0:
|
||||
hdd = 0
|
||||
temp_grad_day.append(hdd)
|
||||
else:
|
||||
temp_grad_day.append(0)
|
||||
|
||||
|
|
@ -58,14 +65,71 @@ class MonthlyToHourlyDemand:
|
|||
|
||||
for day in range(1, month_range[1] + 1):
|
||||
for hour in range(0, 24):
|
||||
j = (day - 1) * 24 + hour
|
||||
monthly_demand = self._building.heating['month']['INSEL'][month-1]
|
||||
hourly_demand = float(monthly_demand)*float(temp_grad_day[j])/float(temp_grad_month)
|
||||
# monthly_demand = self._building.heating[cte.MONTH]['INSEL'][month-1]
|
||||
monthly_demand = self._building.heating[cte.MONTH][month-1]
|
||||
if monthly_demand == 'NaN':
|
||||
monthly_demand = 0
|
||||
if temp_grad_month == 0:
|
||||
hourly_demand = 0
|
||||
else:
|
||||
hourly_demand = float(monthly_demand)*float(temp_grad_day[j])/float(temp_grad_month)
|
||||
hourly_heating.append(hourly_demand)
|
||||
|
||||
j += 1
|
||||
self._hourly_heating = pd.DataFrame(data=hourly_heating, columns=['monthly to hourly'])
|
||||
return self._hourly_heating
|
||||
|
||||
@property
|
||||
def hourly_cooling(self) -> NotImplementedError:
|
||||
raise NotImplementedError
|
||||
def hourly_cooling(self, key):
|
||||
"""
|
||||
hourly distribution of the monthly cooling of a building
|
||||
:param key: string
|
||||
:return: [hourly_cooling]
|
||||
"""
|
||||
# todo: this method and the insel model have to be reviewed for more than one thermal zone
|
||||
external_temp = self._building.external_temperature[cte.HOUR]
|
||||
# todo: review index depending on how the schedules are defined, either 8760 or 24 hours
|
||||
for usage_zone in self._building.usage_zones:
|
||||
temp_set = float(usage_zone.cooling_setpoint)
|
||||
temp_back = 100
|
||||
occupancy = Occupants().get_complete_year_schedule(usage_zone.schedules['Occupancy'])
|
||||
cooling_schedule = self._conditioning_seasons['cooling']
|
||||
|
||||
hourly_cooling = []
|
||||
i = 0
|
||||
j = 0
|
||||
temp_grad_day = []
|
||||
for month in range(1, 13):
|
||||
temp_grad_month = 0
|
||||
month_range = cal.monthrange(2015, month)
|
||||
for day in range(1, month_range[1] + 1):
|
||||
for hour in range(0, 24):
|
||||
if external_temp[key][i] > temp_set and cooling_schedule[month - 1] == 1:
|
||||
if occupancy[hour] > 0:
|
||||
cdd = external_temp[key][i] - temp_set
|
||||
if cdd < 0:
|
||||
cdd = 0
|
||||
temp_grad_day.append(cdd)
|
||||
else:
|
||||
cdd = external_temp[key][i] - temp_back
|
||||
if cdd < 0:
|
||||
cdd = 0
|
||||
temp_grad_day.append(cdd)
|
||||
else:
|
||||
temp_grad_day.append(0)
|
||||
|
||||
temp_grad_month += temp_grad_day[i]
|
||||
i += 1
|
||||
|
||||
for day in range(1, month_range[1] + 1):
|
||||
for hour in range(0, 24):
|
||||
# monthly_demand = self._building.heating[cte.MONTH]['INSEL'][month-1]
|
||||
monthly_demand = self._building.cooling[cte.MONTH][month - 1]
|
||||
if monthly_demand == 'NaN':
|
||||
monthly_demand = 0
|
||||
if temp_grad_month == 0:
|
||||
hourly_demand = 0
|
||||
else:
|
||||
hourly_demand = float(monthly_demand) * float(temp_grad_day[j]) / float(temp_grad_month)
|
||||
hourly_cooling.append(hourly_demand)
|
||||
j += 1
|
||||
self._hourly_cooling = pd.DataFrame(data=hourly_cooling, columns=['monthly to hourly'])
|
||||
return self._hourly_cooling
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<constructions>
|
||||
<construction id="1" type="roof"/>
|
||||
<construction id="9" type="wall">
|
||||
<window_ratio units="-">0.13</window_ratio>
|
||||
<window_ratio units="-">0.2</window_ratio>
|
||||
<window>33</window>
|
||||
</construction>
|
||||
<construction id="17" type="basement_wall"/>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<constructions>
|
||||
<construction id="2" type="roof"/>
|
||||
<construction id="10" type="wall">
|
||||
<window_ratio units="-">0.13</window_ratio>
|
||||
<window_ratio units="-">0.2</window_ratio>
|
||||
<window>34</window>
|
||||
</construction>
|
||||
<construction id="18" type="basement_wall"/>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<constructions>
|
||||
<construction id="3" type="roof"/>
|
||||
<construction id="11" type="wall">
|
||||
<window_ratio units="-">0.13</window_ratio>
|
||||
<window_ratio units="-">0.2</window_ratio>
|
||||
<window>34</window>
|
||||
</construction>
|
||||
<construction id="19" type="basement_wall"/>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<constructions>
|
||||
<construction id="4" type="roof"/>
|
||||
<construction id="12" type="wall">
|
||||
<window_ratio units="-">0.13</window_ratio>
|
||||
<window_ratio units="-">0.2</window_ratio>
|
||||
<window>34</window>
|
||||
</construction>
|
||||
<construction id="20" type="basement_wall"/>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<thermal_capacity units="kJ/K m2">90</thermal_capacity>
|
||||
<extra_loses_due_to_thermal_bridges units="W/K m2">0.1</extra_loses_due_to_thermal_bridges>
|
||||
<indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
|
||||
<infiltration_rate_for_ventilation_system_off units="ACH">0.4</infiltration_rate_for_ventilation_system_off>
|
||||
<infiltration_rate_for_ventilation_system_off units="ACH">0.3</infiltration_rate_for_ventilation_system_off>
|
||||
<infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
|
||||
</archetype>
|
||||
<archetype id="6" function="residential" periodOfConstruction="1961-1977">
|
||||
|
|
|
|||
|
|
@ -13,25 +13,31 @@
|
|||
<frame_ratio units="-">0.3</frame_ratio>
|
||||
<overall_u_value units="W/m2 K">2.7</overall_u_value>
|
||||
</window>
|
||||
<window type="window" id="35" name="global">
|
||||
<shgc>0.52</shgc>
|
||||
<g_value>0.52</g_value>
|
||||
<frame_ratio units="-">0.3</frame_ratio>
|
||||
<overall_u_value units="W/m2 K">0.8</overall_u_value>
|
||||
</window>
|
||||
</windows>
|
||||
<constructions>
|
||||
<construction type="roof" id="1" name="ceiling under attic_post 2010">
|
||||
<overall_u_value units="W/m2 K">0.202</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.18</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="roof" id="2" name="ceiling under attic_2001-2010">
|
||||
<overall_u_value units="W/m2 K">0.187</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.17</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="roof" id="3" name="ceiling under attic_1996-2000">
|
||||
<overall_u_value units="W/m2 K">0.217</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.17</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="roof" id="4" name="ceiling under attic_1984-1995">
|
||||
<overall_u_value units="W/m2 K">0.236</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.253</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
|
|
@ -46,12 +52,12 @@
|
|||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="roof" id="7" name="ceiling under attic_1946-1960">
|
||||
<overall_u_value units="W/m2 K">0.26</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.253</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="roof" id="8" name="ceiling under attic_before 1946">
|
||||
<overall_u_value units="W/m2 K">0.282</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.26</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0.2</shortwave_reflectance>
|
||||
</construction>
|
||||
|
|
@ -144,7 +150,7 @@
|
|||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="floor" id="26" name="slab on grade_2001-2010">
|
||||
<overall_u_value units="W/m2 K">0.512</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.67</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
|
|
@ -159,22 +165,22 @@
|
|||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="floor" id="29" name="slab on grade_1978-1983">
|
||||
<overall_u_value units="W/m2 K">1.048</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">0.848</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="floor" id="30" name="slab on grade_1961-1977">
|
||||
<overall_u_value units="W/m2 K">1.154</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">1.05</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="floor" id="31" name="slab on grade_1946-1960">
|
||||
<overall_u_value units="W/m2 K">1.243</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">1.154</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
<construction type="floor" id="32" name="slab on grade_before 1946">
|
||||
<overall_u_value units="W/m2 K">1.425</overall_u_value>
|
||||
<overall_u_value units="W/m2 K">1.154</overall_u_value>
|
||||
<outside_solar_absorptance units="-">0</outside_solar_absorptance>
|
||||
<shortwave_reflectance units="-">0</shortwave_reflectance>
|
||||
</construction>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import xmltodict
|
|||
import uuid
|
||||
import datetime
|
||||
from pathlib import Path
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class EnergyAde:
|
||||
|
|
@ -95,10 +96,10 @@ class EnergyAde:
|
|||
def _measures(building, building_dic):
|
||||
#todo: this method is only for year and insel need to be generalized
|
||||
measures = []
|
||||
measure = EnergyAde._measure(building.heating, 'year', 'Energy demand heating', 'INSEL')
|
||||
measure = EnergyAde._measure(building.heating, cte.YEAR, 'Energy demand heating', 'INSEL')
|
||||
if measure is not None:
|
||||
measures.append(measure)
|
||||
measure = EnergyAde._measure(building.cooling, 'year', 'Energy demand cooling', 'INSEL')
|
||||
measure = EnergyAde._measure(building.cooling, cte.YEAR, 'Energy demand cooling', 'INSEL')
|
||||
if measure is not None:
|
||||
measures.append(measure)
|
||||
if len(measures) != 0:
|
||||
|
|
@ -106,12 +107,12 @@ class EnergyAde:
|
|||
|
||||
demands = []
|
||||
for key in building.heating:
|
||||
if key != 'year':
|
||||
if key != cte.YEAR:
|
||||
demand = EnergyAde._demand(building.heating, key, 'Heating energy', 'INSEL')
|
||||
demands.append(demand)
|
||||
|
||||
for key in building.cooling:
|
||||
if key != 'year':
|
||||
if key != cte.YEAR:
|
||||
demand = EnergyAde._demand(building.cooling, key, 'Cooling energy', 'INSEL')
|
||||
demands.append(demand)
|
||||
if len(demands) != 0:
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class Idf:
|
|||
if layer.material.no_mass:
|
||||
self._idf.newidfobject(self._MATERIAL_NOMASS,
|
||||
Name=layer.material.name,
|
||||
Roughness=cte.roughness,
|
||||
Roughness=cte.ROUGHNESS,
|
||||
Thermal_Resistance=layer.material.thermal_resistance,
|
||||
Thermal_Absorptance=layer.material.thermal_absorptance,
|
||||
Solar_Absorptance=layer.material.solar_absorptance,
|
||||
|
|
@ -54,7 +54,7 @@ class Idf:
|
|||
else:
|
||||
self._idf.newidfobject(self._MATERIAL,
|
||||
Name=layer.material.name,
|
||||
Roughness=cte.roughness,
|
||||
Roughness=cte.ROUGHNESS,
|
||||
Thickness=layer.thickness,
|
||||
Conductivity=layer.material.conductivity,
|
||||
Density=layer.material.density,
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
celsius_to_kelvin = 273.15
|
||||
days_of_month = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
||||
# This dictionary is meant to force the way these variables are written
|
||||
time_scale = {
|
||||
'minute': 'minute',
|
||||
'hour': 'hour',
|
||||
'day': 'day',
|
||||
'week': 'week',
|
||||
'month': 'month',
|
||||
'year': 'year'
|
||||
}
|
||||
roughness = "MediumRough"
|
||||
KELVIN = 273.15
|
||||
MINUTE = 'minute'
|
||||
HOUR = 'hour'
|
||||
DAY = 'day'
|
||||
WEEK = 'week'
|
||||
MONTH = 'month'
|
||||
YEAR = 'year'
|
||||
ROUGHNESS = "MediumRough"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
|
|||
import pandas as pd
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class DatWeatherParameters:
|
||||
|
|
@ -30,25 +31,25 @@ class DatWeatherParameters:
|
|||
|
||||
for building in self._city.buildings:
|
||||
new_value = pd.DataFrame(self._weather_values[['temperature']].to_numpy(), columns=['inseldb'])
|
||||
if 'hour' not in building.external_temperature:
|
||||
building.external_temperature['hour'] = new_value
|
||||
if cte.HOUR not in building.external_temperature:
|
||||
building.external_temperature[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.external_temperature['hour'], new_value], axis=1)
|
||||
pd.concat([building.external_temperature[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['global_horiz']].to_numpy(), columns=['inseldb'])
|
||||
if 'hour' not in building.global_horizontal:
|
||||
building.global_horizontal['hour'] = new_value
|
||||
if cte.HOUR not in building.global_horizontal:
|
||||
building.global_horizontal[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.global_horizontal['hour'], new_value], axis=1)
|
||||
pd.concat([building.global_horizontal[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['diffuse']].to_numpy(), columns=['inseldb'])
|
||||
if 'hour' not in building.diffuse:
|
||||
building.diffuse['hour'] = new_value
|
||||
if cte.HOUR not in building.diffuse:
|
||||
building.diffuse[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.diffuse['hour'], new_value], axis=1)
|
||||
pd.concat([building.diffuse[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['beam']].to_numpy(), columns=['inseldb'])
|
||||
if 'hour' not in building.beam:
|
||||
building.beam['hour'] = new_value
|
||||
if cte.HOUR not in building.beam:
|
||||
building.beam[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.beam['hour'], new_value], axis=1)
|
||||
pd.concat([building.beam[cte.HOUR], new_value], axis=1)
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.mons
|
|||
import pandas as pd
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class EpwWeatherParameters:
|
||||
|
|
@ -43,67 +44,68 @@ class EpwWeatherParameters:
|
|||
f'https://energyplus.net/weather and place it in folder data\weather\epw\n')
|
||||
sys.exit()
|
||||
|
||||
if self._weather_values is None:
|
||||
try:
|
||||
self._weather_values = pd.read_csv(self._path, header=0, skiprows=7,
|
||||
names=['year', 'month', 'day', 'hour', 'minute',
|
||||
'data_source_and_uncertainty_flags',
|
||||
'dry_bulb_temperature_c', 'dew_point_temperature_c',
|
||||
'relative_humidity_perc',
|
||||
'atmospheric_station_pressure_pa',
|
||||
'extraterrestrial_horizontal_radiation_wh_m2',
|
||||
'extraterrestrial_direct_normal_radiation_wh_m2',
|
||||
'horizontal_infrared_radiation_intensity_wh_m2',
|
||||
'global_horizontal_radiation_wh_m2', 'direct_normal_radiation_wh_m2',
|
||||
'diffuse_horizontal_radiation_wh_m2',
|
||||
'global_horizontal_illuminance_lux',
|
||||
'direct_normal_illuminance_lux', 'diffuse_horizontal_illuminance_lux',
|
||||
'zenith_luminance_cd_m2',
|
||||
'wind_direction_deg', 'wind_speed_m_s', 'total_sky_cover',
|
||||
'opaque_sky_cover', 'visibility_km',
|
||||
'ceiling_heigh_m_s', 'present_weather_observation',
|
||||
'present_weather_codes',
|
||||
'precipitable_water_mm', 'aerosol_optical_depth_10_3_ths',
|
||||
'snow_depth_cm',
|
||||
'days_since_last_snowfall', 'albedo', 'liquid_precipitation_depth_mm',
|
||||
'liquid_precipitation_quality_hr'])
|
||||
except SystemExit:
|
||||
sys.stderr.write(f'Error: wrong formatting of weather file {self._path}\n')
|
||||
sys.exit()
|
||||
try:
|
||||
self._weather_values = pd.read_csv(self._path, header=0, skiprows=7,
|
||||
names=['year', 'month', 'day', 'hour', 'minute',
|
||||
'data_source_and_uncertainty_flags',
|
||||
'dry_bulb_temperature_c', 'dew_point_temperature_c',
|
||||
'relative_humidity_perc',
|
||||
'atmospheric_station_pressure_pa',
|
||||
'extraterrestrial_horizontal_radiation_wh_m2',
|
||||
'extraterrestrial_direct_normal_radiation_wh_m2',
|
||||
'horizontal_infrared_radiation_intensity_wh_m2',
|
||||
'global_horizontal_radiation_wh_m2', 'direct_normal_radiation_wh_m2',
|
||||
'diffuse_horizontal_radiation_wh_m2',
|
||||
'global_horizontal_illuminance_lux',
|
||||
'direct_normal_illuminance_lux', 'diffuse_horizontal_illuminance_lux',
|
||||
'zenith_luminance_cd_m2',
|
||||
'wind_direction_deg', 'wind_speed_m_s', 'total_sky_cover',
|
||||
'opaque_sky_cover', 'visibility_km',
|
||||
'ceiling_heigh_m_s', 'present_weather_observation',
|
||||
'present_weather_codes',
|
||||
'precipitable_water_mm', 'aerosol_optical_depth_10_3_ths',
|
||||
'snow_depth_cm',
|
||||
'days_since_last_snowfall', 'albedo', 'liquid_precipitation_depth_mm',
|
||||
'liquid_precipitation_quality_hr'])
|
||||
except SystemExit:
|
||||
sys.stderr.write(f'Error: wrong formatting of weather file {self._path}\n')
|
||||
sys.exit()
|
||||
|
||||
for building in self._city.buildings:
|
||||
if cte.HOUR in building.external_temperature:
|
||||
del building.external_temperature[cte.HOUR]
|
||||
new_value = pd.DataFrame(self._weather_values[['dry_bulb_temperature_c']].to_numpy(), columns=['epw'])
|
||||
number_invalid_records = new_value[new_value.epw == 99.9].count().epw
|
||||
if number_invalid_records > 0:
|
||||
sys.stderr.write(f'Warning: {self._path} invalid records (value of 99.9) in dry bulb temperature\n')
|
||||
if 'hour' not in building.external_temperature:
|
||||
building.external_temperature['hour'] = new_value
|
||||
if cte.HOUR not in building.external_temperature:
|
||||
building.external_temperature[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.external_temperature['hour'], new_value], axis=1)
|
||||
pd.concat([building.external_temperature[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['global_horizontal_radiation_wh_m2']].to_numpy(), columns=['epw'])
|
||||
number_invalid_records = new_value[new_value.epw == 9999].count().epw
|
||||
if number_invalid_records > 0:
|
||||
sys.stderr.write(f'Warning: {self._path} invalid records (value of 9999) in global horizontal radiation\n')
|
||||
if 'hour' not in building.global_horizontal:
|
||||
building.global_horizontal['hour'] = new_value
|
||||
if cte.HOUR not in building.global_horizontal:
|
||||
building.global_horizontal[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.global_horizontal['hour'], new_value], axis=1)
|
||||
pd.concat([building.global_horizontal[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['diffuse_horizontal_radiation_wh_m2']].to_numpy(), columns=['epw'])
|
||||
number_invalid_records = new_value[new_value.epw == 9999].count().epw
|
||||
if number_invalid_records > 0:
|
||||
sys.stderr.write(f'Warning: {self._path} invalid records (value of 9999) in diffuse horizontal radiation\n')
|
||||
if 'hour' not in building.diffuse:
|
||||
building.diffuse['hour'] = new_value
|
||||
if cte.HOUR not in building.diffuse:
|
||||
building.diffuse[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.diffuse['hour'], new_value], axis=1)
|
||||
pd.concat([building.diffuse[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['direct_normal_radiation_wh_m2']].to_numpy(), columns=['epw'])
|
||||
number_invalid_records = new_value[new_value.epw == 9999].count().epw
|
||||
if number_invalid_records > 0:
|
||||
sys.stderr.write(f'Warning: {self._path} invalid records (value of 9999) in direct horizontal radiation\n')
|
||||
if 'hour' not in building.beam:
|
||||
building.beam['hour'] = new_value
|
||||
if cte.HOUR not in building.beam:
|
||||
building.beam[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.beam['hour'], new_value], axis=1)
|
||||
pd.concat([building.beam[cte.HOUR], new_value], axis=1)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class Weather(object):
|
|||
# sky temperatures( in °C)
|
||||
values = []
|
||||
for temperature in ambient_temperature:
|
||||
value = 0.037536 * math.pow((temperature + cte.celsius_to_kelvin), 1.5) \
|
||||
+ 0.32 * (temperature + cte.celsius_to_kelvin) - cte.celsius_to_kelvin
|
||||
value = 0.037536 * math.pow((temperature + cte.KELVIN), 1.5) \
|
||||
+ 0.32 * (temperature + cte.KELVIN) - cte.KELVIN
|
||||
values.append(value)
|
||||
return values
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
|
|||
import pandas as pd
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class XlsWeatherParameters:
|
||||
|
|
@ -34,13 +35,13 @@ class XlsWeatherParameters:
|
|||
|
||||
for building in self._city.buildings:
|
||||
new_value = pd.DataFrame(self._weather_values[['temperature']].to_numpy(), columns=['iso52016'])
|
||||
if 'hour' not in building.external_temperature:
|
||||
building.external_temperature['hour'] = new_value
|
||||
if cte.HOUR not in building.external_temperature:
|
||||
building.external_temperature[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.external_temperature['hour'], new_value], axis=1)
|
||||
pd.concat([building.external_temperature[cte.HOUR], new_value], axis=1)
|
||||
|
||||
new_value = pd.DataFrame(self._weather_values[['global_horiz']].to_numpy(), columns=['iso52016'])
|
||||
if 'hour' not in building.global_horizontal:
|
||||
building.global_horizontal['hour'] = new_value
|
||||
if cte.HOUR not in building.global_horizontal:
|
||||
building.global_horizontal[cte.HOUR] = new_value
|
||||
else:
|
||||
pd.concat([building.global_horizontal['hour'], new_value], axis=1)
|
||||
pd.concat([building.global_horizontal[cte.HOUR], new_value], axis=1)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ from imports.physics_factory import PhysicsFactory
|
|||
from imports.schedules_factory import SchedulesFactory
|
||||
from imports.usage_factory import UsageFactory
|
||||
from exports.exports_factory import ExportsFactory
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class TestExports(TestCase):
|
||||
|
|
@ -40,10 +41,10 @@ class TestExports(TestCase):
|
|||
self._city_gml.climate_reference_city = 'Summerland'
|
||||
dummy_measures = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
|
||||
for building in self._city_gml.buildings:
|
||||
building.heating['month'] = pd.DataFrame({'INSEL': dummy_measures})
|
||||
building.cooling['month'] = pd.DataFrame({'INSEL': dummy_measures})
|
||||
building.heating['year'] = pd.DataFrame({'INSEL': [0.0]})
|
||||
building.cooling['year'] = pd.DataFrame({'INSEL': [0.0]})
|
||||
building.heating[cte.MONTH] = pd.DataFrame({'INSEL': dummy_measures})
|
||||
building.cooling[cte.MONTH] = pd.DataFrame({'INSEL': dummy_measures})
|
||||
building.heating[cte.YEAR] = pd.DataFrame({'INSEL': [0.0]})
|
||||
building.cooling[cte.YEAR] = pd.DataFrame({'INSEL': [0.0]})
|
||||
return self._city_gml
|
||||
|
||||
def _export(self, export_type):
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class MyTestCase(TestCase):
|
|||
def _get_city(self):
|
||||
if self._city_obj is None:
|
||||
file_path = (self._example_path / 'kelowna.obj').resolve()
|
||||
self._city_obj = GeometryFactory('obj', file_path).city
|
||||
self._city_obj = GeometryFactory('obj', file_path)._city_debug
|
||||
return self._city_obj
|
||||
|
||||
def test_import_obj(self):
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from unittest import TestCase
|
|||
|
||||
from imports.geometry_factory import GeometryFactory
|
||||
from imports.weather_factory import WeatherFactory
|
||||
import helpers.constants as cte
|
||||
|
||||
|
||||
class TestWeatherFactory(TestCase):
|
||||
|
|
@ -29,40 +30,25 @@ class TestWeatherFactory(TestCase):
|
|||
self.assertIsNotNone(self._city_gml, 'city is none')
|
||||
return self._city_gml
|
||||
|
||||
def test_city_with_weather(self):
|
||||
"""
|
||||
Enrich the city with the weather information and verify it
|
||||
:return: None
|
||||
"""
|
||||
file_path = (Path(__file__).parent / 'tests_data' / '20buildings.gml').resolve()
|
||||
city = self._get_citygml(file_path)
|
||||
for building in city.buildings:
|
||||
values = building.external_temperature['hour'][['inseldb']]
|
||||
self.assertFalse(values.empty, 'wrong value external_temperature')
|
||||
values = building.global_horizontal['hour'][['inseldb']]
|
||||
self.assertFalse(values.empty, 'wrong value global horizontal')
|
||||
values = building.diffuse['hour'][['inseldb']]
|
||||
self.assertFalse(values.empty, 'wrong value diffuse')
|
||||
values = building.beam['hour'][['inseldb']]
|
||||
self.assertFalse(values.empty, 'wrong value beam')
|
||||
|
||||
def test_weather_xls(self):
|
||||
file_path = (Path(__file__).parent / 'tests_data' / 'iso_52016_1_2017_lod2.gml').resolve()
|
||||
city_with_weather = self._get_citygml(file_path)
|
||||
WeatherFactory('xls', city_with_weather, base_path=self._example_path).enrich()
|
||||
for building in city_with_weather.buildings:
|
||||
values = building.external_temperature['hour'][['iso52016']]
|
||||
values = building.external_temperature[cte.HOUR][['iso52016']]
|
||||
self.assertFalse(values.empty, 'wrong value external_temperature')
|
||||
values = building.global_horizontal['hour'][['iso52016']]
|
||||
values = building.global_horizontal[cte.HOUR][['iso52016']]
|
||||
self.assertFalse(values.empty, 'wrong value global horizontal')
|
||||
|
||||
def test_weather_epw(self):
|
||||
file_path = (Path(__file__).parent / 'tests_data' / 'one_building_in_kelowna.gml').resolve()
|
||||
city_with_weather = self._get_citygml(file_path)
|
||||
_file_name = 'CAN_BC_Summerland.717680_CWEC.epw'
|
||||
print(len(city_with_weather.buildings))
|
||||
WeatherFactory('epw', city_with_weather, base_path=self._example_path, file_name=_file_name).enrich()
|
||||
print(len(city_with_weather.buildings))
|
||||
for building in city_with_weather.buildings:
|
||||
values = building.external_temperature['hour'][['epw']]
|
||||
values = building.external_temperature[cte.HOUR][['epw']]
|
||||
self.assertFalse(values.empty, 'wrong value external_temperature')
|
||||
values = building.global_horizontal['hour'][['epw']]
|
||||
values = building.global_horizontal[cte.HOUR][['epw']]
|
||||
self.assertFalse(values.empty, 'wrong value global horizontal')
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user