Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f556906
Initial mockups for itc basis and depreciation allocation changes
mjprilliman Mar 11, 2026
f7d09fe
Hybrid version of ITC basis page, update depreciation allocations to
mjprilliman Mar 13, 2026
11408d6
Merge branch 'develop' into itc_basis_updates
sjanzou Mar 16, 2026
9b03972
latest api_autogen updates for itc_basis_updates brancch
sjanzou Mar 16, 2026
511d5cd
defaults updates when running test script
sjanzou Mar 16, 2026
0feab1b
Controls on itc and depr page, fix enabling and calculations
mjprilliman Mar 30, 2026
612d6e1
Merge branch 'develop' of https://github.com/NREL/SAM into itc_basis_…
brtietz Apr 1, 2026
22eb434
Clean up a few more things in startup.lk and wind defaults
brtietz Apr 1, 2026
99691ff
Merge branch 'itc_basis_updates' of https://github.com/NREL/SAM into …
brtietz Apr 1, 2026
ebf346c
One more round of defaults updates given some changes I hadn't pulled
brtietz Apr 1, 2026
53656b4
Merge branch 'develop' into itc_basis_updates
mjprilliman Apr 1, 2026
06aa0b5
Add depreciation allocation to equations, add calculated versus input
mjprilliman Apr 7, 2026
67bebcd
Merge branch 'develop' of https://github.com/NREL/SAM into itc_basis_…
brtietz Apr 14, 2026
526607b
Combine incentives and depreciation pages
mjprilliman Apr 20, 2026
a66b2c0
Merge branch 'itc_basis_updates' of https://github.com/NREL/SAM into …
Apr 21, 2026
e700784
Fix show hide for battery
mjprilliman Apr 22, 2026
71c14b6
Merge branch 'itc_basis_updates' of https://github.com/NREL/SAM into …
brtietz Apr 23, 2026
004eb94
Merge branch 'develop' of https://github.com/NREL/SAM into itc_basis_…
brtietz Apr 23, 2026
36687a6
Get single owner hybrids ITC inputs working with the beast
brtietz Apr 24, 2026
7e401c8
working implementation for hybrid single owner, pv-battery, pvwatts b…
brtietz Apr 24, 2026
9653bc9
host developer hybrids and stand alone batteries
brtietz Apr 24, 2026
0c7ba04
Startup.lk revisions for all fin models except commercial
brtietz Apr 24, 2026
4420b9f
Walk back the commercial changes to keep the PR a little smaller
brtietz Apr 24, 2026
ce69735
Overwrite all defaults with new UI values
brtietz Apr 24, 2026
7e52ca9
Some UI cleanup, ensure checkboxes don't appear for single techs
brtietz Apr 24, 2026
1cbd5db
UI cleanup, remove manual option
mjprilliman Apr 24, 2026
a85bc91
Merge branch 'itc_basis_updates' of https://github.com/NatLabRockies/…
mjprilliman Apr 27, 2026
4e96873
More UI cleanup
mjprilliman Apr 29, 2026
5bcef1e
Defaults update for new itc basis, part 1
brtietz May 4, 2026
98cb5ee
Merge branch 'develop' of https://github.com/NREL/SAM into itc_basis_…
brtietz May 5, 2026
b9c7e7b
Update ITC and PTC qualification for obbba
brtietz May 5, 2026
ae57861
Test script ow.lk results
brtietz May 5, 2026
94bf752
Overwite computed defaults and export API defaults
brtietz May 5, 2026
b1a83e7
Update residential and commercial depreciation treatments, make hybrid
mjprilliman May 5, 2026
13a4e64
Update defaults
mjprilliman May 5, 2026
51f86f8
Merge branch 'itc_basis_updates' of https://github.com/NatLabRockies/…
mjprilliman May 5, 2026
bfdd9c4
Version upgrade script for itc changes
brtietz May 6, 2026
1a6b128
Merge branch 'itc_basis_updates' of https://github.com/NREL/SAM into …
brtietz May 6, 2026
3edd1de
Merge branch 'develop' of https://github.com/NREL/SAM into itc_basis_…
brtietz May 7, 2026
8265237
Resolve merge conflicts from develop, re run test outputs with new de…
brtietz May 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"batt_replacement_capacity": 70,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"batt_surface_area": 1.70819,
"batt_surface_area": 90.0407,
"en_batt": 1,
"en_standalone_batt": 0,
"en_wave_batt": 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount_heat_btu": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount_heat_btu": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount_heat_btu": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount_heat_btu": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Cashloan_DSLFCommercial.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -54,7 +54,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -54,7 +54,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -48,7 +48,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -54,7 +54,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 9.96066e+08
"total_installed_cost": 1.40803e+06
},
"LandLease": {
},
Expand Down Expand Up @@ -186,7 +186,7 @@
},
"LCOS": {
"batt_salvage_percentage": 0,
"battery_total_cost_lcos": 4.35341e+07
"battery_total_cost_lcos": 483185
},
"ElectricityRates": {
"rate_escalation": [0.000000]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"om_fixed_escal": 0,
"om_production": [0.000000],
"om_production_escal": 0,
"total_installed_cost": 666254
"total_installed_cost": 40698.3
},
"LandLease": {
},
Expand Down Expand Up @@ -182,7 +182,7 @@
},
"LCOS": {
"batt_salvage_percentage": 0,
"battery_total_cost_lcos": 55134.3
"battery_total_cost_lcos": 10142.3
},
"ElectricityRates": {
"rate_escalation": [0.000000]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down Expand Up @@ -171,7 +171,7 @@
},
"SystemOutput": {
"annual_energy_value": [0],
"degradation": [0.500000],
"degradation": [0.000000],
"gen": [0]
},
"Lifetime": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -48,7 +48,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down Expand Up @@ -167,7 +167,7 @@
},
"SystemOutput": {
"annual_energy_value": [0],
"degradation": [0.500000],
"degradation": [0.000000],
"gen": [0]
},
"Lifetime": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -48,7 +48,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -52,7 +52,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -48,7 +48,7 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"itc_fed_amount": [0.000000],
"itc_fed_amount_deprbas_fed": 1,
"itc_fed_amount_deprbas_sta": 1,
"itc_fed_percent": [30.000000],
"itc_fed_percent": [0.000000],
"itc_fed_percent_deprbas_fed": 1,
"itc_fed_percent_deprbas_sta": 1,
"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
Expand All @@ -69,36 +69,41 @@
"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
"ptc_fed_amount": [0.000000],
"ptc_fed_escal": 0,
"ptc_fed_term": 10,
"ptc_fed_term": 0,
"ptc_sta_amount": [0.000000],
"ptc_sta_escal": 0,
"ptc_sta_term": 10
},
"Depreciation": {
"depr_alloc_custom_percent": 0,
"depr_alloc_macrs_15_percent": 1.5,
"depr_alloc_macrs_5_percent": 90,
"depr_alloc_sl_15_percent": 2.5,
"depr_alloc_sl_20_percent": 3,
"depr_alloc_macrs_15_percent": 0,
"depr_alloc_macrs_5_percent": 100,
"depr_alloc_sl_15_percent": 0,
"depr_alloc_sl_20_percent": 0,
"depr_alloc_sl_39_percent": 0,
"depr_alloc_sl_5_percent": 0,
"depr_bonus_fed": 0,
"depr_basis_mat": [
[1.000000, 4518510.000000, 100.000000, 0.000000, 0.000000, 0.000000],
[2.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"depr_bonus_fed": 100,
"depr_bonus_fed_custom": 0,
"depr_bonus_fed_macrs_15": 1,
"depr_bonus_fed_macrs_5": 1,
"depr_bonus_fed_sl_15": 0,
"depr_bonus_fed_sl_20": 0,
"depr_bonus_fed_sl_15": 1,
"depr_bonus_fed_sl_20": 1,
"depr_bonus_fed_sl_39": 0,
"depr_bonus_fed_sl_5": 0,
"depr_bonus_sta": 0,
"depr_bonus_fed_sl_5": 1,
"depr_bonus_sta": 100,
"depr_bonus_sta_custom": 0,
"depr_bonus_sta_macrs_15": 1,
"depr_bonus_sta_macrs_5": 1,
"depr_bonus_sta_sl_15": 0,
"depr_bonus_sta_sl_20": 0,
"depr_bonus_sta_sl_15": 1,
"depr_bonus_sta_sl_20": 1,
"depr_bonus_sta_sl_39": 0,
"depr_bonus_sta_sl_5": 0,
"depr_bonus_sta_sl_5": 1,
"depr_custom_schedule": [0.000000],
"depr_en_basis_mat": 1,
"depr_fedbas_method": 1,
"depr_itc_fed_custom": 0,
"depr_itc_fed_macrs_15": 0,
Expand Down Expand Up @@ -217,7 +222,7 @@
"ElectricityRates": {
},
"SystemOutput": {
"degradation": [0.500000],
"degradation": [0.000000],
"gen": [0],
"system_capacity": 3000
},
Expand Down
Loading
Loading