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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Guille Gutierrez 2024-09-23 18:26:33 +02:00
commit e220bf2c0d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hub/city_model_structure/building_demand/surface.py
View File

@ -180,7 +180,7 @@ class Surface:
@property @property
def global_irradiance(self) -> dict: def global_irradiance(self) -> dict:
""" """
Get global irradiance on surface in J/m2 Get global irradiance on surface in W/m2
:return: dict :return: dict
""" """
return self._global_irradiance return self._global_irradiance
@ -188,7 +188,7 @@ class Surface:
@global_irradiance.setter @global_irradiance.setter
def global_irradiance(self, value): def global_irradiance(self, value):
""" """
Set global irradiance on surface in J/m2 Set global irradiance on surface in W/m2
:param value: dict :param value: dict
""" """
self._global_irradiance = value self._global_irradiance = value
@ -390,7 +390,7 @@ class Surface:
@property @property
def global_irradiance_tilted(self) -> dict: def global_irradiance_tilted(self) -> dict:
""" """
Get global irradiance on a tilted surface in J/m2 Get global irradiance on a tilted surface in W/m2
:return: dict :return: dict
""" """
return self._global_irradiance_tilted return self._global_irradiance_tilted
@ -398,7 +398,7 @@ class Surface:
@global_irradiance_tilted.setter @global_irradiance_tilted.setter
def global_irradiance_tilted(self, value): def global_irradiance_tilted(self, value):
""" """
Set global irradiance on a tilted surface in J/m2 Set global irradiance on a tilted surface in W/m2
:param value: dict :param value: dict
""" """
self._global_irradiance_tilted = value self._global_irradiance_tilted = value

2
hub/imports/results/simplified_radiosity_algorithm.py
View File

@ -34,7 +34,7 @@ class SimplifiedRadiosityAlgorithm:
for key in self._results: for key in self._results:
_irradiance = {} _irradiance = {}
header_name = key.split(':') header_name = key.split(':')
result = [x * cte.WATTS_HOUR_TO_JULES for x in self._results[key]] result = [x for x in self._results[key]]
city_object_name = header_name[1] city_object_name = header_name[1]
building = self._city.city_object(city_object_name) building = self._city.city_object(city_object_name)
surface_id = header_name[2] surface_id = header_name[2]

2
hub/version.py
View File

@ -1,4 +1,4 @@
""" """
Hub version number Hub version number
""" """
__version__ = '0.2.0.8' __version__ = '0.2.0.9'

2
requirements.txt
View File

@ -1,5 +1,5 @@
xmltodict xmltodict
numpy numpy==1.26.4
trimesh[all] trimesh[all]
pyproj pyproj
pandas pandas