From 645b1d7e2db7187d081506cd7fdcfd8f8e67752d Mon Sep 17 00:00:00 2001 From: Paul Gilman Date: Thu, 26 Oct 2023 16:07:46 -0700 Subject: [PATCH] Remove total PTC output from all models Ignoring legacy cmod_ippppa --- ssc/cmod_cashloan.cpp | 4 ---- ssc/common.cpp | 1 - 2 files changed, 5 deletions(-) diff --git a/ssc/cmod_cashloan.cpp b/ssc/cmod_cashloan.cpp index cbde6214a..14457f88c 100644 --- a/ssc/cmod_cashloan.cpp +++ b/ssc/cmod_cashloan.cpp @@ -241,7 +241,6 @@ enum { CF_ptc_fed, CF_ptc_sta, - CF_ptc_total, CF_sta_depr_sched, CF_sta_depreciation, @@ -987,8 +986,6 @@ class cm_cashloan : public compute_module // compute pbi total cf.at(CF_pbi_total, i) = cf.at(CF_pbi_fed, i) + cf.at(CF_pbi_sta, i) + cf.at(CF_pbi_uti, i) + cf.at(CF_pbi_oth, i); - // compute ptc total - cf.at(CF_ptc_total, i) = cf.at(CF_ptc_fed, i) + cf.at(CF_ptc_sta, i); // compute depreciation from basis and precalculated schedule cf.at(CF_sta_depreciation,i) = cf.at(CF_sta_depr_sched,i)*state_depr_basis; @@ -1435,7 +1432,6 @@ class cm_cashloan : public compute_module save_cf( CF_ptc_fed, nyears, "cf_ptc_fed" ); save_cf( CF_ptc_sta, nyears, "cf_ptc_sta" ); - save_cf( CF_ptc_total, nyears, "cf_ptc_total" ); // SAM 1038 diff --git a/ssc/common.cpp b/ssc/common.cpp index 675f89f8d..bcba4f086 100644 --- a/ssc/common.cpp +++ b/ssc/common.cpp @@ -428,7 +428,6 @@ var_info vtab_payment_incentives[] = { { SSC_OUTPUT, SSC_ARRAY, "cf_ptc_fed", "Federal PTC income", "$", "", "Cash Flow Incentives", "*", "LENGTH_EQUAL=cf_length", "" }, { SSC_OUTPUT, SSC_ARRAY, "cf_ptc_sta", "State PTC income", "$", "", "Cash Flow Incentives", "*", "LENGTH_EQUAL=cf_length", "" }, -{ SSC_OUTPUT, SSC_ARRAY, "cf_ptc_total", "Total PTC income", "$", "", "Cash Flow Incentives", "", "LENGTH_EQUAL=cf_length", ""}, // SAM 1038 - make required after other compute module updated - see ssc 910 { SSC_OUTPUT, SSC_ARRAY, "cf_itc_fed_amount", "Federal ITC amount income", "$", "", "Cash Flow Incentives", "", "LENGTH_EQUAL=cf_length", "" }, { SSC_OUTPUT, SSC_ARRAY, "cf_itc_sta_amount", "State ITC amount income", "$", "", "Cash Flow Incentives", "", "LENGTH_EQUAL=cf_length", "" },