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
..
air_source_hp_parameters.py	Merge remote-tracking branch 'origin/master' into heat_pump	2022-03-17 14:34:11 -04:00
water_to_water_hp_parameters.py	Modified coefficient computation for water to water hp	2022-03-17 10:37:47 -04:00