Commit Graph

1365 Commits

Author SHA1 Message Date
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
8a4fdc0397 Partial implementation neighbours detection. 2023-02-23 06:56:13 -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
Guillermo Gutierrez Morote
804648a9f0 Merge branch 'nrcan_catalog_importer' into 'master'
Nrcan catalog importer

See merge request Guille/hub!57
2023-02-22 13:37:26 +00:00
Pilar
09f0c43ced Merge branch 'master' into nrcan_catalog_importer 2023-02-22 08:36:16 -05:00
Pilar
f741e03d88 Merge remote-tracking branch 'origin/master' 2023-02-22 08:36:04 -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
f1f29acc79 Remove commented code 2023-02-22 04:33:34 -05:00
Pilar
8469674b18 added nrcan catalog 2023-02-21 10:14:55 -05:00
7dbfdf188a Version 0.1.7.8 2023-02-21 10:04:02 -05:00
018c3d24a5 Bug fix in user info 2023-02-21 10:03:37 -05:00
30dbea0edc varsion 0.1.7.7 2023-02-21 09:42:26 -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
Pilar
bdc8598bc6 Merge remote-tracking branch 'origin/master' 2023-02-20 07:30:54 -05:00
Pilar
8ca95ddde0 implementing shared_surfaces method. Not working 2023-02-20 07:30:38 -05:00
b280949451 Add nrcan archetypes 2023-02-20 07:24:27 -05:00
Peter Yefi
f4ce207284 Saved local changes 2023-02-19 14:04:11 -05:00
Peter Yefi
bf10ba82a6 Saved local changes 2023-02-19 13:57:24 -05:00
Pilar
491cee92da implementing shared_surfaces method 2023-02-13 07:55:25 -05:00
9f579bf93a version 0.1.7.6 2023-02-13 07:02:26 -05:00
Guillermo Gutierrez Morote
749cb63267 Merge branch 'meb_bugging' into 'master'
modified meb exporter to accept mire than 200 surfaces

See merge request Guille/hub!55
2023-02-13 11:51:15 +00:00
Pilar
ef659b3798 modified meb exporter to accept mire than 200 surfaces 2023-02-13 06:49:55 -05:00
4621ed7b1a correct the path name 2023-02-13 06:12:07 -05:00
ce29d35af9 Merge remote-tracking branch 'origin/master' 2023-02-13 06:11:42 -05:00
Guillermo Gutierrez Morote
e9dc6226ba Merge branch 'meb_bug' into 'master'
modified meb exporter to accept mire than 200 surfaces

See merge request Guille/hub!54
2023-02-13 11:11:30 +00:00
Pilar
85e445ae96 modified meb exporter to accept mire than 200 surfaces 2023-02-13 06:08:55 -05:00
486a861477 small corrections 2023-02-13 05:17:25 -05:00
Guillermo Gutierrez Morote
794b9e1b85 Merge branch 'changing_triangulate' into 'master'
Changing triangulate

See merge request Guille/hub!53
2023-02-13 04:36:52 +00:00
Pilar
8876d1eafa Merge branch 'master' into changing_triangulate 2023-02-10 06:20:39 -05:00
Pilar
62d0fc23fd modified triangulation method 2023-02-10 06:09:48 -05:00
Pilar
074156f464 modified triangulation method 2023-02-10 05:43:04 -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
Guillermo Gutierrez Morote
e8d34e701c Merge branch 'more_errors_from_merge' into 'master'
More errors from merge

See merge request Guille/hub!52
2023-02-09 09:37:59 +00:00
Pilar
e66bac33ae Merge branch 'master' into more_errors_from_merge 2023-02-09 04:31:13 -05:00
Pilar
abc893ede0 erased two files that reappeared after a merge between branches with many changes 2023-02-09 04:30:38 -05:00
5ae78e7c00 version 0.1.7.5 2023-02-08 13:46:11 -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
d91b6edfff Add lod1 2023-02-07 07:40:28 -05:00
aa4b7829e4 Repair energy ade export 2023-02-07 07:20:36 -05:00
b85a111a11 Repair energy ade export 2023-02-07 06:16:08 -05:00