Commit Graph

1351 Commits

Author SHA1 Message Date
Peter Yefi
2d301853d6 Added logging to persistence 2022-12-14 17:49:29 -05:00
Peter Yefi
bf66069e3a Fixed error with setup 2022-12-08 20:55:12 -05:00
Peter Yefi
4693edd5e8 Added user authentication capabilities to hub 2022-12-08 20:54:47 -05:00
Peter Yefi
23ce8665a2 Added documentation for database setup 2022-12-07 19:06:17 -05:00
Pilar
4080b0ad8f bug in function assignment. Dictionaries must be reviewed 2022-12-07 11:04:04 -05:00
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
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
Guillermo Gutierrez Morote
197ab4cbf0 Merge branch 'monthly_energy_balance' into 'master'
Monthly energy balance

See merge request Guille/hub!42
2022-12-06 19:21:56 +00: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
Guillermo Gutierrez Morote
2dbaaefd74 Merge branch 'bug_in_idf_exporter_wwr' into 'master'
Bug in idf exporter wwr

See merge request Guille/hub!43
2022-12-01 20:17:57 +00: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
Guillermo Gutierrez Morote
610bcfcb80 Merge branch 'bugs_in_meb_exporter' into 'master'
Bugs in meb exporter

See merge request Guille/hub!42
2022-12-01 20:12:45 +00: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
8d8bc07533 added possibility of defining windows in idf exporter with a wwr 2022-12-01 15:07:24 -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
Peter Yefi
c50b202e5d Included creation and dropping of test db for the tests 2022-11-25 18:21:09 -05:00
Guillermo Gutierrez Morote
553257c720 Merge branch 'lod' into 'master'
Lod

See merge request Guille/hub!41
2022-11-25 20:33:34 +00:00
dd7bd337dd Correct bug in Gml Lod 2022-11-25 15:32:31 -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
5b932a8ac6 Bug fix in geojson import 2022-11-25 14:39:35 -05:00
2e9fa9f1b7 Merge correction 2022-11-25 12:50:23 -05:00
629d73662b Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	unittests/test_doe_idf.py
#	unittests/test_geometry_factory.py
2022-11-25 12:49:39 -05:00
a0485c576b Partial corretion geojson importer 2022-11-25 12:49:09 -05:00
677b021e23 Partial corretion geojson importer 2022-11-25 12:40:13 -05:00
245c218e1f Merge remote-tracking branch 'origin/master' into geojson 2022-11-25 12:39:47 -05:00
Guillermo Gutierrez Morote
3be8de5cd1 Merge branch 'insel_exporter' into 'master'
Insel exporter

See merge request Guille/hub!40
2022-11-25 17:37:49 +00:00
Pilar
07e2ee9773 reorganized the exports factories 2022-11-25 12:34:11 -05:00
Pilar
f387a4be4e monthly energy balance exporter with unittest created 2022-11-25 11:19:06 -05:00
b5dd5bf7ed initial implementation of Geojson importer
Bug correction overall code quality improvement
2022-11-24 17:58:45 -05:00
Pilar
157f7fa2cb monthly energy balance exporter v1.0
No unittest created yet
2022-11-23 16:34:48 -05:00
e8e4b8d236 partial correction of water to water unittest 2022-11-23 10:53:09 -05:00
1e24e43b64 Refactoring building creation and bringing code up to date 2022-11-23 10:20:33 -05:00
Peter Yefi
4d01eeba50 Fixed issue with insel path 2022-11-23 10:10:07 -05:00
Peter Yefi
27456ffddd Added heat pump simulation persistence 2022-11-22 20:20:12 -05:00
Peter Yefi
7974317d13 Merge branch 'hp_energy_demand' into db_persistence 2022-11-22 17:49:09 -05:00
Peter Yefi
30f56c4630 Added a model and repo for hp simulation 2022-11-22 17:49:02 -05:00
Guillermo Gutierrez Morote
f6e049563f Merge branch 'erase_schedules_importer' into 'master'
small bug fixed

See merge request Guille/hub!37
2022-11-21 21:03:32 +00:00
Pilar
9e38be1b2f Merge branch 'master' into fixed_small_bug_in_thermal_zone
# Conflicts:
#	unittests/test_schedules_factory.py
2022-11-21 14:59:46 -05:00
Pilar
87d95a14e6 small bug found 2022-11-21 14:58:32 -05:00