|
|
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 |
|
|
|
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
|
73593744b7
|
Modified coefficient computation for water to water hp
|
2022-03-17 10:37:47 -04:00 |
|
|
|
993233aff9
|
Small bug fixing in greenery catalog and energy_systems_factory.py
|
2022-03-09 17:02:12 -05:00 |
|
Peter Yefi
|
dd26fb6fd5
|
Changed boolean simulation type indicator
|
2022-03-03 13:48:02 -05:00 |
|
Peter Yefi
|
883461782c
|
Added option for running series or parallel simulation
|
2022-02-26 11:47:23 -05:00 |
|
Peter Yefi
|
aa7463cb9d
|
Added separate classes of water to water and air source hp. Refactored energy systems factory
|
2022-01-26 10:42:01 -05:00 |
|
Peter Yefi
|
bc762e4844
|
Added export method to export factory
|
2021-11-12 10:16:22 +00:00 |
|
Peter Yefi
|
f6de5b6f96
|
Modified export_heat_pump to run insel instead of exporting to CSV
|
2021-11-10 10:14:31 +00:00 |
|
Peter Yefi
|
12f8beb0d2
|
Included energy system export factory
|
2021-10-29 15:28:10 +00:00 |
|
Peter Yefi
|
4eea12a069
|
Included scipy for heat pump coefficient computation
|
2021-10-29 15:25:53 +00:00 |
|
