Commit Graph

339 Commits

Author SHA1 Message Date
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
88c0e9fa5f modifications in idf to import more complex schedules and schedules by file 2022-04-26 18:39:42 -04:00
Pilar
e2b882723b Modified construction factory to read from catalogs instead of file 2022-04-19 15:49:41 -04:00
Pilar
61649a69d0 added CONTRIBUTING_CENTRAL_DATA_MODEL.md file 2022-04-13 19:26:44 -04: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
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
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
ee8549bf98 Correct import issue 2022-04-04 08:37:21 -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
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
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
Peter Yefi
99a0ac0bce Removed unneeded attributes 2022-03-10 12:42:12 -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
49bfc6eec9 Rhino implementation partially completed, need to be fully tested 2022-02-16 15:08:05 -05:00
Peter Yefi
f728685c65 Renamed certain variables and added comments for insel required coefficients 2022-01-26 10:40:14 -05:00
Peter Yefi
ecc8bfcbb1 Added comments for a and b insel coefficient values 2022-01-26 10:39:26 -05:00
Peter Yefi
ddbc047640 Fixed and merged conflicts 2021-12-15 09:30:53 +00:00
Peter Yefi
1ed60762c3 Added water to water heat pump model 2021-12-15 09:22:44 +00:00
Peter Yefi
d703b8c8cf Made heat pump a parent class for air source and water to water sources heat pumps 2021-12-15 09:22:20 +00:00
Peter Yefi
680b635025 changed heat_pump to air source to reflect data source 2021-12-15 09:20:08 +00:00
Peter Yefi
02882f5e1c Added water to water heat pump 2021-12-15 09:19:10 +00:00
atiya
02d120add9 Contributors added in LCA code 2021-11-22 20:57:29 -05:00
atiya
dff87c2390 LCA materials XML 2021-11-18 17:13:27 -05:00
Pilar
e3a5d73c38 just making material parameters optional 2021-11-18 17:02:19 -05:00
Pilar
be0db6d347 extra material deleted 2021-11-18 16:57:27 -05:00
atiya
01ff8ddcf3 LCA materials XML 2021-11-18 16:55:49 -05:00
d2d86bc942 Test driven partial corrections 2021-11-16 12:27:49 -05:00
155daa47b7 Correct merge mistake 2021-11-16 07:37:27 -05:00
atiya
d76ea58b74 Added LCA formulas 2021-11-15 11:07:16 -05:00
atiya
cc56c19aa0 added Machine and Vehicle classes to Life Cycle Assessment 2021-11-15 11:07:16 -05:00
Pilar
068a780ebb Added comnet usage library, including import factory. Some modifications on internal_gains.py and hft_internal_gains_archetypes.py were required. Also created a class to pass from daily schedules to yearly schedule. 2021-11-15 11:07:15 -05:00