Pilar a038fbd31e Merge branch 'master' into review_usage_and_construction_catalogs ... # Conflicts: # city_model_structure/building_demand/thermal_zone.py # imports/schedules/comnet_schedules_parameters.py # imports/schedules/doe_idf.py # imports/usage/comnet_usage_parameters.py		2022-12-06 14:25:56 -05:00
..
construction	change units in monthly energy balance exporter	2022-12-01 15:33:14 -05:00
energy_systems	merge changes with main	2022-11-28 13:44:02 -05:00
geometry	Merge branch 'master' into review_usage_and_construction_catalogs	2022-12-06 14:25:56 -05:00
life_cycle_assessment	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
sensors	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
usage	Merge branch 'master' into review_usage_and_construction_catalogs	2022-12-06 14:25:56 -05:00
weather	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
construction_factory.py	Merge remote-tracking branch 'origin/master' into geojson	2022-11-28 13:13:55 -05:00
energy_systems_factory.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
geometry_factory.py	assign lod at city level and correct unit tests	2022-11-25 15:25:59 -05:00
life_cycle_assessment_factory.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
sensors_factory.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00
usage_factory.py	assign lod at city level and correct unit tests	2022-11-25 15:25:59 -05:00
weather_factory.py	License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading	2022-04-08 09:35:33 -04:00