Commit Graph

107 Commits

Author SHA1 Message Date
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
Peter Yefi
dd26fb6fd5 Changed boolean simulation type indicator 2022-03-03 13:48:02 -05:00
Peter Yefi
883461782c Added option for running series or parallel simulation 2022-02-26 11:47:23 -05:00
Peter Yefi
e692f99316 Removed deprecated pandas method 2022-02-17 13:56:42 -05:00
49bfc6eec9 Rhino implementation partially completed, need to be fully tested 2022-02-16 15:08:05 -05:00
Peter Yefi
7f21cc22c3 Added Reactivation and Deactivation Temps 2022-02-02 07:03:22 -05:00
Peter Yefi
81bb8a1795 Added additional parameter to method for running insel 2022-01-29 09:42:34 -05:00
Peter Yefi
aa7463cb9d Added separate classes of water to water and air source hp. Refactored energy systems factory 2022-01-26 10:42:01 -05:00
Peter Yefi
bc762e4844 Added export method to export factory 2021-11-12 10:16:22 +00:00
Peter Yefi
a06ad62ec7 Added parameter for caller to specify output file path 2021-11-12 10:14:54 +00:00
Peter Yefi
b7d1197a2b Added method to write user output 2021-11-10 16:58:01 +00:00
Peter Yefi
f6de5b6f96 Modified export_heat_pump to run insel instead of exporting to CSV 2021-11-10 10:14:31 +00:00
Peter Yefi
c7d569b688 Added methods to run insel and write output files 2021-11-10 10:13:17 +00:00
Peter Yefi
45f682767d Added heatpump export module 2021-11-08 16:33:24 +00:00
Peter Yefi
12f8beb0d2 Included energy system export factory 2021-10-29 15:28:10 +00:00
Peter Yefi
20ca5a0fc3 Included export for heat pump energy system 2021-10-29 15:27:25 +00:00
Peter Yefi
4eea12a069 Included scipy for heat pump coefficient computation 2021-10-29 15:25:53 +00:00
fde837150d Small in the factories documentation 2021-09-22 07:25:53 -04:00
Pilar
c12643d1dd modified the exports_factory.py and related files to add the building list to be calculated with SRA. 2021-09-02 12:30:37 -04:00
1c8ffcfee0 Revert "Restore repo"
This reverts commit c60aca4c07
2021-08-27 21:31:49 +00:00
Pilar
c60aca4c07 Restore repo 2021-08-27 17:29:32 -04:00