NatLabRockies · brtietz · Apr 23, 2026 · Apr 23, 2026 · Apr 24, 2026 · Apr 24, 2026
diff --git a/ssc/cmod_cashloan.cpp b/ssc/cmod_cashloan.cpp
diff --git a/ssc/cmod_cashloan_heat.cpp b/ssc/cmod_cashloan_heat.cpp
diff --git a/ssc/cmod_communitysolar.cpp b/ssc/cmod_communitysolar.cpp
diff --git a/ssc/cmod_equpartflip.cpp b/ssc/cmod_equpartflip.cpp
diff --git a/ssc/cmod_host_developer.cpp b/ssc/cmod_host_developer.cpp
diff --git a/ssc/cmod_levpartflip.cpp b/ssc/cmod_levpartflip.cpp
diff --git a/ssc/cmod_merchantplant.cpp b/ssc/cmod_merchantplant.cpp
diff --git a/ssc/cmod_singleowner.cpp b/ssc/cmod_singleowner.cpp
diff --git a/ssc/cmod_singleowner_heat.cpp b/ssc/cmod_singleowner_heat.cpp
diff --git a/ssc/common.cpp b/ssc/common.cpp
diff --git a/ssc/common.h b/ssc/common.h
@@ -50,6 +50,8 @@ extern var_info vtab_equip_reserve[];
 extern var_info vtab_depreciation[];
 extern var_info vtab_depreciation_inputs[];
 extern var_info vtab_depreciation_outputs[];
+extern var_info vtab_tax_outputs[];
+extern var_info vtab_itc_outputs[];
 extern var_info vtab_tax_credits[];
 extern var_info vtab_payment_incentives[];
 extern var_info vtab_tax_credits_heat[];

diff --git a/ssc/common_financial.cpp b/ssc/common_financial.cpp
diff --git a/ssc/common_financial.h b/ssc/common_financial.h
@@ -149,7 +149,7 @@ class itc_and_depreciation_calculations
 public:
     itc_and_depreciation_calculations(compute_module* cm, size_t n_years);
 
-    void calc_basis(double pre_depr_alloc_basis, double pre_itc_qual_basis);
+    void calc_basis(double in_pre_depr_alloc_basis, double in_pre_itc_qual_basis);
     void set_depr_schedules(compute_module* cm);
     void major_equipment_depreciation(compute_module* cm, util::matrix_t<double>& main_cf, int cf_equipment_expenditure, int expenditure_year, int analysis_period, int cf_equipment_depreciation);
 
@@ -177,12 +177,13 @@ class itc_and_depreciation_calculations
 
     double itc_fed_amount;
     double itc_sta_amount;
-    double itc_fed_per;
+    double itc_fed_per; // Still in $, even though it has per in the name
     double itc_sta_per;
 
     double pre_depr_alloc_basis; // Total costs that could qualify for depreciation before allocations
     double pre_itc_qual_basis; // Total costs that could qualify for ITC before allocations
 
+    // Variables with 'frac' in the name have % as units, others are in $
     double depr_alloc_macrs_5_frac;
     double depr_alloc_macrs_15_frac;
     double depr_alloc_sl_5_frac;
@@ -227,6 +228,7 @@ class itc_and_depreciation_calculations
     double itc_sta_qual_sl_20_frac;
     double itc_sta_qual_sl_39_frac;
     double itc_sta_qual_custom_frac;
+    double itc_sta_qual_none_frac;
 
     double itc_sta_qual_total;
 
@@ -237,6 +239,7 @@ class itc_and_depreciation_calculations
     double itc_sta_qual_sl_20;
     double itc_sta_qual_sl_39;
     double itc_sta_qual_custom;
+    double itc_sta_qual_none;
 
     double itc_sta_disallow_factor;
 
@@ -264,6 +267,7 @@ class itc_and_depreciation_calculations
     double itc_fed_qual_sl_20_frac;
     double itc_fed_qual_sl_39_frac;
     double itc_fed_qual_custom_frac;
+    double itc_fed_qual_none_frac;
 
     double itc_fed_qual_total;
 
