Commit Graph

111 Commits

Author SHA1 Message Date
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
b222e76402 Merge branch 'master' into bug_in_idf_exporter_wwr
# Conflicts:
#	city_model_structure/city.py
2022-12-01 15:14:35 -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
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
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
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
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
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
e9b50beea8 merche main branch changes 2022-11-21 14:21:43 -05:00
b357e4d6c7 Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	unittests/test_geometry_factory.py
2022-11-21 14:12:18 -05:00
6be5325f75 Correct unit tests due latest changes in gpandas handler.
Partial rollback of some changes
2022-11-21 13:53:58 -05:00
Pilar
ac9b51b8b9 Temporary fixed in geopandas importer 2022-11-21 11:31:30 -05:00
Pilar
7a358806f3 starting with the nrcan_usage_parameters class. Not working! 2022-11-21 11:03:28 -05:00
c090fd8025 Add geojson test 2022-11-17 11:38:31 -05:00
a617f598ff Add unit tests and requirements for geopandas factory.
Geopandas factory now can receive a geojson file or a pandas data frame by using the optional variable data_frame in the constructor to be consistent with the rest of the factories

So from:
 ConstructionFactory('gpandas', dataframe)
to:
 ConstructionFactory('gpandas, '', dataframe)
2022-11-16 16:26:45 -05:00
7e5ead2363 small style correction 2022-11-15 11:25:38 -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
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
Guillermo Gutierrez Morote
b81f55b5e5 Merge branch 'fixing_unittests_realted_to_changes_by_PMAU' into 'master'
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

See merge request Guille/hub!28
2022-11-07 20:06:48 +00:00
448845a234 IDF export improvement.
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-07 15:04:51 -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
97f45f1b13 Unit tests corrections 2022-06-08 13:02:24 -04:00
920d95eef2 Citygml can now generate the envelop out of the buildings 2022-06-07 13:31:35 -04:00
dd3fc42d10 Merge remote-tracking branch 'origin/master' 2022-05-19 14:26:38 -04:00
e996bfb5bf completed parser for the data sources 2022-05-19 14:24:24 -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
9b3241e1d7 partial parser for data sources 2022-05-17 22:22:40 -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
Pilar
1aeca13e01 greenery added to idf exporter and unittest created 2022-05-16 09:35:19 -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