Commit Graph

513 Commits

Author SHA1 Message Date
SanamDabirian
ab61e8b244 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	city_model_structure/building.py
2020-10-20 14:04:56 -04:00
SanamDabirian
0848339725 Add schedule_value class for occupancy 2020-10-20 11:28:21 -04:00
pilar
dc48e98bde error solved in occupancy.py 2020-10-19 14:32:48 -04:00
pilar
68c37512ec small change in monthly_to_hourly_demand.py 2020-10-19 14:28:38 -04:00
pilar
bb0408c26e constants.py moved from MEB and monthly_to_hourly_demand.py created but not finished 2020-10-19 12:47:04 -04:00
pilar
799313cea1 Merge remote-tracking branch 'origin/master' 2020-10-19 12:46:54 -04:00
Guille
9cbcea5fd5 Remove deprecated assert call and unused variable 2020-10-19 11:48:34 -04:00
pilar
6f7bde1716 constants.py moved from MEB and monthly_to_hourly_demand.py created but not finished 2020-10-19 10:07:03 -04:00
SanamDabirian
1b2513692f Add household class for occupancy 2020-10-17 01:49:33 -04:00
SanamDabirian
f22183331b Add electrical appliances facilities class for occupancy 2020-10-17 01:40:19 -04:00
SanamDabirian
5e48597235 Add lighting facilities class for occupancy 2020-10-17 01:33:29 -04:00
SanamDabirian
849f459cee Add HVAC facilities class for occupancy 2020-10-17 01:21:57 -04:00
c878b13bc5 correct tab 2020-10-16 12:27:24 -04:00
830a7f38a3 Change dhw_facvilities folder 2020-10-16 12:24:41 -04:00
SanamDabirian
b821696c8d Add DHW facilities class for occupancy 2020-10-16 12:17:22 -04:00
SanamDabirian
7f9f99cb3b Merge remote-tracking branch 'origin/master' 2020-10-16 12:11:17 -04:00
pilar
dd5b1cee68 modified monthly values to be a DataFrame and added hourly values 2020-10-16 08:05:17 -04:00
pilar
1e94596e1d small error in comments 2020-10-16 07:49:46 -04:00
991e04e2a9 small correction in comment and constructor 2020-10-16 07:35:08 -04:00
pilar
ef0d503b48 Modified building.py to add monthly demand values 2020-10-16 06:54:49 -04:00
SanamDabirian
ac76934c96 New commit 2020-10-16 01:25:22 -04:00
SanamDabirian
fe33bd4480 My first commit 2020-10-15 09:18:35 -04:00
e1224521e6 Add building unit class for occupancy 2020-10-13 14:47:01 -04:00
f3bf5172d8 New commit and push 2020-08-07 12:05:25 -04:00
30ca833a8b Try a second commit and push 2020-08-06 14:01:17 -04:00
b4d3edc6fd Try a second commit and push 2020-08-06 13:58:44 -04:00
216199f6b0 Try commit and Push 2020-08-06 13:44:58 -04:00
dc1515bb0d test geometry update 2020-06-30 18:06:27 -04:00
a9b3859dce test geometry update 2020-06-30 17:09:09 -04:00
f3156df417 test geometry update 2020-06-30 16:51:49 -04:00
924f15169e test geometry update 2020-06-30 16:14:39 -04:00
6eb9c9112d test geometry update 2020-06-30 16:11:45 -04:00
6c2cd8e977 change reverse_geocoder for openmaps api call 2020-06-29 17:41:22 -04:00
aa68cf4456 change reverse_geocoder for openmaps api call 2020-06-29 17:38:47 -04:00
f76a5bfd68 change reverse_geocoder for openmaps api call 2020-06-29 17:37:18 -04:00
095da61e39 change reverse_geocoder for openmaps api call 2020-06-29 17:31:46 -04:00
5e821ee144 Merge remote-tracking branch 'origin/master' 2020-06-29 17:29:41 -04:00
pilar
4e26730090 added step numbers like in the presentation 2020-06-29 17:24:54 -04:00
Pilar
877a64a06e moved data folder to libs and changed:
def __init__(self, handler, city, base_path=Path(Path.cwd().parent / 'libs/data/physics')):

in physics_factory.py plus the paths in us_base_physics_parameters.py

Something similar should be done for usage_factory.py
2020-06-29 16:52:39 -07:00
Pilar
4dff9d3ba5 moved data folder 2020-06-29 16:52:05 -07:00
79a8b9f9d6 change reverse_geocoder for openmaps api call 2020-06-29 17:24:05 -04:00
Pilar
8aac448721 Merge remote-tracking branch 'origin/master' 2020-06-26 18:11:04 -07:00
Pilar
5502261e16 moved data folder to libs and changed:
def __init__(self, handler, city, base_path=Path(Path.cwd().parent / 'libs/data/physics')):

in physics_factory.py plus the paths in us_base_physics_parameters.py

Something similar should be done for usage_factory.py
2020-06-26 18:10:56 -07:00
160ca22754 change reverse_geocoder for openmaps api call 2020-06-26 14:50:13 -04:00
5249a8fc76 change reverse_geocoder for openmaps api call 2020-06-26 14:42:52 -04:00
b6bc582201 change reverse_geocoder for openmaps api call 2020-06-26 14:38:42 -04:00
c94042b52c Merge remote-tracking branch 'origin/master' 2020-06-26 14:34:45 -04:00
106fe545fa change reverse_geocoder for openmaps api call 2020-06-26 14:34:37 -04:00
Guille
ad3c48696a Update 'WINDOWS_INSTALL.md'
Grammar review and typo correction
2020-06-26 11:23:41 -04:00
Guille
113ac32e7c Update 'WINDOWS_INSTALL.md' 2020-06-26 11:15:35 -04:00