Commit Graph

385 Commits

Author SHA1 Message Date
Pilar
c0e60f27c7 completed NRCAN usage catalog importer and NRCAN usage importer
started NRCAN construction catalog importer and NRCAN construction importer but not working!
2022-12-15 07:42:59 -05:00
Pilar
b34b07b161 added nrcan importer
usage importer now reads from catalogs
2022-12-07 10:54:28 -05:00
Pilar
1f3320c02a cleaning not used classes 2022-12-06 15:28:59 -05: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
a8d3faabc3 added electrical demand attributes to the building 2022-12-06 14:18:36 -05:00
Pilar
db30870fc1 change units in monthly energy balance exporter 2022-12-01 15:33:14 -05:00
Pilar
b222e76402 Merge branch 'master' into bug_in_idf_exporter_wwr
# Conflicts:
#	city_model_structure/city.py
2022-12-01 15:14:35 -05:00
Pilar
82cb38098d Merge branch 'master' into bugs_in_meb_exporter 2022-12-01 15:11:30 -05:00
520a07e48b small test correction 2022-12-01 15:07:49 -05:00
Pilar
c629b8484f added possibility of defining windows in idf exporter with a wwr 2022-12-01 11:47:21 -05:00
Pilar
306030d028 added soil layer to ground surfaces 2022-11-28 15:26:31 -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
67227a0a79 merge changes with main 2022-11-28 13:44:02 -05:00
8c6e34cd22 Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	city_model_structure/building.py
#	city_model_structure/bus_system.py
#	city_model_structure/city_object.py
#	city_model_structure/city_objects_cluster.py
#	city_model_structure/energy_system.py
#	imports/energy_systems/air_source_hp_parameters.py
#	imports/energy_systems/water_to_water_hp_parameters.py
#	imports/geometry/citygml.py
#	imports/geometry/gpandas.py
#	imports/geometry/obj.py
#	imports/geometry/rhino.py
#	imports/geometry_factory.py
2022-11-28 13:13:55 -05:00
a0445200a5 assign lod at city level and correct unit tests 2022-11-25 15:25:59 -05:00
5dc471dd2a base classes for lod at city level 2022-11-25 15:03:27 -05:00
de2a319727 Initial commit for lod branch 2022-11-25 14:45:03 -05:00
245c218e1f Merge remote-tracking branch 'origin/master' into geojson 2022-11-25 12:39:47 -05:00
b5dd5bf7ed initial implementation of Geojson importer
Bug correction overall code quality improvement
2022-11-24 17:58:45 -05:00
1e24e43b64 Refactoring building creation and bringing code up to date 2022-11-23 10:20:33 -05:00
Pilar
87d95a14e6 small bug found 2022-11-21 14:58:32 -05:00
Pilar
7a358806f3 starting with the nrcan_usage_parameters class. Not working! 2022-11-21 11:03:28 -05:00
Guillermo Gutierrez Morote
15eea30d81 Merge branch 'updating_central_data_model' into 'master'
Updating central data model

See merge request Guille/hub!31
2022-11-10 19:20:27 +00:00
Pilar
686b04cb6c new system classes added 2022-11-09 16:19:56 -05:00
Pilar
e9559a8485 finished the reorganization between thermal boundaries and surfaces 2022-11-09 14:22:26 -05:00
6473ffd6dc Homogenize todos
IDF export now allows the user to select the target and adjacent buildings
 - Only target and adjacent buildings in the city are calculated.
 - All other buildings are considered shade objects.

The zones are properly labeled with the building name
The "Building" is labeled as a city
2022-11-09 11:42:06 -05:00
Pilar
f5fe1fd4d9 added associated_thermal_boundaries to Surface 2022-11-08 16:28:07 -05:00
Pilar
96afcee56e changed vegetation from thermal boundary to surface 2022-11-08 15:57:50 -05:00
Pilar
406e04ccf8 ca is not a usage library anymore, it has been erased from test
internal gains are calculated from occupancy and so again for monthly energy balance calculations
2022-11-07 11:49:59 -05:00
Pilar
3284215b5b Merge remote-tracking branch 'origin/master' 2022-10-28 17:47:17 -04:00
Pilar
ba35ce361b solved a bug found in the thermal zone when creating the classes related to the usage 2022-10-28 17:46:53 -04:00
c621e33466 Add method to merge cities 2022-10-20 11:34:22 -04:00
Pilar
e3acabeb74 fixing bug in test_enrichment.py 2022-06-08 16:22:12 -04: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
3bf674d107 now schedules are re-calculated on change 2022-06-08 12:55:37 -04:00
2799de760d thermal zone now uses an internal flag to select where usage_zones need to be taken from parent or from the own usage_zones 2022-06-08 10:00:29 -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
Pilar
ea040e83df Solved a bug in thermal_zone 2022-05-27 12:42:17 -04:00
dd3fc42d10 Merge remote-tracking branch 'origin/master' 2022-05-19 14:26:38 -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
fbf6005748 Merge remote-tracking branch 'origin/master' into usage_catalog 2022-05-16 17:33:26 -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
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
c28e1ba176 Correct rhino read 2022-05-09 22:42:51 -04:00
f53beb4a0a Correct rhino read 2022-05-04 05:09:43 -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
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