Commit Graph

195 Commits

Author SHA1 Message Date
dd3fc42d10 Merge remote-tracking branch 'origin/master' 2022-05-19 14:26:38 -04:00
15c1c1235f partial parser for data sources 2022-05-18 22:51:55 -04:00
Pilar
9350013af9 erased not_detailed_source_mean_annual_internal_gains parameter and changed by internal_gains. During the import, for those catalogs that don't provide that information, the internal_gains are calculated and saved depending on the information they provide. 2022-05-18 14:52:41 -04:00
Pilar
9013dda26b modified usage zone class to hide not_detailed_source_mean_annual_internal_gains 2022-05-16 10:19:03 -04:00
f53beb4a0a Correct rhino read 2022-05-04 05:09:43 -04:00
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