Peter Yefi
|
169c79650e
|
Included message for wrong authentication
|
2023-01-17 19:53:46 -05:00 |
|
Pilar
|
5dd3e8c018
|
Merge remote-tracking branch 'origin/master'
|
2023-01-17 06:34:16 -05:00 |
|
Pilar
|
49b4ce5ef2
|
added a post-process in idf to erase windows associated to adiabatic walls
|
2023-01-17 06:34:00 -05:00 |
|
Guillermo Gutierrez Morote
|
c82134b04f
|
Merge branch 'db_persistence' into 'master'
Db persistence
See merge request Guille/hub!46
|
2023-01-17 06:01:46 +00:00 |
|
Peter Yefi
|
708075fd3c
|
create log file automatically if it doesn't exist
|
2023-01-16 14:11:08 -05:00 |
|
Peter Yefi
|
d3ab8d3531
|
Merge branch 'master' into db_persistence
|
2023-01-16 13:49:14 -05:00 |
|
Peter Yefi
|
6ba10b0e02
|
Removed .env
|
2023-01-16 13:48:01 -05:00 |
|
Pilar
|
17d4f3d8bc
|
prints for debug in unittest
|
2023-01-16 10:02:35 -05:00 |
|
Pilar
|
4098550b1b
|
fixed bug in idf.py: window construction gave errors
|
2023-01-16 09:22:18 -05:00 |
|
Pilar
|
78449d83be
|
Merge branch 'integrating_alkis_codes'
|
2023-01-16 08:23:11 -05:00 |
|
|
|
30f683ea9f
|
Correct merge error
|
2023-01-16 08:05:23 -05:00 |
|
|
|
a41ae23c20
|
Correct merge error
|
2023-01-16 07:57:16 -05:00 |
|
|
|
c66367fede
|
Correct merge error
|
2023-01-16 07:57:02 -05:00 |
|
Pilar
|
23cca13359
|
added city_layers_test.py, solved bugs in gpandas importer and idf exporter
|
2023-01-16 05:21:53 -05:00 |
|
|
|
6c54e82ea3
|
Merge remote-tracking branch 'origin/db_persistence'
# Conflicts:
# helpers/enrich_city.py
|
2023-01-16 04:36:51 -05:00 |
|
Peter Yefi
|
b405297f76
|
Fixed casing issues with roles
|
2023-01-13 18:42:11 -05:00 |
|
Peter Yefi
|
f875411347
|
Added user referenc to city creation
|
2023-01-11 16:02:33 -05:00 |
|
Peter Yefi
|
c434b5593f
|
fixed issued with role enum
|
2023-01-10 20:30:55 -05:00 |
|
Peter Yefi
|
db9f286992
|
Fixed issue with user persistence
|
2023-01-10 12:52:20 -05:00 |
|
Peter Yefi
|
6383a47aa0
|
Added user id reference to cities. Included updated timestamp
|
2023-01-10 12:26:08 -05:00 |
|
Peter Yefi
|
3dc74371f4
|
Added logging
|
2023-01-10 12:03:27 -05:00 |
|
Pilar
|
64fd59db73
|
changed parameter name 'sra' to 'simplified_radiosity_algorithm' in simplified_radiosity_algorithm exporter
|
2023-01-10 10:45:05 -05:00 |
|
Pilar
|
0605d5b4f6
|
updating the code to changes in hub (not finished -> not working)
|
2023-01-10 09:55:38 -05:00 |
|
Guillermo Gutierrez Morote
|
609ad59371
|
Merge branch 'db_persistence' into 'master'
Db persistence
See merge request Guille/hub!44
|
2023-01-09 21:56:46 +00: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 |
|
Pilar
|
2ffbf06ac5
|
centralized all dictionaries in helpers.dictionaries.py and reviewed all those from hub to something
|
2022-12-16 07:21:33 -05:00 |
|
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 |
|
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 |
|
