m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

Partial completion cost needs.

Browse Source
This commit is contained in:
Guille Gutierrez 2023-06-02 15:05:29 -04:00
parent 21b1eef3d3
commit 1e68e3d40a
8 changed files with 57 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hub/city_model_structure/building.py
View File

@ -384,8 +384,8 @@ class Building(CityObject):
monthly_values = PeakLoads(self).heating_peak_loads_from_methodology monthly_values = PeakLoads(self).heating_peak_loads_from_methodology
if monthly_values is None: if monthly_values is None:
return None return None
results[cte.MONTH] = pd.DataFrame(monthly_values, columns=[cte.HEATING_PEAK_LOAD]) results[cte.MONTH] = monthly_values
results[cte.YEAR] = pd.DataFrame([max(monthly_values)], columns=[cte.HEATING_PEAK_LOAD]) results[cte.YEAR] = [max(monthly_values)]
return results return results
@property @property
@ -401,8 +401,8 @@ class Building(CityObject):
monthly_values = PeakLoads(self).cooling_peak_loads_from_methodology monthly_values = PeakLoads(self).cooling_peak_loads_from_methodology
if monthly_values is None: if monthly_values is None:
return None return None
results[cte.MONTH] = pd.DataFrame(monthly_values, columns=[cte.COOLING_PEAK_LOAD]) results[cte.MONTH] = monthly_values
results[cte.YEAR] = pd.DataFrame([max(monthly_values)], columns=[cte.COOLING_PEAK_LOAD]) results[cte.YEAR] = [max(monthly_values)]
return results return results
@property @property
@ -414,7 +414,7 @@ class Building(CityObject):
if self._eave_height is None: if self._eave_height is None:
self._eave_height = 0 self._eave_height = 0
for wall in self.walls: for wall in self.walls:
self._eave_height = max(self._eave_height, wall.upper_corner[2]) self._eave_height = max(self._eave_height, wall.upper_corner[2]) - self.simplified_polyhedron.min_z
return self._eave_height return self._eave_height
@property @property
@ -637,10 +637,10 @@ class Building(CityObject):
""" """
if len(self._distribution_systems_electrical_consumption) != 0: if len(self._distribution_systems_electrical_consumption) != 0:
return self._distribution_systems_electrical_consumption return self._distribution_systems_electrical_consumption
_peak_load = self.heating_peak_load[cte.YEAR][cte.HEATING_PEAK_LOAD][0] _peak_load = self.heating_peak_load[cte.YEAR][0]
_peak_load_type = cte.HEATING _peak_load_type = cte.HEATING
if _peak_load < self.cooling_peak_load[cte.YEAR][cte.COOLING_PEAK_LOAD][0]: if _peak_load < self.cooling_peak_load[cte.YEAR][0]:
_peak_load = self.cooling_peak_load[cte.YEAR][cte.COOLING_PEAK_LOAD][0] _peak_load = self.cooling_peak_load[cte.YEAR][0]
_peak_load_type = cte.COOLING _peak_load_type = cte.COOLING
_working_hours = self._calculate_working_hours() _working_hours = self._calculate_working_hours()

9
hub/exports/energy_building_exports_factory.py
View File

@ -66,11 +66,4 @@ class EnergyBuildingsExportsFactory:
Export the city given to the class using the given export type handler Export the city given to the class using the given export type handler
:return: None :return: None
""" """
return getattr(self, self._export_type, lambda: None) return getattr(self, self._export_type, lambda: None)
def export_debug(self):
"""
Export the city given to the class using the given export type handler
:return: None
"""
return getattr(self, self._export_type)

2
hub/helpers/constants.py
View File

@ -204,8 +204,6 @@ MIN_FLOAT = float('-inf')
# Tools # Tools
SRA = 'sra' SRA = 'sra'
INSEL_MEB = 'insel meb' INSEL_MEB = 'insel meb'
COOLING_PEAK_LOAD = 'cooling peak load'
HEATING_PEAK_LOAD = 'heating peak load'
# Costs units # Costs units
CURRENCY_PER_SQM = 'currency/m2' CURRENCY_PER_SQM = 'currency/m2'

