Remove double counting of IBI and CBI ssc #1047

NREL · Sep 13, 2023 · 1d0b091 · 1d0b091
1 parent 532bb1b
commit 1d0b091
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/ssc/cmod_communitysolar.cpp b/ssc/cmod_communitysolar.cpp
@@ -3190,7 +3190,7 @@ class cm_communitysolar : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = -cf.at(CF_debt_payment_principal,i);
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + size_of_debt + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity + size_of_debt;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);
 

diff --git a/ssc/cmod_equpartflip.cpp b/ssc/cmod_equpartflip.cpp
@@ -2292,7 +2292,7 @@ class cm_equpartflip : public compute_module
 		depr_fedbas_total = depr_fedbas_macrs_5 + depr_fedbas_macrs_15 + depr_fedbas_sl_5 + depr_fedbas_sl_15 + depr_fedbas_sl_20 + depr_fedbas_sl_39 + depr_fedbas_custom;
 
 		purchase_of_property = -cost_installed + cf.at(CF_reserve_om, 0) + cf.at(CF_reserve_receivables, 0);
-		issuance_of_equity = cost_installed - (ibi_total + cbi_total);
+        issuance_of_equity = cost_installed;// -(ibi_total + cbi_total);
 
 		equity_tax_investor = tax_investor_equity_frac * issuance_of_equity;
 
@@ -2318,7 +2318,7 @@ class cm_equpartflip : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = 0;
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity;// +ibi_total + cbi_total;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);
 

diff --git a/ssc/cmod_host_developer.cpp b/ssc/cmod_host_developer.cpp
@@ -2550,7 +2550,7 @@ class cm_host_developer : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = -cf.at(CF_debt_payment_principal,i);
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + size_of_debt + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity + size_of_debt;// +ibi_total + cbi_total;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);
 

diff --git a/ssc/cmod_levpartflip.cpp b/ssc/cmod_levpartflip.cpp
@@ -2645,7 +2645,7 @@ class cm_levpartflip : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = -cf.at(CF_debt_payment_principal,i);
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + size_of_debt + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity + size_of_debt;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);
 

diff --git a/ssc/cmod_merchantplant.cpp b/ssc/cmod_merchantplant.cpp
@@ -2739,7 +2739,7 @@ class cm_merchantplant : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = -cf.at(CF_debt_payment_principal,i);
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + size_of_debt + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity + size_of_debt;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);
 

diff --git a/ssc/cmod_singleowner.cpp b/ssc/cmod_singleowner.cpp
@@ -2767,7 +2767,7 @@ class cm_singleowner : public compute_module
 			if (i==0) cf.at(CF_project_investing_activities,i) += purchase_of_property;
 
 			cf.at(CF_project_financing_activities,i) = -cf.at(CF_debt_payment_principal,i);
-			if (i==0) cf.at(CF_project_financing_activities,i) += issuance_of_equity + size_of_debt + ibi_total + cbi_total;
+            if (i == 0) cf.at(CF_project_financing_activities, i) += issuance_of_equity + size_of_debt;
 
 			cf.at(CF_pretax_cashflow,i) = cf.at(CF_project_operating_activities,i) + cf.at(CF_project_investing_activities,i) + cf.at(CF_project_financing_activities,i);