Commit Graph

127 Commits

Author SHA1 Message Date
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
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
c629b8484f added possibility of defining windows in idf exporter with a wwr 2022-12-01 11:47:21 -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
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
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
Pilar
157f7fa2cb monthly energy balance exporter v1.0
No unittest created yet
2022-11-23 16:34:48 -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
b47a21dbfa Remove custom idd 2022-11-17 11:26:18 -05:00
bacd6bab20 correct typo 2022-11-16 19:44:59 -05:00
3b598de4d7 Add up to 154 vertex per polygon 2022-11-16 19:19:52 -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
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
96afcee56e changed vegetation from thermal boundary to surface 2022-11-08 15:57:50 -05: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
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
e5e75bfe24 Merge remote-tracking branch 'origin/master' 2022-06-09 11:02:50 -04:00
98769670d9 Correct schedules duplication bug 2022-06-09 11:02:45 -04:00
Pilar
07a925b46b erased a print 2022-06-08 17:22:17 -04:00
920d95eef2 Citygml can now generate the envelop out of the buildings 2022-06-07 13:31:35 -04:00
Pilar
6c8b8ec35b Found a bug in comnet factory and modified type of data from temperature to any number 2022-06-06 13:37:48 -04:00
Pilar
a6e239bb45 Found a bug in comnet factory and modified type of data from temperature to any number 2022-06-01 23:17:04 -04:00
Pilar
1aeca13e01 greenery added to idf exporter and unittest created 2022-05-16 09:35:19 -04:00
Pilar
43aaf79cb6 new branch to add greenery to idf exporter 2022-05-12 10:46:08 -04:00
Pilar
fc733eb950 erased a not wanted print 2022-05-02 15:18:52 -04:00
Pilar
d0fa0c1f8a windows included in idf export 2022-05-02 15:02:06 -04:00
Pilar
9c3ac59866 Merge branch 'master' into installation_in_macos 2022-04-28 14:44:42 -04:00
Pilar
0e7acd89d1 looking for a bug 2022-04-28 14:34:23 -04:00
Peter Yefi
574cc2e11c Updated file 2022-04-28 10:33:29 -04:00
Pilar
88c0e9fa5f modifications in idf to import more complex schedules and schedules by file 2022-04-26 18:39:42 -04:00
Guillermo Gutierrez Morote
c876e3d74b Merge branch 'heat_pump' into 'master'
Changed return type

See merge request Guille/libs!10
2022-04-11 22:59:25 +00:00
Peter Yefi
5e69e0f28a Deleted cached files 2022-04-08 14:01:46 -04:00
Peter Yefi
c04a5c5925 Changed return type 2022-04-08 13:39:27 -04:00
Peter Yefi
be10bc81f1 Changed air source filename. Cleanup 2022-04-08 13:38:32 -04:00
0592f2ce04 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	exports/formats/idf.py
2022-04-08 09:36:53 -04:00
920cb3015a License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading 2022-04-08 09:35:33 -04:00
Pilar
5e51947d6a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	city_model_structure/building_demand/usage_zone.py
#	unittests/test_usage_factory.py
2022-04-07 16:52:34 -04:00
Pilar
684238a3ff Thermal zone concept modified. Now it includes all usage parameters associated to that thermal zone 2022-04-06 16:06:55 -04:00
0c92e6e4ad Fixing libs wrong commit 2022-03-30 13:26:31 -04:00
Pilar
cf19f6fce5 fixed bug saving values 2022-03-24 18:43:55 -04:00
f2ff10ad47 Merge remote-tracking branch 'origin/master' into heat_pump
# Conflicts:
#	city_model_structure/city.py
#	city_model_structure/energy_system.py
#	city_model_structure/fuel.py
#	city_model_structure/machine.py
#	city_model_structure/vehicle.py
#	data/life_cycle_assessment/lca_data.xml
#	exports/energy_systems_factory.py
#	helpers/constants.py
#	helpers/yearly_from_daily_schedules.py
#	imports/energy_systems/air_source_hp_parameters.py
#	imports/geometry/rhino.py
#	imports/geometry_factory.py
#	imports/life_cycle_assessment/lca_fuel.py
#	imports/life_cycle_assessment/lca_machine.py
#	imports/life_cycle_assessment/lca_vehicle.py
#	imports/life_cycle_assessment_factory.py
#	requirements.txt
#	unittests/test_life_cycle_assessment_factory.py
2022-03-17 14:34:11 -04:00
Peter Yefi
73593744b7 Modified coefficient computation for water to water hp 2022-03-17 10:37:47 -04:00
c8c4a681e3 Fixing bugs in idf export 2022-03-16 13:21:51 -04:00
Peter Yefi
a8e44d5e30 Fixed issue with additional column for tech performance during series air source run 2022-03-11 10:18:33 -05:00
Peter Yefi
380c6644a3 Changed how coefficients are generated 2022-03-10 12:44:04 -05:00
993233aff9 Small bug fixing in greenery catalog and energy_systems_factory.py 2022-03-09 17:02:12 -05:00