|
|
0ec80dacc0
|
Correct rhino read
|
2022-05-03 14:50:41 -04:00 |
|
|
|
9b5577c677
|
Small bug corrections + rename libs to hub
|
2022-05-02 17:39:37 -04:00 |
|
Pilar
|
d0fa0c1f8a
|
windows included in idf export
|
2022-05-02 15:02:06 -04:00 |
|
Pilar
|
9c3ac59866
|
Merge branch 'master' into installation_in_macos
|
2022-04-28 14:44:42 -04:00 |
|
Pilar
|
06ecae7e88
|
looking for a bug
|
2022-04-28 14:41:09 -04:00 |
|
Pilar
|
0e7acd89d1
|
looking for a bug
|
2022-04-28 14:34:23 -04:00 |
|
Peter Yefi
|
d3a52c8bfc
|
Fixed pandas append deprecation warning
|
2022-04-28 10:58:45 -04:00 |
|
|
|
d5565530c1
|
Merge initial version for Catalogs as factories data sources
|
2022-04-26 19:41:00 -04:00 |
|
Pilar
|
74dfa69aea
|
modified year of construction in tests to be able to run ConstructionFactory with nrel
|
2022-04-26 19:14:12 -04:00 |
|
Pilar
|
88c0e9fa5f
|
modifications in idf to import more complex schedules and schedules by file
|
2022-04-26 18:39:42 -04:00 |
|
Pilar
|
bff362ed05
|
check merge branches
|
2022-04-19 16:20:41 -04:00 |
|
Pilar
|
e2b882723b
|
Modified construction factory to read from catalogs instead of file
|
2022-04-19 15:49:41 -04:00 |
|
|
|
a273c38a45
|
remove nrcan construction library and fix some unit tests
|
2022-04-11 14:32:44 -04:00 |
|
Pilar
|
4da0a42530
|
Modifications in readme and code of conduct
|
2022-04-08 18:03:35 -04:00 |
|
|
|
0592f2ce04
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# exports/formats/idf.py
|
2022-04-08 09:36:53 -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 |
|
Pilar
|
5e51947d6a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/building_demand/usage_zone.py
# unittests/test_usage_factory.py
|
2022-04-07 16:52:34 -04:00 |
|
Pilar
|
50490df965
|
Fixed bugs in thermal zone and checked that all tests affected pass
|
2022-04-07 16:50:36 -04:00 |
|
|
|
d46576c890
|
Bug correction in the lca factory and lca_data.xml
|
2022-04-06 16:37:51 -04:00 |
|
Pilar
|
684238a3ff
|
Thermal zone concept modified. Now it includes all usage parameters associated to that thermal zone
|
2022-04-06 16:06:55 -04:00 |
|
|
|
4f624e1143
|
API required changes
|
2022-04-04 22:41:34 -04:00 |
|
|
|
7498be0e1d
|
Remove prints
|
2022-04-04 19:51:30 -04:00 |
|
|
|
688541b20c
|
removing wrong comment
|
2022-03-30 13:31:59 -04:00 |
|
|
|
0c92e6e4ad
|
Fixing libs wrong commit
|
2022-03-30 13:26:31 -04:00 |
|
Pilar
|
7a29bef239
|
Major changes with two objectives: homogenize the usage parameters regardless the data source, and completely uncouple geometry and construction library (before the geometry was modified after reading storey high from construction library), and construction and usage libraries (before the usage library could only be read after construction library, now ant order is accepted).
|
2022-03-24 18:43:55 -04:00 |
|
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 |
|
|
|
6bca2dfda4
|
match pep8
|
2022-03-23 14:40:49 -04:00 |
|
|
|
d170f3a220
|
correct comment in rhino handler
|
2022-03-22 12:30:05 -04:00 |
|
|
|
172cecdb7b
|
correct another error in merge
|
2022-03-18 08:33:35 -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 |
|
|
|
7db319f3fd
|
Partial implementation for the greenery catalog integration
|
2022-03-03 16:52:01 -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 |
|
Pilar
|
99f2dea55f
|
fixed bug saving values
|
2022-02-17 12:48:23 -05:00 |
|
Pilar
|
659df7079c
|
Merge remote-tracking branch 'origin/master'
|
2022-02-17 12:37:33 -05:00 |
|
Pilar
|
e74fa4dfe9
|
modified doe_idf.py to save on new schedule format
|
2022-02-17 12:37:14 -05:00 |
|
|
|
becc8f6068
|
Rhino implementation for dompark project.
|
2022-02-17 11:35:34 -05:00 |
|
|
|
49bfc6eec9
|
Rhino implementation partially completed, need to be fully tested
|
2022-02-16 15:08:05 -05:00 |
|
Peter Yefi
|
e948b69349
|
Refactored variable names
|
2022-01-26 10:42:44 -05:00 |
|
Peter Yefi
|
ddbc047640
|
Fixed and merged conflicts
|
2021-12-15 09:30:53 +00:00 |
|
Peter Yefi
|
f6354586d6
|
Added method for importing water to water source. Made some modifications to reflect data source
|
2021-12-15 09:25:37 +00: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 |
|
atiya
|
02d120add9
|
Contributors added in LCA code
|
2021-11-22 20:57:29 -05:00 |
|
atiya
|
b4a0b25792
|
LCA material class
|
2021-11-18 17:14:58 -05:00 |
|
atiya
|
dff87c2390
|
LCA materials XML
|
2021-11-18 17:13:27 -05:00 |
|
atiya
|
01ff8ddcf3
|
LCA materials XML
|
2021-11-18 16:55:49 -05:00 |
|
atiya
|
5246cb27ee
|
Merge remote-tracking branch 'origin/master'
|
2021-11-16 14:25:35 -05:00 |
|
atiya
|
5a686f867a
|
LCA materials XML
|
2021-11-16 14:25:25 -05:00 |
|
|
|
d2d86bc942
|
Test driven partial corrections
|
2021-11-16 12:27:49 -05:00 |
|
|
|
a692f9c22a
|
Test driven partial corrections
|
2021-11-16 07:57:47 -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
|
da17cd5d82
|
Changed hard-coded values to constant values
|
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 |
|
Pilar
|
2af8bf5db3
|
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 |
|
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 |
|
Peter Yefi
|
fee9dc5808
|
Modified xlsx heat pump method
|
2021-11-12 10:19:55 +00: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
|
3babe097f2
|
Changed hard-coded values to constant values
|
2021-11-11 17:27:19 -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 |
|
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 |
|
Pilar
|
ef6afb0ab4
|
created customized imports factory and correspondent test
|
2021-11-05 10:16:35 -04: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
|
bf649638d7
|
Changed code indentation
|
2021-10-26 11:12:02 +00:00 |
|
Peter Yefi
|
8e86f299d5
|
Changed variable names and code indentation
|
2021-10-26 11:11:48 +00:00 |
|
Pilar
|
688ba9bd37
|
created customized imports factory and correspondent test
|
2021-10-25 18:05:51 -04: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 |
|
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 |
|
|
|
ba72bd9043
|
Partial test corrections
|
2021-09-23 09:17:23 -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
|
0b2a70f8ae
|
temperature in Comnet in Fahrenheit, transformed to Celsius
|
2021-09-01 17:59:28 -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 |
|
