Merge pull request #234 from ucdavis/KL/addAdditionalOutputs

Report additional outputs for chp and gp models
ucdavis · Apr 18, 2022 · 4a48403 · 4a48403
2 parents 2bed6bb + f36f7d7
commit 4a48403
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 35 deletions.
diff --git a/src/components/Results/ResultsTables.tsx b/src/components/Results/ResultsTables.tsx
@@ -124,6 +124,7 @@ export const ResultsTable = (props: Props) => {
             props.yearlyResults.length
           )}
           system={props.frcsInputs.system}
+          teaModel={props.teaModel}
         />
       </div>
     </>

diff --git a/src/components/Results/Technoeconomic/TechnoeconomicTables.tsx b/src/components/Results/Technoeconomic/TechnoeconomicTables.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import { formatCurrency, formatNumber } from '../../Shared/util';
-import { YearlyResult } from '../../../models/Types';
+import { TechnoeconomicModels, YearlyResult } from '../../../models/Types';
 import { Table } from 'reactstrap';
 import { CashFlow } from '@ucdavis/tea/output.model';
 
 interface Props {
   yearlyResults: YearlyResult[];
   cashFlows: CashFlow[];
   system: String;
+  teaModel: string;
 }
 
 export const TechnoeconomicTables = (props: Props) => {
@@ -266,6 +267,25 @@ export const TechnoeconomicTables = (props: Props) => {
             </td>
           ))}
         </tr>
+        {props.teaModel === TechnoeconomicModels.gasificationPower && (
+          <tr>
+            <td>Dual Fuel Cost</td>
+            <td>$</td>
+            <td>
+              {formatCurrency(
+                props.cashFlows.reduce(
+                  (sum: number, x: CashFlow) => sum + x.DualFuelCost,
+                  0
+                )
+              )}
+            </td>
+            {props.cashFlows.map((result, i) => (
+              <td key={`dualFuelCost-${i}`}>
+                {formatCurrency(result.DualFuelCost)}
+              </td>
+            ))}
+          </tr>
+        )}
         <tr>
           <td>Non-fuel Expenses</td>
           <td>$</td>
@@ -318,7 +338,7 @@ export const TechnoeconomicTables = (props: Props) => {
           ))}
         </tr>
         <tr>
-          <td>Income Capacity</td>
+          <td>Income--Capacity</td>
           <td>$</td>
           <td>
             {formatCurrency(
@@ -334,40 +354,45 @@ export const TechnoeconomicTables = (props: Props) => {
             </td>
           ))}
         </tr>
-        <tr>
-          <td>Interest On Debt Reserve</td>
-          <td>$</td>
-          <td>
-            {formatCurrency(
-              props.cashFlows.reduce(
-                (sum: number, x: CashFlow) => sum + x.InterestOnDebtReserve,
-                0
-              )
-            )}
-          </td>
-          {props.cashFlows.map((result, i) => (
-            <td key={`interestOnDebtReserve-${i}`}>
-              {formatCurrency(result.InterestOnDebtReserve)}
+        {(props.teaModel === TechnoeconomicModels.genericCombinedHeatAndPower ||
+          props.teaModel === TechnoeconomicModels.gasificationPower) && (
+          <tr>
+            <td>Income--Heat</td>
+            <td>$</td>
+            <td>
+              {formatCurrency(
+                props.cashFlows.reduce(
+                  (sum: number, x: CashFlow) => sum + x.IncomeHeat,
+                  0
+                )
+              )}
             </td>
-          ))}
-        </tr>
-        <tr>
-          <td>Income -- Capacity</td>
-          <td>$</td>
-          <td>
-            {formatCurrency(
-              props.cashFlows.reduce(
-                (sum: number, x: CashFlow) => sum + x.IncomeCapacity,
-                0
-              )
-            )}
-          </td>
-          {props.cashFlows.map((result, i) => (
-            <td key={`incomeCapacity-${i}`}>
-              {formatCurrency(result.IncomeCapacity)}
+            {props.cashFlows.map((result, i) => (
+              <td key={`incomeHeat-${i}`}>
+                {formatCurrency(result.IncomeHeat)}
+              </td>
+            ))}
+          </tr>
+        )}
+        {props.teaModel === TechnoeconomicModels.gasificationPower && (
+          <tr>
+            <td>Income--Char/Ash</td>
+            <td>$</td>
+            <td>
+              {formatCurrency(
+                props.cashFlows.reduce(
+                  (sum: number, x: CashFlow) => sum + x.IncomeChar,
+                  0
+                )
+              )}
             </td>
-          ))}
-        </tr>
+            {props.cashFlows.map((result, i) => (
+              <td key={`incomeChar-${i}`}>
+                {formatCurrency(result.IncomeChar)}
+              </td>
+            ))}
+          </tr>
+        )}
         <tr>
           <td>Interest On Debt Reserve</td>
           <td>$</td>
@@ -380,7 +405,7 @@ export const TechnoeconomicTables = (props: Props) => {
             )}
           </td>
           {props.cashFlows.map((result, i) => (
-            <td key={`interestonDebtReserve-${i}`}>
+            <td key={`interestOnDebtReserve-${i}`}>
               {formatCurrency(result.InterestOnDebtReserve)}
             </td>
           ))}
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,7 @@ export const ResultsTable = (props: Props) => { @@
                 props.yearlyResults.length
               )}
               system={props.frcsInputs.system}
+              teaModel={props.teaModel}
             />
           </div>
         </>
@@ Expand Down @@