Guillermo Gutierrez Morote 4bf2ff4ff0 Merge branch 'master' into 'db_persistence' ... # Conflicts: # .gitignore # city_model_structure/city.py # requirements.txt # unittests/test_energy_systems_water_to_water_hp.py		2023-01-09 21:36:44 +00:00
..
construction	Merge initial version for Catalogs as factories data sources	2022-04-26 19:41:00 -04:00
customized_imports	created customized imports factory and correspondent test	2021-11-15 11:02:52 -05:00
energy_systems/heat_pumps	Updated insel template and constant files	2022-08-16 13:47:17 -04:00
greenery	Correct merge error add deleted files	2022-03-24 19:06:47 -04:00
life_cycle_assessment	Changes to lca_data.xml file	2022-06-03 10:40:53 -04:00
schedules	greenery added to idf exporter and unittest created	2022-05-16 09:35:19 -04:00
sensors	changes to add new sensors of other types	2021-06-02 11:28:24 -04:00
usage	Partial nrcan usage implementation	2022-11-15 08:38:41 -05:00
weather	added Montreal weather file	2021-06-08 12:53:17 -04:00