Commit Graph

822 Commits

Author SHA1 Message Date
1d48adf570 Add dompark aechetype 2022-04-26 18:43:48 -04:00
Pilar
88c0e9fa5f modifications in idf to import more complex schedules and schedules by file 2022-04-26 18:39:42 -04:00
Peter Yefi
04d13e50d1 modified ignore file 2022-04-25 15:16:22 -04:00
Guillermo Gutierrez Morote
d4cd966447 Merge branch 'last_comment_in_documentation' into 'master'
one more comment in CONTRIBUTING_CENTRAL_DATA_MODEL.md

See merge request Guille/libs!14
2022-04-21 17:16:37 +00:00
Pilar
b4054fcf84 one more comment in CONTRIBUTING_CENTRAL_DATA_MODEL.md 2022-04-21 10:50:19 -04:00
Guillermo Gutierrez Morote
36519aa24f Merge branch 'updating_documentation' into 'master'
finished CONTRIBUTING_CENTRAL_DATA_MODEL.md

See merge request Guille/libs!13
2022-04-21 14:46:06 +00:00
Pilar
03f692be67 finished CONTRIBUTING_CENTRAL_DATA_MODEL.md 2022-04-20 18:33:10 -04:00
Guillermo Gutierrez Morote
b0c2f52dd4 Merge branch 'update_documentation' into 'master'
check merge branches

See merge request Guille/libs!12
2022-04-19 20:34:40 +00:00
Pilar
bff362ed05 check merge branches 2022-04-19 16:20:41 -04:00
Guillermo Gutierrez Morote
4daec98dba Merge branch 'updating_documentation' into 'master'
Updating documentation

See merge request Guille/libs!11
2022-04-19 20:12:40 +00: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
Pilar
01af205d9d bug in CONTRIBUTING_CENTRAL_DATA_MODEL.md 2022-04-13 19:34:09 -04:00
Pilar
b3e51c26d4 Merge remote-tracking branch 'origin/to_erase' 2022-04-13 19:31:08 -04:00
Pilar
61649a69d0 added CONTRIBUTING_CENTRAL_DATA_MODEL.md file 2022-04-13 19:26:44 -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
c4a6ea61fc editing WINDOWS_INSTALL.md and CONTRIBUTING.md 2022-04-12 14:14:20 -04:00
Pilar
f93bdbe5c3 editing WINDOWS_INSTALL.md and CONTRIBUTING.md 2022-04-12 10:47:22 -04:00
Pilar
43c0abdd04 editing WINDOWS_INSTALL.md 2022-04-12 09:42:43 -04:00
Pilar
d2f4b1b106 added how to install images 2022-04-12 09:31:46 -04:00
Pilar
58108b3bf0 Merge remote-tracking branch 'origin/master' 2022-04-12 09:29:09 -04:00
5cddbd363f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
2022-04-12 07:05:13 -04:00
a0bae83ff5 commit 2022-04-12 07:04:53 -04:00
Pilar
1bb471cbe8 changes in PYGUIDE.md and WINDOWS_INSTALL.md 2022-04-11 19:29:29 -04:00
Guillermo Gutierrez Morote
c876e3d74b Merge branch 'heat_pump' into 'master'
Changed return type

See merge request Guille/libs!10
2022-04-11 22:59:25 +00:00
d062c5654e change back city object name as readonly, add new property human_readable_name for building 2022-04-11 14:53:22 -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
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