|
|
a273c38a45
|
remove nrcan construction library and fix some unit tests
|
2022-04-11 14:32:44 -04:00 |
|
|
|
3e03ca6f08
|
remove debug function
|
2022-04-11 12:45:00 -04:00 |
|
|
|
9287da7a66
|
correct merge errors
|
2022-04-11 12:44:23 -04:00 |
|
|
|
8b952e3254
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# catalog_factories/construction_catalog_factory.py
# unittests/test_greenery_catalog.py
|
2022-04-11 12:39:45 -04:00 |
|
|
|
d7f1b46cf5
|
complete test and correct errors in construction catalog
|
2022-04-11 12:37:46 -04:00 |
|
Pilar
|
4da0a42530
|
Modifications in readme and code of conduct
|
2022-04-08 18:03:35 -04:00 |
|
|
|
6b86dae410
|
complete coding for nrel catalog factory (Need to be tested)
|
2022-04-08 14:14:04 -04:00 |
|
Peter Yefi
|
5e69e0f28a
|
Deleted cached files
|
2022-04-08 14:01:46 -04:00 |
|
Peter Yefi
|
1c7165610f
|
Updated file
|
2022-04-08 14:01:28 -04:00 |
|
Peter Yefi
|
c04a5c5925
|
Changed return type
|
2022-04-08 13:39:27 -04:00 |
|
Peter Yefi
|
be10bc81f1
|
Changed air source filename. Cleanup
|
2022-04-08 13:38:32 -04:00 |
|
Peter Yefi
|
6d38d2258f
|
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
|
2022-04-08 11:51:58 -04:00 |
|
|
|
6299cdfe48
|
complete the data model for the construction catalog
|
2022-04-08 10:45:33 -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 |
|
Peter Yefi
|
ed6f568b92
|
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
|
2022-04-07 12:42:41 -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 |
|
Peter Yefi
|
0879836800
|
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
|
2022-04-04 15:06:20 -04:00 |
|
|
|
ee8549bf98
|
Correct import issue
|
2022-04-04 08:37:21 -04:00 |
|
|
|
60f5d9aca1
|
Changing comments and signature to improve the documentation
|
2022-03-31 06:44:33 -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 |
|
|
|
5281b63de2
|
Remove unneeded files and wrong unittest, partial usage factory test correction
|
2022-03-29 07:33:04 -04:00 |
|
|
|
b2453b0d27
|
Add missing property decorator for getter
|
2022-03-29 07:27:30 -04:00 |
|
|
|
bf7ba17121
|
Correct sensor class definition
|
2022-03-29 06:53:55 -04:00 |
|
|
|
2bc217773e
|
Correct merge error add deleted files
|
2022-03-24 19:06:47 -04:00 |
|
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 |
|
