Guillermo Gutierrez Morote
|
91ddbb9341
|
Merge branch 'internal_zones' into 'master'
complete modification of the structure of the classes that define the buildig...
See merge request Guille/libs!7
|
2022-03-24 22:52:50 +00:00 |
|
|
|
8b002e483b
|
Merge remote-tracking branch 'origin/internal_zones' into internal_zones
# Conflicts:
# catalogs/catalog.py
# catalogs/greenery/greenery_catalog.py
# catalogs/greenery_catalog_factory.py
# city_model_structure/city.py
# city_model_structure/lca_calculations.py
# imports/life_cycle_assessment/lca_vehicle.py
# imports/sensors/concordia_energy_consumption.py
|
2022-03-24 18:48:32 -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 |
|
Pilar
|
7488b6ba91
|
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 16:51:01 -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 |
|
Peter Yefi
|
fdbf1817c3
|
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
|
2022-03-18 11:28:44 -04:00 |
|
|
|
172cecdb7b
|
correct another error in merge
|
2022-03-18 08:33:35 -04:00 |
|
Pilar
|
77a8969a7e
|
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-17 18:49:44 -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 |
|
|
|
c8c4a681e3
|
Fixing bugs in idf export
|
2022-03-16 13:21:51 -04:00 |
|
Peter Yefi
|
a8e44d5e30
|
Fixed issue with additional column for tech performance during series air source run
|
2022-03-11 10:18:33 -05:00 |
|
Peter Yefi
|
380c6644a3
|
Changed how coefficients are generated
|
2022-03-10 12:44:04 -05:00 |
|
Peter Yefi
|
99a0ac0bce
|
Removed unneeded attributes
|
2022-03-10 12:42:12 -05:00 |
|
Peter Yefi
|
409e894097
|
Modified template files
|
2022-03-10 12:41:35 -05:00 |
|
Peter Yefi
|
5a9bde6c51
|
Updated git ignore
|
2022-03-10 10:43:59 -05:00 |
|
|
|
993233aff9
|
Small bug fixing in greenery catalog and energy_systems_factory.py
|
2022-03-09 17:02:12 -05:00 |
|
|
|
d5a4ffe0fa
|
Complete implementation for the greenery catalog integration
|
2022-03-09 11:40:06 -05:00 |
|
|
|
868dfe22d5
|
Partial implementation for the greenery catalog integration
|
2022-03-08 20:25:50 -05:00 |
|
Pilar
|
69169b45b1
|
partially finished usage factory test
|
2022-03-08 20:08:03 -05:00 |
|
Pilar
|
fae8ba8022
|
fixed bug saving values
|
2022-03-08 19:19:52 -05:00 |
|
|
|
7db319f3fd
|
Partial implementation for the greenery catalog integration
|
2022-03-03 16:52:01 -05:00 |
|
Peter Yefi
|
5e354bbd09
|
ignored __pycache__
|
2022-03-03 13:50:02 -05:00 |
|
Peter Yefi
|
dd26fb6fd5
|
Changed boolean simulation type indicator
|
2022-03-03 13:48:02 -05:00 |
|
Peter Yefi
|
c22d28fc89
|
Excluded pycache files
|
2022-03-03 11:42:40 -05:00 |
|
|
|
024469ac0a
|
Link materials and lca_materials in the city
|
2022-03-02 12:56:20 -05:00 |
|
|
|
6668c48039
|
Merge remote-tracking branch 'origin/master'
|
2022-03-02 12:13:16 -05:00 |
|
|
|
6b9e09ba88
|
Partial commit for dompark project including sensors, lca materials and overall improvements
|
2022-03-02 12:13:11 -05:00 |
|
atiya
|
0870d12029
|
Machines added into City class
|
2022-03-02 12:12:17 -05:00 |
|
Peter Yefi
|
883461782c
|
Added option for running series or parallel simulation
|
2022-02-26 11:47:23 -05:00 |
|
Peter Yefi
|
5269caba9d
|
Added different template files for parallel and series w2w and air source
|
2022-02-26 11:40:19 -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 |
|
Peter Yefi
|
e692f99316
|
Removed deprecated pandas method
|
2022-02-17 13:56:42 -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
|
7f21cc22c3
|
Added Reactivation and Deactivation Temps
|
2022-02-02 07:03:22 -05:00 |
|
Peter Yefi
|
702c8c4103
|
Changed names of insel generated output files
|
2022-01-29 09:43:57 -05:00 |
|
Peter Yefi
|
81bb8a1795
|
Added additional parameter to method for running insel
|
2022-01-29 09:42:34 -05:00 |
|
Peter Yefi
|
34fbd393aa
|
Added constants for w2w hp
|
2022-01-29 09:41:17 -05:00 |
|
Peter Yefi
|
e948b69349
|
Refactored variable names
|
2022-01-26 10:42:44 -05:00 |
|
