From 355f76bea3eb7ee34e349c94c9243d063a66d331 Mon Sep 17 00:00:00 2001
From: Matt Prilliman <54449384+mjprilliman@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:45:06 -0600
Subject: [PATCH] Update Host developer cashflow, error for third party in
 comparison macros

---
 deploy/runtime/macros/Compare Cases.lk             | 10 +++-------
 .../Battery Compare Cases.lk                       | 14 ++++++++++----
 .../macros/PV Battery/Battery Compare Cases.lk     | 14 ++++++++++----
 .../Standalone Battery/Battery Compare Cases.lk    | 14 ++++++++++----
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/deploy/runtime/macros/Compare Cases.lk b/deploy/runtime/macros/Compare Cases.lk
index d87d327ed..0c54ad4cf 100644
--- a/deploy/runtime/macros/Compare Cases.lk	
+++ b/deploy/runtime/macros/Compare Cases.lk	
@@ -121,11 +121,10 @@ for (i=0; i<num_cases; i++)
 		exit;
 	}
 	
-	if (config[1] == 'LCOE Calculator' || config[1] == "None")
-
+	if (config[1] == 'LCOE Calculator' || config[1] == "None" || config[1] == "Third Party")
 	{
 
-		msgbox('The PV report macro does not work with the LCOE Calculator financial model or with No Financial model.');
+		msgbox('The case comparison macro does not work with the LCOE Calculator financial model, the Third Party Owner - Host financial model, or with No Financial model.');
 
 		exit;
 
@@ -159,11 +158,8 @@ for (i=0; i<num_cases; i++)
 	
 		annual_cashflow_bin = get('cf_project_return_aftertax');
 	}
-	else if (config[1] == "Residential" || config[1] == "Commercial") {
-		annual_cashflow_bin = get('cf_after_tax_cash_flow');
-	}
 	else {
-		annual_cashflow_bin = get('cf_tax_investor_aftertax');
+		annual_cashflow_bin = get('cf_after_tax_cash_flow');
 	}
 	for (j = 0; j < analysis_period+1; j++) {
 		annual_cashflow[j][i] = annual_cashflow_bin[j];
diff --git a/deploy/runtime/macros/Custom Generation Battery/Battery Compare Cases.lk b/deploy/runtime/macros/Custom Generation Battery/Battery Compare Cases.lk
index 03156f640..89bfad6e3 100644
--- a/deploy/runtime/macros/Custom Generation Battery/Battery Compare Cases.lk	
+++ b/deploy/runtime/macros/Custom Generation Battery/Battery Compare Cases.lk	
@@ -123,6 +123,15 @@ for (i=0; i<num_cases; i++)
 		msgbox('The Battery Compare Cases macro is only meant to be used with battery cases. See the Compare Cases macro for non-battery cases');
 		exit;
 	}
+	
+	if (config[1] == 'LCOE Calculator' || config[1] == "None" || config[1] == "Third Party")
+	{
+
+		msgbox('The case comparison macro does not work with the LCOE Calculator financial model, the Third Party Owner - Host financial model, or with No Financial model.');
+
+		exit;
+
+	}
 
 	if (config[1] == 'LCOE Calculator') {
 		lcoe[i] = get('lcoe_fcr');
@@ -162,11 +171,8 @@ for (i=0; i<num_cases; i++)
 	
 		annual_cashflow_bin = get('cf_project_return_aftertax');
 	}
-	else if (config[1] == "Residential" || config[1] == "Commercial") {
-		annual_cashflow_bin = get('cf_after_tax_cash_flow');
-	}
 	else {
-		annual_cashflow_bin = get('cf_tax_investor_aftertax');
+		annual_cashflow_bin = get('cf_after_tax_cash_flow');
 	}
 	for (j = 0; j < analysis_period+1; j++) {
 		annual_cashflow[j][i] = annual_cashflow_bin[j];
diff --git a/deploy/runtime/macros/PV Battery/Battery Compare Cases.lk b/deploy/runtime/macros/PV Battery/Battery Compare Cases.lk
index 03156f640..89bfad6e3 100644
--- a/deploy/runtime/macros/PV Battery/Battery Compare Cases.lk	
+++ b/deploy/runtime/macros/PV Battery/Battery Compare Cases.lk	
@@ -123,6 +123,15 @@ for (i=0; i<num_cases; i++)
 		msgbox('The Battery Compare Cases macro is only meant to be used with battery cases. See the Compare Cases macro for non-battery cases');
 		exit;
 	}
+	
+	if (config[1] == 'LCOE Calculator' || config[1] == "None" || config[1] == "Third Party")
+	{
+
+		msgbox('The case comparison macro does not work with the LCOE Calculator financial model, the Third Party Owner - Host financial model, or with No Financial model.');
+
+		exit;
+
+	}
 
 	if (config[1] == 'LCOE Calculator') {
 		lcoe[i] = get('lcoe_fcr');
@@ -162,11 +171,8 @@ for (i=0; i<num_cases; i++)
 	
 		annual_cashflow_bin = get('cf_project_return_aftertax');
 	}
-	else if (config[1] == "Residential" || config[1] == "Commercial") {
-		annual_cashflow_bin = get('cf_after_tax_cash_flow');
-	}
 	else {
-		annual_cashflow_bin = get('cf_tax_investor_aftertax');
+		annual_cashflow_bin = get('cf_after_tax_cash_flow');
 	}
 	for (j = 0; j < analysis_period+1; j++) {
 		annual_cashflow[j][i] = annual_cashflow_bin[j];
diff --git a/deploy/runtime/macros/Standalone Battery/Battery Compare Cases.lk b/deploy/runtime/macros/Standalone Battery/Battery Compare Cases.lk
index 03156f640..89bfad6e3 100644
--- a/deploy/runtime/macros/Standalone Battery/Battery Compare Cases.lk	
+++ b/deploy/runtime/macros/Standalone Battery/Battery Compare Cases.lk	
@@ -123,6 +123,15 @@ for (i=0; i<num_cases; i++)
 		msgbox('The Battery Compare Cases macro is only meant to be used with battery cases. See the Compare Cases macro for non-battery cases');
 		exit;
 	}
+	
+	if (config[1] == 'LCOE Calculator' || config[1] == "None" || config[1] == "Third Party")
+	{
+
+		msgbox('The case comparison macro does not work with the LCOE Calculator financial model, the Third Party Owner - Host financial model, or with No Financial model.');
+
+		exit;
+
+	}
 
 	if (config[1] == 'LCOE Calculator') {
 		lcoe[i] = get('lcoe_fcr');
@@ -162,11 +171,8 @@ for (i=0; i<num_cases; i++)
 	
 		annual_cashflow_bin = get('cf_project_return_aftertax');
 	}
-	else if (config[1] == "Residential" || config[1] == "Commercial") {
-		annual_cashflow_bin = get('cf_after_tax_cash_flow');
-	}
 	else {
-		annual_cashflow_bin = get('cf_tax_investor_aftertax');
+		annual_cashflow_bin = get('cf_after_tax_cash_flow');
 	}
 	for (j = 0; j < analysis_period+1; j++) {
 		annual_cashflow[j][i] = annual_cashflow_bin[j];