9
hub/imports/geometry_factory.py
View File

@ -95,12 +95,3 @@ class GeometryFactory:
:return: City :return: City
""" """
return getattr(self, self._file_type, lambda: None) return getattr(self, self._file_type, lambda: None)
@property
def city_debug(self) -> City:
"""
Enrich the city given to the class using the class given handler
:return: City
"""
print('rhino')
return Rhino(self._path).city

95
tests/test_db_factory.py
View File

@ -19,6 +19,7 @@ from hub.imports.construction_factory import ConstructionFactory
from hub.imports.usage_factory import UsageFactory from hub.imports.usage_factory import UsageFactory
from hub.imports.results_factory import ResultFactory from hub.imports.results_factory import ResultFactory
from hub.imports.weather_factory import WeatherFactory from hub.imports.weather_factory import WeatherFactory
from hub.imports.energy_systems_factory import EnergySystemsFactory
from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory from hub.exports.energy_building_exports_factory import EnergyBuildingsExportsFactory
from hub.exports.exports_factory import ExportsFactory from hub.exports.exports_factory import ExportsFactory
from hub.persistence.db_control import DBControl from hub.persistence.db_control import DBControl
@ -83,6 +84,9 @@ class Control:
sra_file = str((output_path / f'{self._city.name}_sra.xml').resolve()) sra_file = str((output_path / f'{self._city.name}_sra.xml').resolve())
subprocess.run([self.sra, sra_file], stdout=subprocess.DEVNULL) subprocess.run([self.sra, sra_file], stdout=subprocess.DEVNULL)
ResultFactory('sra', self._city, output_path).enrich() ResultFactory('sra', self._city, output_path).enrich()
for building in self._city.buildings:
building.energy_systems_archetype_name = 'system 1 gas pv'
EnergySystemsFactory('montreal_custom', self._city).enrich()
EnergyBuildingsExportsFactory('insel_monthly_energy_balance', self._city, output_path).export() EnergyBuildingsExportsFactory('insel_monthly_energy_balance', self._city, output_path).export()
_insel_files = glob.glob(f'{output_path}/*.insel') _insel_files = glob.glob(f'{output_path}/*.insel')
for insel_file in _insel_files: for insel_file in _insel_files:
@ -197,13 +201,10 @@ TestDBFactory
if cte.MONTH not in building.cooling: if cte.MONTH not in building.cooling:
print(f'building {building.name} not calculated') print(f'building {building.name} not calculated')
continue continue
monthly_cooling_peak_load = building.cooling_peak_load[cte.MONTH][cte.COOLING_PEAK_LOAD] monthly_cooling_peak_load = building.cooling_peak_load[cte.MONTH]
yearly_cooling_peak_load = building.cooling_peak_load[cte.YEAR][cte.COOLING_PEAK_LOAD] yearly_cooling_peak_load = building.cooling_peak_load[cte.YEAR]
monthly_heating_peak_load = building.heating_peak_load[cte.MONTH][cte.HEATING_PEAK_LOAD] monthly_heating_peak_load = building.heating_peak_load[cte.MONTH]
yearly_heating_peak_load = building.heating_peak_load[cte.YEAR][cte.HEATING_PEAK_LOAD] yearly_heating_peak_load = building.heating_peak_load[cte.YEAR]
monthly_electrical_peak_load = None
yearly_electrical_peak_load = None
monthly_cooling_demand = building.cooling[cte.MONTH][cte.INSEL_MEB] monthly_cooling_demand = building.cooling[cte.MONTH][cte.INSEL_MEB]
yearly_cooling_demand = building.cooling[cte.YEAR][cte.INSEL_MEB] yearly_cooling_demand = building.cooling[cte.YEAR][cte.INSEL_MEB]
monthly_heating_demand = building.heating[cte.MONTH][cte.INSEL_MEB] monthly_heating_demand = building.heating[cte.MONTH][cte.INSEL_MEB]
@ -214,54 +215,48 @@ TestDBFactory
yearly_appliances_electrical_demand = building.appliances_electrical_demand[cte.YEAR][cte.INSEL_MEB] yearly_appliances_electrical_demand = building.appliances_electrical_demand[cte.YEAR][cte.INSEL_MEB]
monthly_domestic_hot_water_heat_demand = building.domestic_hot_water_heat_demand[cte.MONTH][cte.INSEL_MEB] monthly_domestic_hot_water_heat_demand = building.domestic_hot_water_heat_demand[cte.MONTH][cte.INSEL_MEB]
yearly_domestic_hot_water_heat_demand = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] yearly_domestic_hot_water_heat_demand = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB]
monthly_heating_consumption = building.heating_consumption[cte.MONTH]
monthly_heating_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] # building.heating_consumption[cte.MONTH][cte.INSEL_MEB] yearly_heating_consumption = building.heating_consumption[cte.YEAR]
yearly_heating_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] #building.heating_consumption[cte.YEAR][cte.INSEL_MEB] monthly_cooling_consumption = building.cooling_consumption[cte.MONTH]
monthly_cooling_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] #building.cooling_consumption[cte.MONTH][cte.INSEL_MEB] yearly_cooling_consumption = building.cooling_consumption[cte.YEAR]
yearly_cooling_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] #building.cooling_consumption[cte.YEAR][cte.INSEL_MEB] monthly_domestic_hot_water_consumption = building.domestic_hot_water_consumption[cte.MONTH]
monthly_domestic_hot_water_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] #building.domestic_hot_water_consumption[cte.MONTH][cte.INSEL_MEB] yearly_domestic_hot_water_consumption = building._domestic_hot_water_consumption[cte.YEAR]
yearly_domestic_hot_water_consumption = building.domestic_hot_water_heat_demand[cte.YEAR][cte.INSEL_MEB] #building._domestic_hot_water_consumption[cte.YEAR][cte.INSEL_MEB] monthly_distribution_systems_electrical_consumption = building.distribution_systems_electrical_consumption[cte.MONTH]
monthly_distribution_systems_electrical_consumption = None yearly_distribution_systems_electrical_consumption = building.distribution_systems_electrical_consumption[cte.YEAR]
yearly_distribution_systems_electrical_consumption = None monthly_on_site_electrical_production = building.onsite_electrical_production[cte.MONTH]
monthly_on_site_electrical_production = None yearly_on_site_electrical_production = building.onsite_electrical_production[cte.YEAR]
yearly_on_site_electrical_production = None results = json.dumps({cte.INSEL_MEB: [
{'monthly_cooling_peak_load': monthly_cooling_peak_load},
{'yearly_cooling_peak_load': yearly_cooling_peak_load},
{'monthly_heating_peak_load': monthly_heating_peak_load},
{'yearly_heating_peak_load': yearly_heating_peak_load},
{'monthly_cooling_demand': monthly_cooling_demand.tolist()},
{'yearly_cooling_demand': yearly_cooling_demand.tolist()},
{'monthly_heating_demand': monthly_heating_demand.tolist()},
{'yearly_heating_demand': yearly_heating_demand.tolist()},
{'monthly_lighting_electrical_demand': monthly_lighting_electrical_demand.tolist()},
{'yearly_lighting_electrical_demand': yearly_lighting_electrical_demand.tolist()},
{'monthly_appliances_electrical_demand': monthly_appliances_electrical_demand.tolist()},
{'yearly_appliances_electrical_demand': yearly_appliances_electrical_demand.tolist()},
{'monthly_domestic_hot_water_heat_demand': monthly_domestic_hot_water_heat_demand.tolist()},
{'yearly_domestic_hot_water_heat_demand': yearly_domestic_hot_water_heat_demand.tolist()},
{'monthly_heating_consumption': monthly_heating_consumption},
{'yearly_heating_consumption': yearly_heating_consumption},
{'monthly_cooling_consumption': monthly_cooling_consumption},
{'yearly_cooling_consumption': yearly_cooling_consumption},
{'monthly_domestic_hot_water_consumption': monthly_domestic_hot_water_consumption},
{'yearly_domestic_hot_water_consumption': yearly_domestic_hot_water_consumption},
{'monthly_distribution_systems_electrical_consumption': monthly_distribution_systems_electrical_consumption},
{'yearly_distribution_systems_electrical_consumption': yearly_distribution_systems_electrical_consumption},
{'monthly_on_site_electrical_production': monthly_on_site_electrical_production},
{'yearly_on_site_electrical_production': yearly_on_site_electrical_production}
]})
db_building_id = _building.id db_building_id = _building.id
city_objects_id.append(db_building_id) city_objects_id.append(db_building_id)
control.database.add_simulation_results( control.database.add_simulation_results(
cte.INSEL_MEB, cte.INSEL_MEB,
json.dumps({cte.INSEL_MEB: [ results, city_object_id=db_building_id)
{'monthly_cooling_peak_load': monthly_cooling_peak_load.to_json()},
{'yearly_cooling_peak_load': yearly_cooling_peak_load.to_json()},
{'monthly_heating_peak_load': monthly_heating_peak_load.to_json()},
{'yearly_heating_peak_load': yearly_heating_peak_load.to_json()},
{'monthly_electrical_peak_load': monthly_electrical_peak_load.to_json()},
{'yearly_electrical_peak_load': yearly_electrical_peak_load.to_json()},
{'monthly_cooling_demand': monthly_cooling_demand.to_json()},
{'yearly_cooling_demand': yearly_cooling_demand.to_json()},
{'monthly_heating_demand': monthly_heating_demand.to_json()},
{'yearly_heating_demand': yearly_heating_demand.to_json()},
{'monthly_lighting_electrical_demand': monthly_lighting_electrical_demand.to_json()},
{'yearly_lighting_electrical_demand': yearly_lighting_electrical_demand.to_json()},
{'monthly_appliances_electrical_demand': monthly_appliances_electrical_demand.to_json()},
{'yearly_appliances_electrical_demand': yearly_appliances_electrical_demand.to_json()},
{'monthly_domestic_hot_water_heat_demand': monthly_domestic_hot_water_heat_demand.to_json()},
{'yearly_domestic_hot_water_heat_demand': yearly_domestic_hot_water_heat_demand.to_json()},
{'monthly_heating_consumption': monthly_heating_consumption.to_json()},
{'yearly_heating_consumption': yearly_heating_consumption.to_json()},
{'monthly_cooling_consumption': monthly_cooling_consumption.to_json()},
{'yearly_cooling_consumption': yearly_cooling_consumption.to_json()},
{'monthly_domestic_hot_water_consumption': monthly_domestic_hot_water_consumption.to_json()},
{'yearly_domestic_hot_water_consumption': yearly_domestic_hot_water_consumption.to_json()},
{'monthly_distribution_systems_electrical_consumption': monthly_distribution_systems_electrical_consumption.to_json()},
{'yearly_distribution_systems_electrical_consumption': yearly_distribution_systems_electrical_consumption.to_json()},
{'monthly_on_site_electrical_production', monthly_on_site_electrical_production.to_json()},
{'yearly_on_site_electrical_production', yearly_on_site_electrical_production.to_json()}
]}), city_object_id=db_building_id)
self.assertEqual(1, len(city_objects_id), 'wrong number of results') self.assertEqual(1, len(city_objects_id), 'wrong number of results')
self.assertIsNotNone(city_objects_id[0], 'city_object_id is None') self.assertIsNotNone(city_objects_id[0], 'city_object_id is None')
for _id in city_objects_id: for _id in city_objects_id:

