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.

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

Fixes #1574 #1575

Merged
merged 9 commits into from
Nov 17, 2023
Merged

Fixes #1574 #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
04c7147
Fixes defaults for batt_look_ahead_hours for FORM automated dispatch …
sjanzou Nov 15, 2023
9b1503d
Merge branch 'charge-fuelcell-btm-hybrids' into SAM_1574
mjprilliman Nov 15, 2023
d616032
Merge branch 'charge-fuelcell-btm-hybrids' into SAM_1574
mjprilliman Nov 15, 2023
7e6b738
Update failing defaults and run all 167 configurations on Windows wit…
sjanzou Nov 16, 2023
2f7b3d4
Fix broken PVWatts-Wind-FuelCell-Battery / Single Owner configuration
sjanzou Nov 16, 2023
a67cf7d
Merge branch 'develop' into SAM_1574
sjanzou Nov 17, 2023
1c4d18a
Updated results after merging in develop branch
sjanzou Nov 17, 2023
062e797
fix a few battery dispatch defaults related to this issue
brtietz Nov 17, 2023
7f26adb
Merge branch 'SAM_1574' of https://github.com/NREL/SAM into SAM_1574
brtietz Nov 17, 2023
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
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Fuel Cell_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 24.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
"batt_gridcharge_percent_1": 100.0,
Expand Down
6 changes: 3 additions & 3 deletions deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_charge": 1.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
Expand Down Expand Up @@ -2278,7 +2278,7 @@
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
"batt_gridcharge_percent_1": 100.0,
Expand Down Expand Up @@ -2419,7 +2419,7 @@
46.1312
]
],
"batt_look_ahead_hours": 0.0,
"batt_look_ahead_hours": 18.0,
"batt_loss_choice": 0.0,
"batt_losses": [
0.0
Expand Down
30 changes: 15 additions & 15 deletions deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"annual_global": 5.79476,
"annual_snow": "nan",
"annual_tdry": 21.9385,
"annual_twet": 0.0,
"annual_twet": "nan",
"annual_wspd": 1.78648,
"array_type": 2.0,
"azimuth": 180.0,
Expand Down Expand Up @@ -1324,7 +1324,7 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_charge": 1.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
Expand Down Expand Up @@ -1354,7 +1354,7 @@
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
"batt_gridcharge_percent_1": 100.0,
Expand Down Expand Up @@ -1495,7 +1495,7 @@
46.1312
]
],
"batt_look_ahead_hours": 0.0,
"batt_look_ahead_hours": 18.0,
"batt_loss_choice": 0.0,
"batt_losses": [
0.0
Expand Down Expand Up @@ -11831,7 +11831,7 @@
"cbi_uti_tax_fed": 1.0,
"cbi_uti_tax_sta": 1.0,
"chk_update_peaks": 0.0,
"const_per_interest1": 4427260.0,
"const_per_interest1": 4428130.0,
"const_per_interest2": 0.0,
"const_per_interest3": 0.0,
"const_per_interest4": 0.0,
Expand All @@ -11841,7 +11841,7 @@
"const_per_interest_rate3": 0.0,
"const_per_interest_rate4": 0.0,
"const_per_interest_rate5": 0.0,
"const_per_interest_total": 4427260.0,
"const_per_interest_total": 4428130.0,
"const_per_months1": 6.0,
"const_per_months2": 0.0,
"const_per_months3": 0.0,
Expand All @@ -11858,13 +11858,13 @@
"const_per_percent4": 0.0,
"const_per_percent5": 0.0,
"const_per_percent_total": 100.0,
"const_per_principal1": 505973000.0,
"const_per_principal1": 506073000.0,
"const_per_principal2": 0.0,
"const_per_principal3": 0.0,
"const_per_principal4": 0.0,
"const_per_principal5": 0.0,
"const_per_principal_total": 505973000.0,
"const_per_total1": 9486980.0,
"const_per_principal_total": 506073000.0,
"const_per_total1": 9488860.0,
"const_per_total2": 0.0,
"const_per_total3": 0.0,
"const_per_total4": 0.0,
Expand All @@ -11874,7 +11874,7 @@
"const_per_upfront_rate3": 0.0,
"const_per_upfront_rate4": 0.0,
"const_per_upfront_rate5": 0.0,
"construction_financing_cost": 9486980.0,
"construction_financing_cost": 9488860.0,
"cost_debt_closing": 450000.0,
"cost_debt_fee": 2.75,
"cost_other_financing": 0.0,
Expand All @@ -11887,7 +11887,7 @@
],
"cp_capacity_payment_esc": 0.0,
"cp_capacity_payment_type": 0.0,
"cp_system_nameplate": 334.523,
"cp_system_nameplate": 276.923,
"debt_message": "",
"debt_option": 1.0,
"debt_percent": 60.0,
Expand Down Expand Up @@ -30221,7 +30221,7 @@
]
],
"loan_moratorium": 0.0,
"mera_cost1": 33452300.0,
"mera_cost1": 27692300.0,
"mera_cost2": 0.0,
"mera_cost3": 0.0,
"mera_name1": "Replacement Reserve 1",
Expand Down Expand Up @@ -30274,7 +30274,7 @@
"ppa_soln_mode": 1.0,
"prop_tax_assessed_decline": 0.0,
"prop_tax_cost_assessed_percent": 100.0,
"property_assessed_value": 505973000.0,
"property_assessed_value": 506073000.0,
"property_tax_rate": 0.0,
"ptc_fed_amount": [
0.0
Expand Down Expand Up @@ -30306,11 +30306,11 @@
"state_tax_rate": [
7.0
],
"system_capacity": 334523.0,
"system_capacity": 276923.0,
"term_int_rate": 4.0,
"term_tenor": 18.0,
"tod_library": "Uniform Dispatch",
"total_installed_cost": 505973000.0,
"total_installed_cost": 506073000.0,
"ui_battery_capacity": 57600.0,
"ui_battery_cost": 99682500.0,
"ui_electricity_rate_option": 1.0,
Expand Down
6 changes: 3 additions & 3 deletions deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,7 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_charge": 1.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
Expand Down Expand Up @@ -2203,7 +2203,7 @@
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
"batt_gridcharge_percent_1": 100.0,
Expand Down Expand Up @@ -2344,7 +2344,7 @@
46.1312
]
],
"batt_look_ahead_hours": 0.0,
"batt_look_ahead_hours": 18.0,
"batt_loss_choice": 0.0,
"batt_losses": [
0.0
Expand Down
6 changes: 3 additions & 3 deletions deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4995,7 +4995,7 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_charge": 1.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
Expand Down Expand Up @@ -5025,7 +5025,7 @@
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 24.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 1.0,
"batt_gridcharge_percent_1": 100.0,
Expand Down Expand Up @@ -5901,7 +5901,7 @@
78.1683
]
],
"batt_look_ahead_hours": 0.0,
"batt_look_ahead_hours": 18.0,
"batt_loss_choice": 0.0,
"batt_losses": [
0.0
Expand Down
657,029 changes: 16 additions & 657,013 deletions deploy/runtime/defaults/Physical Trough_Merchant Plant.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions deploy/runtime/defaults/Standalone Battery_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"batt_dispatch_choice": 3.0,
"batt_dispatch_choice_ui": 2.0,
"batt_dispatch_excl": 2.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_update_frequency_hours": 1.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
"batt_gridcharge_percent_1": 25.0,
Expand Down Expand Up @@ -231,7 +231,7 @@
46.1312
]
],
"batt_look_ahead_hours": 0.0,
"batt_look_ahead_hours": 18.0,
"batt_loss_choice": 0.0,
"batt_losses": [
0.0
Expand Down
6 changes: 3 additions & 3 deletions test_results_win64.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ Standalone Battery,Merchant Plant,-8397703,25.7208,NA,; Warning: IRR at end of a
Standalone Battery,Leveraged Partnership Flip,-8397703,88.8253,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.06575e+06. A negative NPV indicates project costs are higher than revenues.
Standalone Battery,All Equity Partnership Flip,-8397703,91.211,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.63501e+07. A negative NPV indicates project costs are higher than revenues.
Standalone Battery,Sale Leaseback,-8397703,92.007,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.09729e+07. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-1.09522e+08. A negative NPV indicates project costs are higher than revenues.
ETES,Single Owner,-467019776,13.3214,7.40322,;
PTES,Single Owner,-197589968,16.8909,10.3673,;
ETES,Single Owner,-466162080,13.3303,7.40205,;
PTES,Single Owner,-197701008,16.889,10.3633,;
Physical Trough,Single Owner,376952608,12.1978,12.3469,;
Physical Trough,Merchant Plant,376952608,12.8693,NA,;
Physical Trough,Merchant Plant,376952608,8.23835,NA,;
Physical Trough,Leveraged Partnership Flip,376952608,12.4668,12.3469,;
Physical Trough,All Equity Partnership Flip,376952608,15.5132,12.3469,;
Physical Trough,Sale Leaseback,376952608,15.8667,12.3469,;
Expand Down
Loading