guille f2ff10ad47 Merge remote-tracking branch 'origin/master' into heat_pump ... # Conflicts: # city_model_structure/city.py # city_model_structure/energy_system.py # city_model_structure/fuel.py # city_model_structure/machine.py # city_model_structure/vehicle.py # data/life_cycle_assessment/lca_data.xml # exports/energy_systems_factory.py # helpers/constants.py # helpers/yearly_from_daily_schedules.py # imports/energy_systems/air_source_hp_parameters.py # imports/geometry/rhino.py # imports/geometry_factory.py # imports/life_cycle_assessment/lca_fuel.py # imports/life_cycle_assessment/lca_machine.py # imports/life_cycle_assessment/lca_vehicle.py # imports/life_cycle_assessment_factory.py # requirements.txt # unittests/test_life_cycle_assessment_factory.py		2022-03-17 14:34:11 -04:00
..
construction	Machines added into City class	2022-03-02 12:12:17 -05:00
customized_imports	created customized imports factory and correspondent test	2021-11-15 11:02:52 -05:00
energy_systems/heat_pumps	Modified coefficient computation for water to water hp	2022-03-17 10:37:47 -04:00
greenery	Partial implementation for the greenery catalog integration	2022-03-03 16:52:01 -05:00
life_cycle_assessment	Machines added into City class	2022-03-02 12:12:17 -05:00
schedules	Adding the LoD1 EV Building gml file	2022-01-08 12:33:07 -05:00
sensors	changes to add new sensors of other types	2021-06-02 11:28:24 -04:00
usage	Added comnet usage library, including import factory. Some modifications on internal_gains.py and hft_internal_gains_archetypes.py were required. Also created a class to pass from daily schedules to yearly schedule.	2021-11-15 11:07:15 -05:00
weather	added Montreal weather file	2021-06-08 12:53:17 -04:00