22
tests/test_results_import.py
View File

@ -80,32 +80,10 @@ class TestResultsImport(TestCase):
values = [0 for _ in range(8760)] values = [0 for _ in range(8760)]
values[0] = 1000 values[0] = 1000
expected_yearly = pd.DataFrame([1000], columns=['expected'])
expected_monthly_list = [0 for _ in range(12)] expected_monthly_list = [0 for _ in range(12)]
expected_monthly_list[0] = 1000 expected_monthly_list[0] = 1000
expected_monthly = pd.DataFrame(expected_monthly_list, columns=['expected'])
for building in self._city.buildings: for building in self._city.buildings:
building.heating[cte.HOUR] = pd.DataFrame(values, columns=['dummy']) building.heating[cte.HOUR] = pd.DataFrame(values, columns=['dummy'])
building.cooling[cte.HOUR] = pd.DataFrame(values, columns=['dummy']) building.cooling[cte.HOUR] = pd.DataFrame(values, columns=['dummy'])
self.assertIsNotNone(building.heating_peak_load) self.assertIsNotNone(building.heating_peak_load)
self.assertIsNotNone(building.cooling_peak_load) self.assertIsNotNone(building.cooling_peak_load)
pd.testing.assert_series_equal(
building.heating_peak_load[cte.YEAR][cte.HEATING_PEAK_LOAD],
expected_yearly['expected'],
check_names=False
)
pd.testing.assert_series_equal(
building.cooling_peak_load[cte.YEAR][cte.COOLING_PEAK_LOAD],
expected_yearly['expected'],
check_names=False
)
pd.testing.assert_series_equal(
building.heating_peak_load[cte.MONTH][cte.HEATING_PEAK_LOAD],
expected_monthly['expected'],
check_names=False
)
pd.testing.assert_series_equal(
building.cooling_peak_load[cte.MONTH][cte.COOLING_PEAK_LOAD],
expected_monthly['expected'],
check_names=False
)