@@ -274,6 +278,7 @@ class itc_and_depreciation_calculations
     double itc_fed_qual_sl_20;
     double itc_fed_qual_sl_39;
     double itc_fed_qual_custom;
+    double itc_fed_qual_none;
 
     double itc_fed_disallow_factor;
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -28,7 +28,8 @@ set(SRC_TO_TEST
 		../ssc/cmod_utilityrate5.cpp
         ../ssc/cmod_battery.cpp
         ../ssc/cmod_battwatts.cpp
-        ../ssc/cmod_fuelcell.cpp)
+        ../ssc/cmod_fuelcell.cpp
+        ../ssc/common_financial.cpp)
 
 
 #####################################################################################################################

diff --git a/test/input_cases/custom_generation_common_data.h b/test/input_cases/custom_generation_common_data.h
@@ -738,5 +738,45 @@ void custom_generation_commerical_battery_60min(ssc_data_t &data)
 	ssc_data_set_number(data, "batt_replacement_cost_escal", 0);
 	ssc_data_set_number(data, "total_installed_cost", 86827.921875);
 	ssc_data_set_number(data, "salvage_percentage", 0);
+
+    ssc_data_set_number(data, "depr_alloc_macrs_5_percent", 90);
+    ssc_data_set_number(data, "depr_alloc_macrs_15_percent", 1.5);
+    ssc_data_set_number(data, "depr_alloc_sl_5_percent", 0);
+    ssc_data_set_number(data, "depr_alloc_sl_15_percent", 2.5);
+    ssc_data_set_number(data, "depr_alloc_sl_20_percent", 3);
+    ssc_data_set_number(data, "depr_alloc_sl_39_percent", 0);
+    ssc_data_set_number(data, "depr_alloc_custom_percent", 0);
+    ssc_number_t p_depr_custom_schedule[1] = { 0 };
+    ssc_data_set_array(data, "depr_custom_schedule", p_depr_custom_schedule, 1);
+    ssc_data_set_number(data, "depr_bonus_sta", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_macrs_5", 1);
+    ssc_data_set_number(data, "depr_bonus_sta_macrs_15", 1);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_5", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_15", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_20", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_39", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_custom", 0);
+    ssc_data_set_number(data, "depr_bonus_fed", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_macrs_5", 1);
+    ssc_data_set_number(data, "depr_bonus_fed_macrs_15", 1);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_5", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_15", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_20", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_39", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_custom", 0);
+    ssc_data_set_number(data, "depr_itc_sta_macrs_5", 1);
+    ssc_data_set_number(data, "depr_itc_sta_macrs_15", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_5", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_15", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_20", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_39", 0);
+    ssc_data_set_number(data, "depr_itc_sta_custom", 0);
+    ssc_data_set_number(data, "depr_itc_fed_macrs_5", 1);
+    ssc_data_set_number(data, "depr_itc_fed_macrs_15", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_5", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_15", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_20", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_39", 0);
+    ssc_data_set_number(data, "depr_itc_fed_custom", 0);
 }
 #endif
diff --git a/test/input_cases/pvsamv1_battery_common_data.h b/test/input_cases/pvsamv1_battery_common_data.h
@@ -836,6 +836,72 @@ void commercial_multiarray_default(ssc_data_t& data) {
     ssc_data_set_number(data, "prop_tax_assessed_decline", 0);
     ssc_data_set_number(data, "real_discount_rate", 6.4000000000000004);
     ssc_data_set_number(data, "insurance_rate", 0.5);
+
+    ssc_number_t itc_amount[1] = { 0 };
+    ssc_number_t itc_fed_percent[1] = { 26 };
+    ssc_number_t itc_amount_max[1] = { 1e+38 };
+    ssc_data_set_array(data, "itc_fed_amount", itc_amount, 1);
+    ssc_data_set_array(data, "itc_sta_amount", itc_amount, 1);
+    ssc_data_set_array(data, "itc_fed_percent", itc_fed_percent, 1);
+    ssc_data_set_array(data, "itc_sta_percent", itc_amount, 1);
+    ssc_data_set_array(data, "itc_fed_percent_maxvalue", itc_amount_max, 1);
+    ssc_data_set_array(data, "itc_sta_percent_maxvalue", itc_amount_max, 1);
+    ssc_data_set_number(data, "itc_fed_amount_deprbas_fed", 1);
+    ssc_data_set_number(data, "itc_fed_amount_deprbas_sta", 1);
+    ssc_data_set_number(data, "itc_sta_amount_deprbas_fed", 0);
+    ssc_data_set_number(data, "itc_sta_amount_deprbas_sta", 0);
+    ssc_data_set_number(data, "itc_fed_percent_deprbas_fed", 1);
+    ssc_data_set_number(data, "itc_fed_percent_deprbas_sta", 1);
+    ssc_data_set_number(data, "itc_sta_percent_deprbas_fed", 0);
+    ssc_data_set_number(data, "itc_sta_percent_deprbas_sta", 0);
+    ssc_number_t p_ptc_fed_amount[1] = { 0 };
+    ssc_data_set_array(data, "ptc_fed_amount", p_ptc_fed_amount, 1);
+    ssc_data_set_number(data, "ptc_fed_term", 10);
+    ssc_data_set_number(data, "ptc_fed_escal", 0);
+    ssc_number_t p_ptc_sta_amount[1] = { 0 };
+    ssc_data_set_array(data, "ptc_sta_amount", p_ptc_sta_amount, 1);
+    ssc_data_set_number(data, "ptc_sta_term", 10);
+    ssc_data_set_number(data, "ptc_sta_escal", 0);
+    ssc_data_set_number(data, "depr_alloc_macrs_5_percent", 90);
+    ssc_data_set_number(data, "depr_alloc_macrs_15_percent", 1.5);
+    ssc_data_set_number(data, "depr_alloc_sl_5_percent", 0);
+    ssc_data_set_number(data, "depr_alloc_sl_15_percent", 2.5);
+    ssc_data_set_number(data, "depr_alloc_sl_20_percent", 3);
+    ssc_data_set_number(data, "depr_alloc_sl_39_percent", 0);
+    ssc_data_set_number(data, "depr_alloc_custom_percent", 0);
+    ssc_number_t p_depr_custom_schedule[1] = { 0 };
+    ssc_data_set_array(data, "depr_custom_schedule", p_depr_custom_schedule, 1);
+    ssc_data_set_number(data, "depr_bonus_sta", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_macrs_5", 1);
+    ssc_data_set_number(data, "depr_bonus_sta_macrs_15", 1);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_5", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_15", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_20", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_sl_39", 0);
+    ssc_data_set_number(data, "depr_bonus_sta_custom", 0);
+    ssc_data_set_number(data, "depr_bonus_fed", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_macrs_5", 1);
+    ssc_data_set_number(data, "depr_bonus_fed_macrs_15", 1);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_5", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_15", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_20", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_sl_39", 0);
+    ssc_data_set_number(data, "depr_bonus_fed_custom", 0);
+    ssc_data_set_number(data, "depr_itc_sta_macrs_5", 1);
+    ssc_data_set_number(data, "depr_itc_sta_macrs_15", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_5", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_15", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_20", 0);
+    ssc_data_set_number(data, "depr_itc_sta_sl_39", 0);
+    ssc_data_set_number(data, "depr_itc_sta_custom", 0);
+    ssc_data_set_number(data, "depr_itc_fed_macrs_5", 1);
+    ssc_data_set_number(data, "depr_itc_fed_macrs_15", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_5", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_15", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_20", 0);
+    ssc_data_set_number(data, "depr_itc_fed_sl_39", 0);
+    ssc_data_set_number(data, "depr_itc_fed_custom", 0);
+
 	ssc_number_t p_dc_degradation[1] = { 0.5 };
 	ssc_data_set_array(data, "dc_degradation", p_dc_degradation, 1);
 	ssc_data_set_number(data, "en_dc_lifetime_losses", 0);