4 Commits

Author	SHA1	Message	Date
guille	920cb3015a	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
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
Peter Yefi	380c6644a3	Changed how coefficients are generated	2022-03-10 12:44:04 -05:00
Peter Yefi	02882f5e1c	Added water to water heat pump	2021-12-15 09:19:10 +00:00