6c54e82ea3
Merge remote-tracking branch 'origin/db_persistence'
...
# Conflicts:
# helpers/enrich_city.py
2023-01-16 04:36:51 -05:00
Peter Yefi
f875411347
Added user referenc to city creation
2023-01-11 16:02:33 -05:00
Guillermo Gutierrez Morote
4bf2ff4ff0
Merge branch 'master' into 'db_persistence'
...
# Conflicts:
# .gitignore
# city_model_structure/city.py
# requirements.txt
# unittests/test_energy_systems_water_to_water_hp.py
2023-01-09 21:36:44 +00:00
Peter Yefi
23ce8665a2
Added documentation for database setup
2022-12-07 19:06:17 -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
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
Peter Yefi
c50b202e5d
Included creation and dropping of test db for the tests
2022-11-25 18:21:09 -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
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
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
ac53ce2f4d
Merge remote-tracking branch 'origin/master' into nrcan
2022-11-21 14:02:01 -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
1db5b02847
partial completion of nrcan catalog
2022-11-21 12:46:39 -05:00
Pilar
ac9b51b8b9
Temporary fixed in geopandas importer
2022-11-21 11:31:30 -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
Peter Yefi
43d7d1ee77
Included tests, import and export for db operations
2022-11-15 20:48:42 -05:00
7e5ead2363
small style correction
2022-11-15 11:25:38 -05:00
60b725dad6
Partial nrcan usage implementation
2022-11-15 08:38:41 -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
Peter Yefi
175d772c24
Included an option for return dictionary when output file is None
2022-08-18 16:45:55 -04:00
Peter Yefi
04c56587a8
Added tests for parallel simulations
2022-08-16 13:48:43 -04:00
