m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity
288 Commits 3 Branches 83 Tags 229 MiB
fa83e195c4
Commit Graph

288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pilar
9a134e94c2 Merge remote-tracking branch 'origin/master' 2020-12-01 17:19:29 -05:00
pilar
f0d6176bab solved one bug 2020-12-01 17:19:21 -05:00
Guille
38b050ab6b Merge remote-tracking branch 'origin/master' 2020-12-01 16:29:27 -05:00
Guille
2c0c30ad33 Remove debug message 2020-12-01 16:29:20 -05:00
pilar
7891e5450e new way of calculating surface finished 2020-12-01 16:28:24 -05:00
pilar
024e47fe0c Merge remote-tracking branch 'origin/master' 2020-12-01 16:03:09 -05:00
pilar
b3eeb7f4dc new way of calculating surface 2020-12-01 16:02:56 -05:00
Guille
534fdc1ee7 Remove debug message 2020-12-01 07:35:13 -05:00
Guille
be31e9517a Lod2 import for citygml 2020-12-01 07:33:53 -05:00
Guille
33725e8b74 Lod2 import for citygml 2020-12-01 07:33:23 -05:00
pilar
09f8515ee4 print points 2020-11-27 12:12:41 -05:00
Guille
834ba822d2 Partial implementation for non-triangular surfaces 2020-11-27 11:47:54 -05:00
Guille
38639d8ff9 Merge remote-tracking branch 'origin/master' 2020-11-27 11:31:56 -05:00
Guille
5bfac5b01b Partial implementation for non-triangular surfaces 2020-11-27 11:31:25 -05:00
pilar
6cccb18cd1 fixing format and cleaning todos 2020-11-26 09:26:55 -05:00
pilar
5adcd7dbf3 Just formatting 2020-11-26 06:34:11 -05:00
Guille
9f4dc2680d Remove debug test and add new buildings.gml to the test_data 2020-11-20 05:53:15 -05:00
Guille
bb9ecf11c0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	tests/test_idf.py
 2020-11-18 09:05:27 -05:00
Guille
cb24c7119b Add the occupancy to the data model 2020-11-18 08:58:37 -05:00
Soroush
d34d4395c1 Add occupancy modified 1 2020-11-18 02:28:29 -05:00
Guille
6a5e39fba6 Merge changes for conflict solving and remove debug messages 2020-11-16 09:42:43 -05:00
Guille
ce2c873aa0 Merge changes for conflict solving and remove debug messages 2020-11-12 13:57:15 -05:00
Guille
d91a726ba4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	helpers/idf_helper.py
 2020-11-12 13:53:05 -05:00
Soroush
c9d30c6ca4 Adding occupancy, lighting, and infiltration 2020-11-13 01:37:53 -05:00
Guille
fcbee21199 Bugfixing in idf_helper, changing the method exposure so now adding surfaces add materials and layers automatically, added surface getter for ThermalBoundary 2020-11-12 13:50:43 -05:00
Soroush
ad9b40be48 Adding materials and construction 2020-11-11 19:39:51 -05:00
pilar
62e561824b added usage unittest 2020-11-06 05:40:17 -05:00
pilar
8ad203bc90 added four more properties to usage_zone.py that can be extracted from de_library.xml 2020-11-06 05:32:19 -05:00
Guille
e535bf8280 Add atributes for constructions materials and layers 2020-11-05 12:18:29 -05:00
Guille
794f41262b Add atributes for constructions materials and layers 2020-11-05 11:45:39 -05:00
Guille
7ffe395aa9 Add atributes for constructions materials and layers 2020-11-05 11:11:43 -05:00
Guille
bec5d38c4a add 20 buildings.gml to the test path 2020-11-04 11:58:37 -05:00
Guille
93a35d359c Fix broken unit test, change test gml file to 20 buildings instead 2 and correct physic path so standard library is used instead custom one 2020-11-04 11:56:57 -05:00
Guille
3c79c2288c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	requirements.txt
 2020-11-04 08:59:27 -05:00
Guille
75ff0bd800 Corrected IDF helper, there are a bug related to the ep+ can not be executed directly from python in linux (more test are needed) a possible work around it's to call the console directly instead using "run function" 2020-11-04 08:54:10 -05:00
pilar
1080f06d59 added residential types to library copying them from mid-rise apartment. This needs to be changed 2020-11-03 06:38:39 -05:00
pilar
96ec16a6b8 modified files to include occupancy schedules and create yearly schedules from typical week days 2020-11-02 13:41:42 -05:00
pilar
ec5b5f626c small changes to fit weather_factory idea 2020-10-30 16:01:12 -04:00
pilar
816ad2c7f5 small changes to fit weather_factory idea 2020-10-30 13:47:59 -04:00
pilar
584640ab6e modified hourly/monthly values in building.py to reduce number of properties using dictionaries 2020-10-30 08:32:38 -04:00
pilar
3a22e7afff finished test_weather_factory.py 2020-10-30 08:25:36 -04:00
pilar
b17bab8df7 error in test_weather_factory.py 2020-10-30 06:23:29 -04:00
pilar
5c4f323e76 erased folders in factories 2020-10-29 08:16:48 -04:00
pilar
094e95f221 Merge remote-tracking branch 'origin/master' 2020-10-29 07:40:57 -04:00
pilar
f4ea7686a5 first version of weather factory and related files 2020-10-29 07:40:40 -04:00
Guille
97344e0248 Correct class and file names to match CERC coding rules 2020-10-28 14:05:45 -04:00
Guille
bf952d88e4 Correct paths and unittest errors caused by refactoring 2020-10-28 13:57:56 -04:00
pilar
b3f8647036 modified structure 2020-10-28 13:42:58 -04:00
pilar
94c593b651 created weather_factory but not completed 
re-structured weather.py file accordingly (now in weather_factory.helpers
 2020-10-28 13:14:05 -04:00
Guille
c1b7d346bd Idf surfaces connection 2020-10-28 12:20:13 -04:00