Skip to content

Batt btm to grid and manual clip #754

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.

Sign up for GitHub

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

Merged
brtietz merged 13 commits into from
Nov 12, 2021
Merged

Batt btm to grid and manual clip #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4cc43f3
add options and defaults for btm discharge to grid and clipped power.…
Nov 8, 2021
cd26924
defaults and ui changes for manual dispatch. fuel cell is still wip
Nov 9, 2021
42315b7
merge develop including demand charge ratchets into batt_btm_to_grid_…
Nov 9, 2021
0440fd2
clean up defaults merge errors in a few more files
Nov 9, 2021
f780bc3
Battery dispatch UI fixes
cpaulgilman Nov 10, 2021
b401665
Merge branch 'batt_btm_to_grid_and_manual_clip' of https://github.com…
Nov 10, 2021
728be4a
Defaults for new ui_copy_batt_discharge_percent_x inputs
cpaulgilman Nov 11, 2021
6231c11
solve merge conflicts associated with dscr defaults updates
Nov 11, 2021
3e4a10b
Merge branch 'develop' of https://github.com/NREL/SAM into batt_btm_t…
Nov 11, 2021
fc6aa60
Merge branch 'develop' of https://github.com/NREL/SAM into batt_btm_t…
Nov 12, 2021
e05b93e
fix up a bunch of functions in toggle_dispatch to sync with new batt_…
Nov 12, 2021
a225ab0
update pvwatts results given recent merges
Nov 12, 2021
48204c9
merge in cross axis slope defaults
Nov 12, 2021
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
14 changes: 13 additions & 1 deletion deploy/runtime/defaults/Fuel Cell_Commercial.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1
765
767
LeadAcid_q10
1
1
Expand Down Expand Up @@ -537,12 +537,24 @@ batt_discharge_percent_6
1
1
25
batt_dispatch_auto_btm_can_discharge_to_grid
1
1
1
1
0
batt_dispatch_auto_can_charge
1
1
1
1
1
batt_dispatch_auto_can_clipcharge
1
1
1
1
0
batt_dispatch_auto_can_fuelcellcharge
1
1
Expand Down
105 changes: 95 additions & 10 deletions deploy/runtime/defaults/Generic Battery_All Equity Partnership Flip.txt
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 103 additions & 5 deletions deploy/runtime/defaults/Generic Battery_Commercial.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1
509
524
LeadAcid_q10
1
1
Expand Down Expand Up @@ -303,7 +303,7 @@ batt_calendar_c
1
1
1
930
939
batt_calendar_choice
1
1
Expand Down Expand Up @@ -469,12 +469,24 @@ batt_discharge_percent_6
1
1
25
batt_dispatch_auto_btm_can_discharge_to_grid
1
1
1
1
3.33505e-317
batt_dispatch_auto_can_charge
1
1
1
1
1
batt_dispatch_auto_can_clipcharge
1
1
1
1
3.33505e-317
batt_dispatch_auto_can_fuelcellcharge
1
1
Expand Down Expand Up @@ -1368,19 +1380,26 @@ derate
1
1
4
dispatch_manual_btm_discharge_to_grid
1
2
1
6
0 0 0 0 0 0

dispatch_manual_charge
1
2
1
6
1 0 0 0 0 0
1 1 0 0 0 0

dispatch_manual_discharge
1
2
1
6
0 1 0 0 0 0
0 0 1 1 0 0

dispatch_manual_gridcharge
1
Expand Down Expand Up @@ -2526,6 +2545,13 @@ pv.storage.p1.discharge
1
1
0
pv.storage.p1.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p1.gridcharge
1
1
Expand All @@ -2544,6 +2570,13 @@ pv.storage.p2.discharge
1
1
1
pv.storage.p2.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p2.gridcharge
1
1
Expand All @@ -2562,6 +2595,13 @@ pv.storage.p3.discharge
1
1
0
pv.storage.p3.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p3.gridcharge
1
1
Expand All @@ -2580,6 +2620,13 @@ pv.storage.p4.discharge
1
1
0
pv.storage.p4.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p4.gridcharge
1
1
Expand All @@ -2598,6 +2645,13 @@ pv.storage.p5.discharge
1
1
0
pv.storage.p5.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p5.gridcharge
1
1
Expand All @@ -2616,6 +2670,13 @@ pv.storage.p6.discharge
1
1
0
pv.storage.p6.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p6.gridcharge
1
1
Expand Down Expand Up @@ -2742,6 +2803,42 @@ ui_batt_life_model
1
1
1
ui_copy_batt_discharge_percent_1
1
1
1
1
25
ui_copy_batt_discharge_percent_2
1
1
1
1
25
ui_copy_batt_discharge_percent_3
1
1
1
1
25
ui_copy_batt_discharge_percent_4
1
1
1
1
25
ui_copy_batt_discharge_percent_5
1
1
1
1
25
ui_copy_batt_discharge_percent_6
1
1
1
1
25
ui_loan_amount
1
1
Expand Down Expand Up @@ -3221,4 +3318,5 @@ utility_bill_data
2
1
12
300 300 300 300 300 400 500 500 400 300 300 300
300 300 300 300 300 400 500 500 400 300 300 300

99 changes: 98 additions & 1 deletion deploy/runtime/defaults/Generic Battery_Host Developer.txt
View file
Open in desktop

Large diffs are not rendered by default.

87 changes: 86 additions & 1 deletion deploy/runtime/defaults/Generic Battery_Leveraged Partnership Flip.txt
View file
Open in desktop

Large diffs are not rendered by default.

87 changes: 86 additions & 1 deletion deploy/runtime/defaults/Generic Battery_Merchant Plant.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1
541
554
LeadAcid_q10
1
1
Expand Down Expand Up @@ -1861,6 +1861,13 @@ derate
1
1
4
dispatch_manual_btm_discharge_to_grid
1
2
1
6
0 0 0 0 0 0

dispatch_manual_charge
1
2
Expand Down Expand Up @@ -222065,6 +222072,13 @@ pv.storage.p1.discharge
1
1
0
pv.storage.p1.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p1.gridcharge
1
1
Expand All @@ -222083,6 +222097,13 @@ pv.storage.p2.discharge
1
1
1
pv.storage.p2.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p2.gridcharge
1
1
Expand All @@ -222101,6 +222122,13 @@ pv.storage.p3.discharge
1
1
0
pv.storage.p3.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p3.gridcharge
1
1
Expand All @@ -222119,6 +222147,13 @@ pv.storage.p4.discharge
1
1
0
pv.storage.p4.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p4.gridcharge
1
1
Expand All @@ -222137,6 +222172,13 @@ pv.storage.p5.discharge
1
1
0
pv.storage.p5.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p5.gridcharge
1
1
Expand All @@ -222155,6 +222197,13 @@ pv.storage.p6.discharge
1
1
0
pv.storage.p6.dischargetogrid
1
1
1
6
0 0 0 0 0 0

pv.storage.p6.gridcharge
1
1
Expand Down Expand Up @@ -222293,6 +222342,42 @@ ui_batt_life_model
1
1
1
ui_copy_batt_discharge_percent_1
1
1
1
1
25
ui_copy_batt_discharge_percent_2
1
1
1
1
25
ui_copy_batt_discharge_percent_3
1
1
1
1
25
ui_copy_batt_discharge_percent_4
1
1
1
1
25
ui_copy_batt_discharge_percent_5
1
1
1
1
25
ui_copy_batt_discharge_percent_6
1
1
1
1
25
ui_pv_capacity
1
1
Expand Down
Loading