Commit Graph

246 Commits

Author SHA1 Message Date
Pilar
63b17e74b5 erased parameters of nomass materials in energyplus exporter not needed 2023-03-07 15:56:26 -05:00
Pilar
ffc956b2d0 a bug in usage -> division by 0 2023-03-07 15:03:24 -05:00
Peter Yefi
c0c3dc4694 Updated branch with master origin 2023-03-01 20:42:23 -05:00
34172055a6 Store the meb as float 2023-02-24 15:49:40 -05:00
274c8f0f8e Correct bug in insel meb import 2023-02-24 15:33:53 -05:00
43030626ce Correct bug in insel meb import 2023-02-24 15:24:08 -05:00
Pilar
ca5bcfc93c changed strings in dictionary to cte.NAMES 2023-02-24 14:31:44 -05:00
2af1bf2e40 Merge remote-tracking branch 'origin/master' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-02-24 07:21:14 -05:00
e070ee5779 Merge remote-tracking branch 'origin/mapping'
# Conflicts:
#	hub/imports/geometry/citygml.py
2023-02-24 07:11:33 -05:00
48fbeb488f Neighbours mapping completed. 2023-02-24 07:10:13 -05:00
Pilar
49d178faa3 Merge branch 'master' into bug_in_nrcan_construction_importer 2023-02-23 15:46:02 -05:00
Pilar
6f58f22638 a bug in citygml importer. 'yearOfConstruction' not recognized 2023-02-23 15:45:50 -05:00
511361b70b Correct bug in citygml year_of_construction field default value 2023-02-23 15:40:09 -05:00
Pilar
66f0e4e32b a bug in nrcan importer 2023-02-23 15:26:34 -05:00
Pilar
e04b713416 Merge branch 'mapping' into shared_surfaces_method 2023-02-23 07:04:06 -05:00
Pilar
776a54d7b5 Merge remote-tracking branch 'origin/mapping' into shared_surfaces_method 2023-02-23 06:57:28 -05:00
Pilar
b437cdf290 partially implemented shared walls 2023-02-23 06:57:14 -05:00
Peter Yefi
0ab96ec226 Completed changes for new models 2023-02-22 22:45:33 -05:00
Peter Yefi
a06eced6f4 Modified city merge function in city 2023-02-22 20:17:04 -05:00
Pilar
09f0c43ced Merge branch 'master' into nrcan_catalog_importer 2023-02-22 08:36:16 -05:00
Pilar
ee495bf41a added nrcan catalog 2023-02-22 08:35:45 -05:00
Pilar
536a3fe414 added nrcan catalog 2023-02-22 08:31:14 -05:00
f10830dce2 Merge remote-tracking branch 'origin/master' 2023-02-21 09:41:37 -05:00
580ff5c63c user_login method and bug fix
- Now the geojson missing functions will not crah
- Now a user can login directly with application_uuid, user and password
2023-02-21 09:41:26 -05:00
Guillermo Gutierrez Morote
c348fb0134 Merge branch 'hp_results' into 'master'
Hp results

See merge request Guille/hub!56
2023-02-21 04:38:47 +00:00
KoaCWells
9209cf624a Fix import/export user factories, update repository/user.py for proper StartSession API call, fix setup.py 2023-02-20 22:12:01 -05:00
Peter Yefi
c3f4c27811 Added heat pump energy demand and fossil fuel consumption results 2023-02-20 18:36:34 -05:00
b280949451 Add nrcan archetypes 2023-02-20 07:24:27 -05:00
486a861477 small corrections 2023-02-13 05:17:25 -05:00
Pilar
a258d33dc9 modified triangulation method 2023-02-10 05:42:57 -05:00
Pilar
b61722db2e cleaned some todos 2023-02-09 05:29:53 -05:00
22cbede8d5 Added the full functionality to create meb 2023-02-08 13:40:06 -05:00
11e8949b30 Added the importer for sra results 2023-02-07 13:01:49 -05:00
16adfaa1a8 Full implementation of basic persistence tasks for the one_shot admin tool. 2023-02-02 13:00:58 -05:00
f99b8497ff Persistence up and running with basic app applicartion 2023-02-02 06:12:24 -05:00
Pilar
4980fa8c95 erased not used classes 2023-01-27 10:34:28 -05:00
Pilar
3e46da13d4 erased not used classes 2023-01-26 09:02:22 -05:00
Pilar
c61dca2fe6 from usage_zone to usage 2023-01-26 08:53:00 -05:00
1b47ea64b5 Clean up:
Some old not implemented classes have been removed
Some pep8 improvements done too
2023-01-26 07:41:56 -05:00
4e0b17d7ee Correct the mistakes during the merge.
Now everithing should work as expected.
One minor improvement in the error function for the factories.
2023-01-26 06:35:55 -05:00
ff4fef17fb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	hub/catalog_factories/construction_catalog_factory.py
#	hub/imports/construction_factory.py
#	hub/imports/usage_factory.py
2023-01-26 05:23:22 -05:00
2ebec93ab4 Merge disaster:
I do expect a lot of errors in this merge, this will be review later on, please don't rebase into this one
2023-01-26 05:21:34 -05:00
Peter Yefi
d04906306e Included checks for import handlers and types 2023-01-25 19:13:00 -05:00
ec9878eaf8 Remove unwanted print 2023-01-25 06:39:03 -05:00
b4b75b5e12 Small correction in unittests 2023-01-25 06:38:08 -05:00
9700e5ce21 packaging version 2023-01-24 10:51:50 -05:00