Pilar
|
b34b07b161
|
added nrcan importer
usage importer now reads from catalogs
|
2022-12-07 10:54:28 -05:00 |
|
Pilar
|
09bbe07ccb
|
Merge branch 'master' into review_usage_and_construction_catalogs
|
2022-12-06 15:30:30 -05:00 |
|
Guillermo Gutierrez Morote
|
2ad54940ab
|
Merge branch 'nrcan' into 'master'
Nrcan
See merge request Guille/hub!43
|
2022-12-06 20:29:43 +00:00 |
|
Pilar
|
a038fbd31e
|
Merge branch 'master' into review_usage_and_construction_catalogs
# Conflicts:
# city_model_structure/building_demand/thermal_zone.py
# imports/schedules/comnet_schedules_parameters.py
# imports/schedules/doe_idf.py
# imports/usage/comnet_usage_parameters.py
|
2022-12-06 14:25:56 -05:00 |
|
Pilar
|
4a1f5099a3
|
fixed some bug in the meb exporter as well as in the calculation of the overall U value of walls
|
2022-11-28 14:10:13 -05:00 |
|
|
ac53ce2f4d
|
Merge remote-tracking branch 'origin/master' into nrcan
|
2022-11-21 14:02:01 -05:00 |
|
|
6be5325f75
|
Correct unit tests due latest changes in gpandas handler.
Partial rollback of some changes
|
2022-11-21 13:53:58 -05:00 |
|
|
1db5b02847
|
partial completion of nrcan catalog
|
2022-11-21 12:46:39 -05:00 |
|
Pilar
|
7a358806f3
|
starting with the nrcan_usage_parameters class. Not working!
|
2022-11-21 11:03:28 -05:00 |
|
|
60b725dad6
|
Partial nrcan usage implementation
|
2022-11-15 08:38:41 -05:00 |
|
Pilar
|
d1f16fe833
|
Solved bug in comnet catalog when changing from feet to meter and from fahrenheit to celsius
|
2022-06-08 15:00:03 -04:00 |
|
|
4514138db7
|
Correct bug in comnet catalog
Now excludes properly C13 - Data center and C6 - Parking garage
|
2022-06-02 12:18:11 -04:00 |
|
Pilar
|
a6e239bb45
|
Found a bug in comnet factory and modified type of data from temperature to any number
|
2022-06-01 23:17:04 -04:00 |
|
|
1dc325a38f
|
Correct bug in usage values, now 24h values are returned
|
2022-06-01 13:40:42 -04:00 |
|
|
abbc0d966d
|
improve naming in occupancy catalog data model
|
2022-05-19 21:38:48 -04:00 |
|
|
e996bfb5bf
|
completed parser for the data sources
|
2022-05-19 14:24:24 -04:00 |
|
|
c38d163d23
|
completed parser for the data sources
|
2022-05-19 12:02:13 -04:00 |
|
|
15c1c1235f
|
partial parser for data sources
|
2022-05-18 22:51:55 -04:00 |
|
|
9b3241e1d7
|
partial parser for data sources
|
2022-05-17 22:22:40 -04:00 |
|
|
fbf6005748
|
Merge remote-tracking branch 'origin/master' into usage_catalog
|
2022-05-16 17:33:26 -04:00 |
|
|
e002a41ef9
|
complete data model for usage
|
2022-05-16 17:32:59 -04:00 |
|
|
8f286ad115
|
Partial implementation of usage catalog
|
2022-05-16 09:48:09 -04:00 |
|
Pilar
|
1aeca13e01
|
greenery added to idf exporter and unittest created
|
2022-05-16 09:35:19 -04:00 |
|
|
6db6f731d6
|
Partial implementation of usage catalog
|
2022-05-12 17:12:18 -04:00 |
|
|
1fbb99a5d6
|
Initial commit for usage catalog branch
|
2022-05-12 16:22:19 -04:00 |
|
|
d5565530c1
|
Merge initial version for Catalogs as factories data sources
|
2022-04-26 19:41:00 -04:00 |
|
|
1d48adf570
|
Add dompark aechetype
|
2022-04-26 18:43:48 -04:00 |
|
Pilar
|
146a02fa58
|
Merge remote-tracking branch 'origin/master'
|
2022-04-19 15:50:04 -04:00 |
|
Pilar
|
e2b882723b
|
Modified construction factory to read from catalogs instead of file
|
2022-04-19 15:49:41 -04:00 |
|
|
a35fca9876
|
bug fix:
Properly return window id instead window name
|
2022-04-19 13:42:53 -04:00 |
|
|
24c1ac387a
|
Merge remote-tracking branch 'origin/master'
|
2022-04-13 18:31:59 -04:00 |
|
|
59f3b548c7
|
bug correction on construction catalogs
|
2022-04-13 18:31:54 -04:00 |
|
Pilar
|
58108b3bf0
|
Merge remote-tracking branch 'origin/master'
|
2022-04-12 09:29:09 -04:00 |
|
Pilar
|
1bb471cbe8
|
changes in PYGUIDE.md and WINDOWS_INSTALL.md
|
2022-04-11 19:29:29 -04:00 |
|
|
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 |
|
Pilar
|
4da0a42530
|
Modifications in readme and code of conduct
|
2022-04-08 18:03:35 -04:00 |
|