Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate EV schedules #1757

Merged
merged 87 commits into from
Feb 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
19740a7
Generate EV schedules
rajeee Jun 20, 2024
be21d3c
Merge branch 'ev_batteries' into ev_schedules
rajeee Jun 20, 2024
d5db465
Fix test and read from HPXML
rajeee Jun 24, 2024
d377d3c
Merge branch 'ev_batteries' into ev_schedules
rajeee Jun 27, 2024
ce9ff76
Merge branch 'ev_batteries' into ev_schedules
rajeee Jul 1, 2024
d44e1bc
Handle schedule conflict
rajeee Jul 1, 2024
d08ba63
Merge branch 'ev_batteries' into ev_schedules
rajeee Jul 1, 2024
fd0dd49
Binary occupancy
rajeee Jul 18, 2024
25d24d5
Merge branch 'ev_batteries' into ev_schedules
rajeee Jul 31, 2024
d78b0ae
Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules
aspeake Sep 16, 2024
5230cc0
fix bug from merge conflict
aspeake Sep 16, 2024
3c867be
Remove epw arguments
rajeee Sep 19, 2024
b102371
Handle hours per week
rajeee Sep 21, 2024
d15baa1
Output EV occupant occupancy
rajeee Sep 21, 2024
86144f9
Merge branch 'ev_batteries' into ev_schedules
rajeee Oct 2, 2024
b077dcc
Bug fixes and enhancement
rajeee Oct 23, 2024
9e03d1d
Merge branch 'ev_batteries' into ev_schedules
rajeee Oct 23, 2024
8131ce2
Remove byebug line
rajeee Oct 24, 2024
997fbee
Merge branch 'ev_batteries' into ev_schedules
rajeee Oct 24, 2024
bb2036f
Merge branch 'ev_batteries' into ev_schedules
rajeee Oct 30, 2024
bffc05b
Schedule aggregation bug fix
rajeee Nov 12, 2024
3026165
Merge branch 'ev_batteries' into ev_schedules
rajeee Nov 12, 2024
2204599
Use floating division to prevent rounding to zero
rajeee Nov 20, 2024
41ec1db
No EV bug fix and formatting
rajeee Nov 21, 2024
8c21825
Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules
aspeake Nov 21, 2024
57e820f
Update measures, fix CI error.
shorowit Dec 10, 2024
bcd352f
Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPX…
shorowit Dec 11, 2024
313b6d6
Add unavailable periods entry for new columns
rajeee Dec 11, 2024
1150640
Fill in function signatures
rajeee Dec 17, 2024
30da3d8
Allow override when duplicate column names exist.
rajeee Dec 17, 2024
40ad8e8
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 2, 2025
127e47c
Update warning message
rajeee Jan 2, 2025
30ff4a7
Refactor schedule generator
rajeee Jan 7, 2025
bea57ba
Rename and reorder
rajeee Jan 7, 2025
2f1f76d
Rename and reorder
rajeee Jan 7, 2025
7b19274
Final cleanup and verified restoration of functionality
rajeee Jan 8, 2025
d4bcffa
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 8, 2025
7b37014
update measures
shorowit Jan 8, 2025
6e963ae
Fix schedule test
rajeee Jan 8, 2025
b81f29d
Rever allowing duplicate columns
rajeee Jan 8, 2025
45d1405
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Jan 8, 2025
f18ec53
Debug CI failure
shorowit Jan 8, 2025
06b6e44
Oops.
shorowit Jan 8, 2025
addc070
Updated the wrong one
shorowit Jan 8, 2025
ec7b790
sigh
shorowit Jan 8, 2025
112553b
Add checks for schedule CSVs
shorowit Jan 8, 2025
48a5fd4
Final cleanup/revert.
shorowit Jan 8, 2025
c592ec7
--stat overrides --exit-code, so need to use two separate calls
shorowit Jan 8, 2025
5769f96
Fix git diff command
shorowit Jan 8, 2025
c6bd467
Only generate EV related schedule columns if EV is present
rajeee Jan 8, 2025
1970d68
Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPX…
shorowit Jan 10, 2025
57613bf
Generate schedules only for things that exist
rajeee Jan 23, 2025
9a02a07
Commit schedule file changes
rajeee Jan 23, 2025
c448160
Conditionally generate plug load and garage lighting schedule
rajeee Jan 23, 2025
b360063
remove bybug and update schedules
rajeee Jan 23, 2025
d488e4c
Create occupancy schedule upfront
rajeee Jan 23, 2025
3c76f69
Remove hardcoded index from test
rajeee Jan 23, 2025
564bfb7
Update tests
rajeee Jan 24, 2025
885c8ba
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 24, 2025
45fca62
more test fixes
rajeee Jan 24, 2025
b6f4d12
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 24, 2025
9281736
Fix BuildResidentialScheduleFile/tests
rajeee Jan 24, 2025
6fd1968
Ceiling fan bug fix
rajeee Jan 24, 2025
d8db876
Remove byebug and fix tests
rajeee Jan 27, 2025
543db38
Latest results.
Jan 27, 2025
4eb1ca1
Merge branch 'ev_schedules' into schedules_v2
rajeee Jan 27, 2025
916d87d
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 28, 2025
776d855
Merge branch 'ev_schedules' into schedules_v2
rajeee Jan 28, 2025
6fd4f4f
Update hpxml and schedule for mf building
rajeee Jan 28, 2025
80e4d97
Merge branch 'ev_batteries' into ev_schedules
rajeee Jan 28, 2025
8c3d330
Merge branch 'ev_schedules' into schedules_v2
rajeee Jan 28, 2025
dd26849
Update xml file name
rajeee Jan 29, 2025
49adc61
Typo fix and column name fix
rajeee Jan 29, 2025
f7f00d9
Merge branch 'ev_schedules' into schedules_v2
rajeee Jan 29, 2025
5d06aca
Latest results.
Jan 29, 2025
41d4f35
Add stochastic ev schededule to sample files
rajeee Feb 5, 2025
4d479fb
Combine EV charging and discharging together
rajeee Feb 5, 2025
de91252
Latest results.
Feb 5, 2025
8aba2a1
Merge branch 'ev_batteries' into ev_schedules
rajeee Feb 5, 2025
2b84101
Merge branch 'ev_schedules' into schedules_v2
rajeee Feb 5, 2025
93fe562
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Feb 12, 2025
a0cd8eb
Merge pull request #1915 from NREL/schedules_v2
shorowit Feb 12, 2025
26c6b0d
Latest results.
Feb 12, 2025
d84d5e8
Latest results.
Feb 12, 2025
90948d5
Some cleanup and formatting.
shorowit Feb 12, 2025
1a72648
Update changelog, docs, sample file name.
shorowit Feb 13, 2025
3e45c34
Latest results.
Feb 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'ev_batteries' into ev_schedules
rajeee committed Jan 24, 2025
commit b6f4d12e4781c4c8496550c53b6fca3b4557d1a4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.