Skip to content

Ssc 195 day of week improvements #2109

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
merged 28 commits into from
Oct 8, 2025
Merged

Ssc 195 day of week improvements #2109

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d213d4e
First cut at day of week UI forms. Throws error
brtietz Sep 3, 2025
d2aaafb
get UI working by centralizing start_day_of_week variable location. U…
brtietz Sep 4, 2025
1345626
Clean up third party
brtietz Sep 4, 2025
4e68b2d
Correct merchant plant UI (no TOD page
brtietz Sep 9, 2025
d8feef5
fix high concentrating pv merchant plant
brtietz Sep 9, 2025
1f20462
fix standalone host developer
brtietz Sep 9, 2025
5387f38
etes and ptes
brtietz Sep 9, 2025
af3942b
more merchant plant fixes
brtietz Sep 9, 2025
0c98071
Additional file changes mostly lead by the script
brtietz Sep 9, 2025
653653f
API and export config changes
brtietz Sep 10, 2025
51d10ac
UI tweaks for January 1 day of week:
cpaulgilman Sep 10, 2025
220e978
Update start day label to match load/tod factors labels
cpaulgilman Sep 10, 2025
69d2c99
Add start day of year behavior to belpe
brtietz Sep 11, 2025
a8e8e6f
Merge branch 'ssc_195_day_of_week_improvements' of https://github.com…
brtietz Sep 11, 2025
59d0993
finish ui merge with Paul's changes
brtietz Sep 11, 2025
5837a1e
Merge branch 'develop' of https://github.com/NREL/SAM into ssc_195_da…
brtietz Sep 11, 2025
892bd83
Change start day of year label for belpe to match other pages
cpaulgilman Sep 11, 2025
bf64ce8
Merge branch 'ssc_195_day_of_week_improvements' of https://github.com…
cpaulgilman Sep 11, 2025
cbb117f
API changes for BELPE changes
brtietz Sep 11, 2025
02ee070
Merge branch 'ssc_195_day_of_week_improvements' of https://github.com…
brtietz Sep 11, 2025
c6ca861
Merge branch 'develop' of https://github.com/NREL/SAM into ssc_195_da…
brtietz Sep 25, 2025
23cc0d7
Add start day of year to new pvwatts battery configurations
brtietz Sep 25, 2025
9de0fe2
Export config and api changes post merge
brtietz Sep 25, 2025
30a9d9c
Defaults updates post merge post test script
brtietz Sep 29, 2025
582ef76
removed extra space in UI label
janinefreeman Oct 8, 2025
606cc23
Merge branch 'develop' of https://github.com/NREL/SAM into ssc_195_da…
brtietz Oct 8, 2025
cf5e88f
re-add the day of the week inputs to pets
brtietz Oct 8, 2025
150f0f7
re-run SAM API and export config. Looks like this dragged along a few…
brtietz Oct 8, 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
14 changes: 8 additions & 6 deletions deploy/runtime/defaults/Biopower_All Equity Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -482,7 +482,7 @@
"const_per_upfront_rate5": 0.0,
"construction_financing_cost": 5254747.836993514,
"cost_dev_fee_percent": 3.0,
"cost_dev_fee_tax_liability": 1593239.5441764335,
"cost_dev_fee_tax_liability": 1593239.5441764338,
"cost_dev_fee_value": 6005426.099421159,
"cost_equity_closing": 300000.0,
"cost_other_financing": 0.0,
Expand Down Expand Up @@ -19449,7 +19449,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19543,6 +19543,8 @@
"solution_mode_message": "",
"sponsor_cap_recovery_mode": 0.0,
"sponsor_cap_recovery_year": 3.0,
"start_day_of_year": 3.335046e-317,
"start_day_of_year_tod_ui": 3.335046e-317,
"state": "ND",
"state_tax_rate": [
7.0
Expand Down
14 changes: 8 additions & 6 deletions deploy/runtime/defaults/Biopower_Leveraged Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -484,7 +484,7 @@
"cost_debt_closing": 0.0,
"cost_debt_fee": 2.75,
"cost_dev_fee_percent": 3.0,
"cost_dev_fee_tax_liability": 1593239.5441764335,
"cost_dev_fee_tax_liability": 1593239.5441764338,
"cost_dev_fee_value": 6005426.099421159,
"cost_equity_closing": 300000.0,
"cost_other_financing": 0.0,
Expand Down Expand Up @@ -19458,7 +19458,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19552,6 +19552,8 @@
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solution_mode_message": "",
"start_day_of_year": 3.335046e-317,
"start_day_of_year_tod_ui": 3.335046e-317,
"state": "ND",
"state_tax_rate": [
7.0
Expand Down
14 changes: 8 additions & 6 deletions deploy/runtime/defaults/Biopower_Merchant Plant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -502,7 +502,7 @@
],
"cp_capacity_payment_esc": 0.0,
"cp_capacity_payment_type": 0.0,
"cp_system_nameplate": 48.535593101910709,
"cp_system_nameplate": 48.53559310191071,
"debt_message": "",
"debt_option": 1.0,
"debt_percent": 50.0,
Expand Down Expand Up @@ -666550,7 +666550,7 @@
],
"mp_error_msg": "",
"mp_market_percent_gen": 100.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -666638,6 +666638,8 @@
"solar_data_source": "TMY2",
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"start_day_of_year": 3.335046e-317,
"start_day_of_year_merchant_ui": 3.335046e-317,
"state": "ND",
"state_tax_rate": [
7.0
Expand Down
14 changes: 8 additions & 6 deletions deploy/runtime/defaults/Biopower_Sale Leaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -482,7 +482,7 @@
"const_per_upfront_rate5": 0.0,
"construction_financing_cost": 5254747.836993514,
"cost_dev_fee_percent": 3.0,
"cost_dev_fee_tax_liability": 1593239.5441764335,
"cost_dev_fee_tax_liability": 1593239.5441764338,
"cost_dev_fee_value": 6005426.099421159,
"cost_equity_closing": 300000.0,
"cost_other_financing": 0.0,
Expand Down Expand Up @@ -19444,7 +19444,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19540,6 +19540,8 @@
"sponsor_operating_margin": 20.0,
"sponsor_operating_margin_amount": 970711.8620382142,
"sponsor_operating_margin_escalation": 2.0,
"start_day_of_year": 3.335046e-317,
"start_day_of_year_tod_ui": 3.335046e-317,
"state": "ND",
"state_tax_rate": [
7.0
Expand Down
14 changes: 8 additions & 6 deletions deploy/runtime/defaults/Biopower_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"biopwr.feedstock.bagasse_c": 0.4695,
"biopwr.feedstock.bagasse_frac": 0.0,
"biopwr.feedstock.bagasse_h": 0.0547,
"biopwr.feedstock.bagasse_hhv": 8146.6050000000009,
"biopwr.feedstock.bagasse_hhv": 8146.605000000001,
"biopwr.feedstock.bagasse_lhv": 7894.760730000001,
"biopwr.feedstock.bagasse_moisture": 100.0,
"biopwr.feedstock.bagasse_moisture_wet": 50.0,
Expand Down Expand Up @@ -256,7 +256,7 @@
"biopwr.feedstock.total_h": 0.05368872073764044,
"biopwr.feedstock.total_hhv": 7668.698347232303,
"biopwr.feedstock.total_lhv": 7194.0304069514299,
"biopwr.feedstock.total_moisture": 0.36564341449200718,
"biopwr.feedstock.total_moisture": 0.3656434144920072,
"biopwr.feedstock.total_nameplate": 48535.59310191071,
"biopwr.feedstock.total_o": 0.5115152836845535,
"biopwr.feedstock.urban_ash": 0.0125,
Expand All @@ -266,7 +266,7 @@
"biopwr.feedstock.urban_h": 0.05988,
"biopwr.feedstock.urban_hhv": 7791.0,
"biopwr.feedstock.urban_lhv": 7399.0,
"biopwr.feedstock.urban_moisture": 13.636363636363635,
"biopwr.feedstock.urban_moisture": 13.636363636363637,
"biopwr.feedstock.urban_moisture_wet": 12.0,
"biopwr.feedstock.urban_o": 0.4449,
"biopwr.feedstock.urban_obtainable": 10.0,
Expand All @@ -279,7 +279,7 @@
"biopwr.feedstock.wheat_h": 0.0532,
"biopwr.feedstock.wheat_hhv": 7661.2479,
"biopwr.feedstock.wheat_lhv": 7107.9666,
"biopwr.feedstock.wheat_moisture": 13.636363636363635,
"biopwr.feedstock.wheat_moisture": 13.636363636363637,
"biopwr.feedstock.wheat_moisture_wet": 12.0,
"biopwr.feedstock.wheat_o": 0.4914,
"biopwr.feedstock.wheat_obtainable": 10.0,
Expand Down Expand Up @@ -494,7 +494,7 @@
],
"cp_capacity_payment_esc": 0.0,
"cp_capacity_payment_type": 0.0,
"cp_system_nameplate": 48.535593101910709,
"cp_system_nameplate": 48.53559310191071,
"debt_message": "",
"debt_option": 1.0,
"debt_percent": 50.0,
Expand Down Expand Up @@ -19463,7 +19463,7 @@
"mera_name3": "Replacement Reserve 3",
"months_receivables_reserve": 0.0,
"months_working_reserve": 6.0,
"nominal_discount_rate": 9.060000000000003,
"nominal_discount_rate": 9.060000000000004,
"om_capacity": [
110.0
],
Expand Down Expand Up @@ -19560,6 +19560,8 @@
"solar_resource": "fargo_nd_46.9_-96.8_mts1_60_tmy",
"solar_resource_file": "fargo_nd_46.9_-96.8_mts1_60_tmy.csv",
"solution_mode_message": "",
"start_day_of_year": 3.335046e-317,
"start_day_of_year_tod_ui": 3.335046e-317,
"state": "ND",
"state_tax_rate": [
7.0
Expand Down
Loading
Loading