Commit Graph

1793 Commits

Author SHA1 Message Date
fdef2152d9 export to obj partial implementation 2023-03-16 10:51:41 -04:00
Pilar
64384876a4 updating costs catalog -> not completed 2023-03-16 10:06:32 -04:00
20b88fbccb Custom extrusion and volume calculation for Geojson 2023-03-15 14:21:38 -04:00
f0a07d9c0e Reintroduce debug information in the geometry_helper 2023-03-15 11:30:25 -04:00
9a7bc6644c Merge branch 'main' into shared_surfaces_method 2023-03-14 12:32:26 -04:00
26bac29b51 Merge pull request 'version 0.1.7.10' (#2) from g_gutierrez-patch-1 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/2
2023-03-14 11:41:10 -04:00
cdfda7a475 version 0.1.7.10 2023-03-14 11:41:00 -04:00
385d5a07e7 Merge pull request 'Correct small bug in merge city' (#1) from bug_in_merge_city into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/1
2023-03-14 11:30:53 -04:00
5637f219f8 Correct small bug in merge city 2023-03-14 11:28:34 -04:00
Pilar
6f6f3253a5 Merge branch 'main' into systems_catalog 2023-03-13 18:24:19 -04:00
Pilar
24a77d2c5b Merge branch 'main' into costs_catalog 2023-03-13 18:24:03 -04:00
Pilar
34477c6d8f updating costs catalog -> not completed 2023-03-13 18:23:35 -04:00
Peter Yefi
f7276d8c41 Added w2w output file 2023-03-13 17:30:30 -04:00
Peter Yefi
0d3d4a3ab9 Rounded global irradiance values. Removed tear down in water to water 2023-03-13 17:24:44 -04:00
658c44389e Version 0.1.7.9 2023-03-13 15:02:28 -04:00
ecb09edcfb Reintroduce function in business logic 2023-03-13 15:01:55 -04:00
a3a382dae9 Reintroduce function in business logic 2023-03-13 14:41:25 -04:00
Pilar
4cc9c2dcdb added dhw classes to catalogs and CDM including importers 2023-03-13 14:40:07 -04:00
fc25c12149 Partial correction of persistence business logic 2023-03-13 14:18:04 -04:00
Pilar
a0e52b3e8d added shared walls to geojson. geojson importer test raises an error because the surfaces are triangulated. It should be solved when extrusion is finished 2023-03-10 15:15:18 -05:00
Pilar
d198ac9141 Merge branch 'main' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-03-10 14:15:29 -05:00
Pilar
10acb712f1 Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-03-10 14:14:09 -05:00
Pilar
77743fea1c rolling back changes 2023-03-10 14:09:41 -05:00
Pilar
2ac1fd045b Merge remote-tracking branch 'origin/main' into main 2023-03-10 14:07:24 -05:00
591107f8cf Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
#	hub/unittests/test_geometry_factory.py
2023-03-10 14:05:53 -05:00
0ed6c2d935 Partial correction of persistence business logic 2023-03-10 14:04:00 -05:00
Pilar
44aed37ef4 Merge branch 'main' into shared_surfaces_method 2023-03-10 14:01:04 -05:00
Pilar
91e688d910 working test of percentage shared by walls 2023-03-10 14:00:51 -05:00
Pilar
ac0c4ea186 Merge remote-tracking branch 'origin/main' into main 2023-03-10 13:59:39 -05:00
7092e75a52 small test correction remove deprecated db_export calls 2023-03-10 12:22:28 -05:00
42a0d3887c small test correction 2023-03-10 12:13:56 -05:00
Pilar
28914a7402 working test of percentage shared by walls 2023-03-09 12:40:45 -05:00
Pilar
a72e0d11fd Merge remote-tracking branch 'origin/shared_surfaces_method' into main
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-03-09 12:38:52 -05:00
Pilar
ae423c51df working test of percentage shared by walls 2023-03-09 12:18:15 -05:00
53ae043d63 optimize imports 2023-03-09 11:11:34 -05:00
8ce25e7956 Merge remote-tracking branch 'origin/shared_surfaces_method'
# Conflicts:
#	hub/unittests/test_geometry_factory.py
2023-03-09 11:10:47 -05:00
fdb9f4d834 Correct bug in geojson naming 2023-03-08 15:29:16 -05:00
bfc3f84c09 Complete neighbours detection (with shared lines) 2023-03-08 14:25:11 -05:00
fc2add511a Complete neighbours detection (with shared lines) 2023-03-08 14:24:48 -05:00
Pilar
d0cfa90dfe Merge branch 'master' into shared_surfaces_method 2023-03-08 09:16:56 -05:00
Pilar
5be2e8f1d9 Merge remote-tracking branch 'origin/master' 2023-03-08 09:13:55 -05:00
Guillermo Gutierrez Morote
50b4db4d69 Merge branch 'solving_a_bug_from_ep_workflow' into 'master'
Solving a bug from ep workflow

See merge request Guille/hub!62
2023-03-07 21:16:25 +00:00
Pilar
63b17e74b5 erased parameters of nomass materials in energyplus exporter not needed 2023-03-07 15:56:26 -05:00
Pilar
960abd44e4 Merge remote-tracking branch 'origin/master' 2023-03-07 15:04:35 -05:00
Pilar
0378d60100 Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method 2023-03-07 15:04:27 -05:00
Pilar
ffc956b2d0 a bug in usage -> division by 0 2023-03-07 15:03:24 -05:00
35ed9050e6 Merge remote-tracking branch 'origin/master' 2023-03-06 17:03:55 -05:00
3b23e9ffd4 Skip if unknown 2023-03-06 17:03:47 -05:00
Pilar
f91fda80e9 Merge remote-tracking branch 'origin/master' 2023-03-06 15:58:20 -05:00
Guillermo Gutierrez Morote
47db683eea Merge branch 'hp_results' into 'master'
Hp results

See merge request Guille/hub!61
2023-03-06 14:13:12 +00:00