Merge pull request #295 from ORNL-AMO/issue-275-b

Change solar thermal to always, fix multiplier placemet
ORNL-AMO · Mar 25, 2024 · 4ae1555 · 4ae1555
2 parents ee2fbfa + e985492
commit 4ae1555
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -644,10 +644,11 @@ export class App extends React.PureComponent<unknown, AppState> {
 				projectCostSavingsDeduction += project.costSavings.budgetPeriodCostSavings.electricity; 
 				projectCostSavingsDeduction += project.costSavings.budgetPeriodCostSavings.naturalGas; 
 				// projectCostSavingsDeduction += project.costSavings.budgetPeriodCostSavings.hydrogen; 
-				projectCostSavingsDeduction *= initialTrackedStats.projectCostSavingsMultiplier;
 			}
 			return projectCostSavingsDeduction;
 		}, 0);
+
+		projectCostSavingsDeduction *= initialTrackedStats.projectCostSavingsMultiplier;
 		newBudget -= projectCostSavingsDeduction;
 
 		// * patch in cost savings from select renewables
@@ -658,11 +659,11 @@ export class App extends React.PureComponent<unknown, AppState> {
 				projectSpecificCostSavings += project.costSavings.budgetPeriodCostSavings.naturalGas; 
 				// projectSpecificCostSavings += project.costSavings.budgetPeriodCostSavings.hydrogen;
 				// todo renewedProjectCostSavingsMultiplier will yield different results than multiplier first applied to all projects above
-				// projectSpecificCostSavings *= initialTrackedStats.renewedProjectCostSavingsMultiplier;
-				projectSpecificCostSavings *= initialTrackedStats.projectCostSavingsMultiplier;
 			}
 			return projectSpecificCostSavings;
 		}, 0);
+
+		projectSpecificCostSavings *= initialTrackedStats.projectCostSavingsMultiplier;
 		newBudget += projectSpecificCostSavings;
 
 		return newBudget; 

diff --git a/src/Projects.tsx b/src/Projects.tsx
@@ -1359,7 +1359,7 @@ Projects[Pages.heatPumpForOffice] = new ProjectControl({
 Projects[Pages.solarThermalHotWater] = new ProjectControl({
 	pageId: Pages.solarThermalHotWater,
 	isCapitalFundsEligible: true,
-	costSavingsCarryover: 'never',
+	costSavingsCarryover: 'always',
 	baseCost: 550_000,
 	financedAnnualCost: 55_000,
 	financedTotalCost: 550_000,