Pilar
|
62dcc3805b
|
complete modification of the structure of the classes that define the buildig for a better adjustment to the different data sources and the connected tools. NOT finished
|
2022-03-24 18:43:55 -04:00 |
|
Pilar
|
2585cd3245
|
partially finished usage factory test
|
2022-03-24 18:43:55 -04:00 |
|
Pilar
|
cf19f6fce5
|
fixed bug saving values
|
2022-03-24 18:43:55 -04:00 |
|
|
|
03141b74c8
|
Remove useless prints
|
2022-03-24 18:39:46 -04:00 |
|
|
|
ceb6ae1856
|
correct small error in merge
|
2022-03-17 14:49:18 -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
|
99a0ac0bce
|
Removed unneeded attributes
|
2022-03-10 12:42:12 -05:00 |
|
|
|
024469ac0a
|
Link materials and lca_materials in the city
|
2022-03-02 12:56:20 -05:00 |
|
|
|
6b9e09ba88
|
Partial commit for dompark project including sensors, lca materials and overall improvements
|
2022-03-02 12:13:11 -05:00 |
|
atiya
|
a40c1a0154
|
Machines added into City class
|
2022-02-22 16:24:12 -05:00 |
|
|
|
651151c6ac
|
Partial implementation of the new iot sensors, this change broke the sensor factories and a few unit tests that will be fixed in next commit.
|
2022-02-21 13:26:14 -05:00 |
|
|
|
49bfc6eec9
|
Rhino implementation partially completed, need to be fully tested
|
2022-02-16 15:08:05 -05:00 |
|
Peter Yefi
|
f728685c65
|
Renamed certain variables and added comments for insel required coefficients
|
2022-01-26 10:40:14 -05:00 |
|
Peter Yefi
|
ecc8bfcbb1
|
Added comments for a and b insel coefficient values
|
2022-01-26 10:39:26 -05:00 |
|
Peter Yefi
|
ddbc047640
|
Fixed and merged conflicts
|
2021-12-15 09:30:53 +00:00 |
|
Peter Yefi
|
1ed60762c3
|
Added water to water heat pump model
|
2021-12-15 09:22:44 +00:00 |
|
Peter Yefi
|
d703b8c8cf
|
Made heat pump a parent class for air source and water to water sources heat pumps
|
2021-12-15 09:22:20 +00:00 |
|
Peter Yefi
|
680b635025
|
changed heat_pump to air source to reflect data source
|
2021-12-15 09:20:08 +00:00 |
|
Peter Yefi
|
02882f5e1c
|
Added water to water heat pump
|
2021-12-15 09:19:10 +00:00 |
|
atiya
|
02d120add9
|
Contributors added in LCA code
|
2021-11-22 20:57:29 -05:00 |
|
atiya
|
dff87c2390
|
LCA materials XML
|
2021-11-18 17:13:27 -05:00 |
|
Pilar
|
e3a5d73c38
|
just making material parameters optional
|
2021-11-18 17:02:19 -05:00 |
|
Pilar
|
be0db6d347
|
extra material deleted
|
2021-11-18 16:57:27 -05:00 |
|
atiya
|
01ff8ddcf3
|
LCA materials XML
|
2021-11-18 16:55:49 -05:00 |
|
|
|
d2d86bc942
|
Test driven partial corrections
|
2021-11-16 12:27:49 -05:00 |
|
|
|
155daa47b7
|
Correct merge mistake
|
2021-11-16 07:37:27 -05:00 |
|
atiya
|
d76ea58b74
|
Added LCA formulas
|
2021-11-15 11:07:16 -05:00 |
|
atiya
|
cc56c19aa0
|
added Machine and Vehicle classes to Life Cycle Assessment
|
2021-11-15 11:07:16 -05:00 |
|
Pilar
|
068a780ebb
|
Added comnet usage library, including import factory. Some modifications on internal_gains.py and hft_internal_gains_archetypes.py were required. Also created a class to pass from daily schedules to yearly schedule.
|
2021-11-15 11:07:15 -05:00 |
|
|
|
9837bb8427
|
Base implementation for the fuel life cicle analisis
|
2021-11-15 11:06:55 -05:00 |
|
Pilar
|
3adf8c9604
|
created customized imports factory and correspondent test
|
2021-11-15 11:02:52 -05:00 |
|
|
|
beec608229
|
import changes into typevar to avoid circular references when documentation is created
|
2021-11-15 11:02:51 -05:00 |
|
Pilar
|
2c5490d138
|
added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back
|
2021-11-15 11:02:42 -05:00 |
|
Pilar
|
0a75cf46e6
|
added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back
|
2021-11-15 11:02:42 -05:00 |
|
Pilar
|
41f79b189a
|
added the belonging specific edges and nodes to origind-destination and traffic networks
|
2021-11-15 11:02:42 -05:00 |
|
Pilar
|
7af71db19d
|
modified name of class due to an error in the format
|
2021-11-15 11:02:40 -05:00 |
|
atiya
|
c04c3d5f5a
|
Types of properties are added
|
2021-11-15 10:43:35 -05:00 |
|
atiya
|
35c62b4808
|
Merge remote-tracking branch 'origin/master'
|
2021-11-15 10:36:16 -05:00 |
|
atiya
|
dbab2d2501
|
Types of properties are added
|
2021-11-15 10:35:31 -05:00 |
|
|
|
7529a3719a
|
Merge remote-tracking branch 'origin/master'
|
2021-11-15 09:47:23 -05:00 |
|
|
|
eeff2eec18
|
Integrate Peter's head pump branch into master
|
2021-11-15 09:47:09 -05:00 |
|
atiya
|
075e03396d
|
Added LCA formulas
|
2021-11-15 08:28:50 -05:00 |
|
atiya
|
97ec2a1436
|
added Machine and Vehicle classes to Life Cycle Assessment
|
2021-11-13 00:55:04 -05:00 |
|
|
|
0439ab0cd2
|
Merge remote-tracking branch 'origin/master'
|
2021-11-12 04:42:29 -05:00 |
|
|
|
c07a6f6c34
|
Base implementation for the fuel life cicle analisis
|
2021-11-12 04:41:17 -05:00 |
|
Pilar
|
46c3b8b63a
|
Added comnet usage library, including import factory. Some modifications on internal_gains.py and hft_internal_gains_archetypes.py were required. Also created a class to pass from daily schedules to yearly schedule.
|
2021-11-11 17:25:53 -05:00 |
|
Pilar
|
ef6afb0ab4
|
created customized imports factory and correspondent test
|
2021-11-05 10:16:35 -04:00 |
|
Peter Yefi
|
c221c9876f
|
Added attributes for heatpump coefficients
|
2021-11-01 14:52:38 +00:00 |
|
Peter Yefi
|
ca191ab480
|
Renamed variables, changed indentation to 2 spaces
|
2021-10-26 11:11:19 +00:00 |
|
