|
|
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 |
|
Pilar
|
eb836809a8
|
Merge remote-tracking branch 'origin/master'
|
2021-10-25 13:33:48 -04:00 |
|
Pilar
|
9243a0a4d4
|
added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back
|
2021-10-25 13:33:08 -04:00 |
|
|
|
cbc24917c1
|
import changes into typevar to avoid circular references when documentation is created
|
2021-10-25 13:28:43 -04:00 |
|
Pilar
|
f820816f12
|
added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back
|
2021-10-22 13:13:12 -04:00 |
|
Pilar
|
c34e64eb56
|
added the belonging specific edges and nodes to origind-destination and traffic networks
|
2021-10-22 11:28:22 -04:00 |
|
Peter Yefi
|
e0924cf45f
|
Implemented enriching city with energy systems
|
2021-10-21 13:50:02 +00:00 |
|
Peter Yefi
|
567fde0012
|
Included energy systems attribute
|
2021-10-21 13:49:26 +00:00 |
|
Pilar
|
bb5351da27
|
modified name of class due to an error in the format
|
2021-10-20 10:24:01 -04: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 |
|
Peter Yefi
|
143b397ef3
|
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
|
2021-10-19 16:46:30 +00:00 |
|
Peter Yefi
|
9c2b4ca7ef
|
Formatted filles
|
2021-10-19 13:58:46 +00:00 |
|
Pilar
|
5794ea09f7
|
New classes for traffic group
|
2021-10-18 16:07:18 -04:00 |
|
Pilar
|
a41a7ef801
|
New classes to integrate Saeeds work: heat_pump.py and the imports
|
2021-10-18 11:37:20 -04:00 |
|
|
|
ba72bd9043
|
Partial test corrections
|
2021-09-23 09:17:23 -04:00 |
|
|
|
e40926e74d
|
Remove tree, bixi_features and compostring classes
|
2021-09-23 07:43:32 -04:00 |
|
|
|
fde837150d
|
Small in the factories documentation
|
2021-09-22 07:25:53 -04:00 |
|
|
|
5752c5d31d
|
Small corrections in doe_idf import
|
2021-09-16 13:45:27 -04:00 |
|
Pilar
|
2780dd5b7e
|
Forced types in attributes
|
2021-09-14 13:46:48 -04:00 |
|
Pilar
|
f4d62bb505
|
Forced the type in setters
|
2021-09-13 15:14:54 -04:00 |
|
Pilar
|
83b0716f0f
|
added Schedule class. Modified schedules attribute in usage_zone.py according to this new class. Modified comnet import and its test. Other imports and exports related to schedules will be broken.
|
2021-09-01 17:36:02 -04:00 |
|
Pilar
|
7bb775f92a
|
Merge remote-tracking branch 'origin/master'
|
2021-09-01 15:14:50 -04:00 |
|
Pilar
|
e116acdeca
|
added Schedule class. Modified schedules attribute in usage_zone.py according to this new class. Modified comnet import and its test. Other imports and exports related to schedules will be broken.
|
2021-09-01 12:14:48 -04:00 |
|
|
|
3bf9051d72
|
Documentation improvements
|
2021-09-01 09:39:27 -04:00 |
|
Pilar
|
a626d83a63
|
erased not used attribute
|
2021-08-31 16:19:21 -04:00 |
|
Pilar
|
b3d7bc91a3
|
Merge remote-tracking branch 'origin/master'
|
2021-08-31 12:17:53 -04:00 |
|
Pilar
|
44c4f666d2
|
added id to thermal_boundary.py and thermal_opening.py
erased \r from files generators
added generator of auxiliary files for dynamic model
|
2021-08-31 12:17:42 -04:00 |
|
|
|
c87e573307
|
Remove documentation from the project, will create a separate repository for it
|
2021-08-31 11:49:23 -04:00 |
|
|
|
5282e51695
|
Review comments and homogenize getter and setters code comment texts
|
2021-08-30 14:39:24 -04:00 |
|
|
|
1c8ffcfee0
|
Revert "Restore repo"
This reverts commit c60aca4c07
|
2021-08-27 21:31:49 +00:00 |
|
Pilar
|
c60aca4c07
|
Restore repo
|
2021-08-27 17:29:32 -04:00 |
|
Pilar
|
a78cb879a0
|
First working version of dynamic building simulation
|
2021-08-27 17:20:24 -04:00 |
|
|
|
62bca29a82
|
Quality improvements
|
2021-08-27 12:51:30 -04:00 |
|
|
|
312a9c34be
|
Quality improvements
|
2021-08-26 13:27:43 -04:00 |
|
Pilar
|
58066a45cc
|
Merge remote-tracking branch 'origin/master'
|
2021-08-26 11:21:21 -04:00 |
|
Pilar
|
ef58f6a142
|
Added documentation to new attributes in thermal_boundary.py and thermal_opening.py
|
2021-08-26 11:21:12 -04:00 |
|
|
|
9e15b77361
|
Quality improvements
|
2021-08-26 11:12:31 -04:00 |
|
|
|
53a7e259e4
|
Change bounded to thermal_boundaries and overall code quality review
|
2021-08-26 11:00:59 -04:00 |
|
Pilar
|
8636f4693c
|
Merge remote-tracking branch 'origin/master'
|
2021-08-26 09:45:29 -04:00 |
|
Pilar
|
03a7f4cc33
|
Added new attributes in thermal_opening.py and thermal_boundary.py. Modified surface.py and thermal_boundary.py to adapt to dynamic simulation. First version of thermal_demand_dynamic_simulation.py working well (only tested for one room)
|
2021-08-26 09:36:10 -04:00 |
|
|
|
338adb399e
|
Overall code quality review for the city_model_structure
|
2021-08-26 09:19:38 -04:00 |
|
|
|
c8bdc0fb0f
|
Partial implementation for idf schedule import (doe_idf)
|
2021-08-25 07:23:02 -04:00 |
|
|
|
abafd57223
|
Traffic classes proposal
|
2021-08-17 13:30:51 -04:00 |
|
|
|
487ae2fa26
|
Traffic classes proposal
|
2021-08-17 12:52:48 -04:00 |
|
|
|
f1d23a056b
|
Idf factory can export now one building in kelowna
|
2021-08-17 12:49:12 -04:00 |
|
|
|
13eb9eaaa7
|
Idf factory can export now one building in kelowna
|
2021-08-12 14:18:44 -04:00 |
|
Pilar
|
17477bc049
|
is_heated and is_cooled pass from thermal_zone to usage_zone
|
2021-08-12 11:42:47 -04:00 |
|
Pilar
|
6970bac1f0
|
Added a parameter in building.py to specifically decide whether dividing the building in storeys or not. By default, False.
|
2021-08-12 11:08:29 -04:00 |
|
Pilar
|
398a114333
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/building_demand/thermal_zone.py
|
2021-08-11 16:39:46 -04:00 |
|
Pilar
|
eb32b7b3e6
|
added volume to thermal_zones
|
2021-08-11 16:38:06 -04:00 |
|
|
|
4dbf77fd11
|
Merge remote-tracking branch 'origin/master'
|
2021-08-11 15:11:06 -04:00 |
|
|
|
49d97de3dd
|
idf changes
|
2021-08-11 15:11:00 -04:00 |
|
Pilar
|
c7ebce49b7
|
fixed a bug in us_archetypes.xml, "interior slab" for "exterior slab"
added number_of_storeys = 1 in building.py; it must be reviewed
|
2021-08-11 12:53:49 -04:00 |
|
|
|
f06c19722e
|
Add c40
|
2021-08-11 12:13:16 -04:00 |
|
