|
|
1e24e43b64
|
Refactoring building creation and bringing code up to date
|
2022-11-23 10:20:33 -05:00 |
|
Peter Yefi
|
d3a52c8bfc
|
Fixed pandas append deprecation warning
|
2022-04-28 10:58:45 -04:00 |
|
Peter Yefi
|
be10bc81f1
|
Changed air source filename. Cleanup
|
2022-04-08 13:38:32 -04:00 |
|
|
|
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 |
|
Peter Yefi
|
380c6644a3
|
Changed how coefficients are generated
|
2022-03-10 12:44:04 -05:00 |
|
Peter Yefi
|
e948b69349
|
Refactored variable names
|
2022-01-26 10:42:44 -05:00 |
|
Peter Yefi
|
93160912c3
|
Added a module for importing water to water source heat pump
|
2021-12-15 09:24:52 +00:00 |
|
Peter Yefi
|
02882f5e1c
|
Added water to water heat pump
|
2021-12-15 09:19:10 +00:00 |
|
|
|
eeff2eec18
|
Integrate Peter's head pump branch into master
|
2021-11-15 09:47:09 -05:00 |
|
Peter Yefi
|
ebe5439f02
|
Fixed issue with coefficient computation
|
2021-11-10 10:17:01 +00:00 |
|
Peter Yefi
|
102e6ae2d4
|
Added return type to objective_function
|
2021-11-08 16:37:58 +00:00 |
|
Peter Yefi
|
545c58a5f1
|
Modified heat pump import to compute coefficient of performance data
|
2021-11-01 14:53:51 +00:00 |
|
Peter Yefi
|
ae0e2a905f
|
Fixed error with reading cooling data
|
2021-10-29 15:26:48 +00:00 |
|
Peter Yefi
|
8e86f299d5
|
Changed variable names and code indentation
|
2021-10-26 11:11:48 +00:00 |
|
Peter Yefi
|
e0924cf45f
|
Implemented enriching city with energy systems
|
2021-10-21 13:50:02 +00:00 |
|
Peter Yefi
|
df3f33b45a
|
Added a method to read heat pump data into dictionary
|
2021-10-20 13:00:59 +00:00 |
|
Peter Yefi
|
1951861061
|
Finished defining the data structure heat pump
|
2021-10-19 17:17:11 +00:00 |
|
Pilar
|
a41a7ef801
|
New classes to integrate Saeeds work: heat_pump.py and the imports
|
2021-10-18 11:37:20 -04:00 |
|