2
tests/test_systems_catalog.py
View File

@ -17,7 +17,7 @@ class TestSystemsCatalog(TestCase):
archetypes = catalog.names('archetypes') archetypes = catalog.names('archetypes')
self.assertEqual(18, len(archetypes['archetypes'])) self.assertEqual(18, len(archetypes['archetypes']))
systems = catalog.names('systems') systems = catalog.names('systems')
self.assertEqual(15, len(systems['systems'])) self.assertEqual(16, len(systems['systems']))
generation_equipments = catalog.names('generation_equipments') generation_equipments = catalog.names('generation_equipments')
self.assertEqual(6, len(generation_equipments['generation_equipments'])) self.assertEqual(6, len(generation_equipments['generation_equipments']))
distribution_equipments = catalog.names('distribution_equipments') distribution_equipments = catalog.names('distribution_equipments')

4
tests/test_systems_factory.py
View File

@ -97,9 +97,9 @@ class TestSystemsFactory(TestCase):
copy.deepcopy(_generic_building_energy_system.generation_system) copy.deepcopy(_generic_building_energy_system.generation_system)
) )
if cte.HEATING in _building_energy_equipment.demand_types: if cte.HEATING in _building_energy_equipment.demand_types:
_building_generation_system.heat_power = building.heating_peak_load[cte.YEAR][cte.HEATING_PEAK_LOAD][0] _building_generation_system.heat_power = building.heating_peak_load[cte.YEAR][0]
if cte.COOLING in _building_energy_equipment.demand_types: if cte.COOLING in _building_energy_equipment.demand_types:
_building_generation_system.cooling_power = building.cooling_peak_load[cte.YEAR][cte.COOLING_PEAK_LOAD][0] _building_generation_system.cooling_power = building.cooling_peak_load[cte.YEAR][0]
_building_energy_equipment.generation_system = _building_generation_system _building_energy_equipment.generation_system = _building_generation_system
_building_energy_equipment.distribution_system = _building_distribution_system _building_energy_equipment.distribution_system = _building_distribution_system
_building_energy_equipment.emission_system = _building_emission_system _building_energy_equipment.emission_system = _building_emission_system