From 6bab4805067cb2b7f36d1654e8cca469c49e86a1 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Mon, 17 Mar 2025 11:22:12 +0100
Subject: [PATCH] removal of double accumulator
 dailyAverageFinalEnergyConsumption and DailyAverageEnergyConsumption, both
 were filled the same way. So unused one has been removed.

---
 _alp/Agents/EnergyDataViewer/Code/Functions.java | 2 +-
 _alp/Classes/Class.J_RapidRunData.java           | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/_alp/Agents/EnergyDataViewer/Code/Functions.java b/_alp/Agents/EnergyDataViewer/Code/Functions.java
index d65f7293..1d781477 100644
--- a/_alp/Agents/EnergyDataViewer/Code/Functions.java
+++ b/_alp/Agents/EnergyDataViewer/Code/Functions.java
@@ -384,7 +384,7 @@
 v_dataElectricityForHydrogenConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageElectrolyserElectricityConsumption_kW.getDataSet(startTime_h);
 v_dataElectricityForCookingConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageElectricCookingConsumption_kW.getDataSet(startTime_h);
 v_dataDistrictHeatConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageDistrictHeatingConsumption_kW.getDataSet(startTime_h);
-data_dailyAverageFinalEnergyConsumption_kW = data.getRapidRunData().acc_dailyAverageFinalEnergyConsumption_kW.getDataSet(startTime_h);
+data_dailyAverageFinalEnergyConsumption_kW = data.getRapidRunData().acc_dailyAverageEnergyConsumption_kW.getDataSet(startTime_h);
 
 //Supply
 v_dataElectricityWindProductionYear_kW = data.getRapidRunData().acc_dailyAverageWindProduction_kW.getDataSet(startTime_h);
diff --git a/_alp/Classes/Class.J_RapidRunData.java b/_alp/Classes/Class.J_RapidRunData.java
index 1e460726..05320d41 100644
--- a/_alp/Classes/Class.J_RapidRunData.java
+++ b/_alp/Classes/Class.J_RapidRunData.java
@@ -31,7 +31,6 @@ public class J_RapidRunData {
     public ZeroAccumulator acc_dailyAverageElectricCookingConsumption_kW;
     public ZeroAccumulator acc_dailyAverageElectrolyserElectricityConsumption_kW;
     public ZeroAccumulator acc_dailyAverageDistrictHeatingConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageFinalEnergyConsumption_kW;
     
     public ZeroAccumulator acc_dailyAveragePVProduction_kW;
     public ZeroAccumulator acc_dailyAverageWindProduction_kW;
@@ -147,7 +146,6 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    acc_dailyAverageElectricCookingConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    acc_dailyAverageElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    acc_dailyAverageDistrictHeatingConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageFinalEnergyConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    
 	    acc_dailyAveragePVProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    acc_dailyAverageWindProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
@@ -264,7 +262,6 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
     	acc_dailyAverageElectricCookingConsumption_kW.reset();
     	acc_dailyAverageElectrolyserElectricityConsumption_kW.reset();
     	acc_dailyAverageDistrictHeatingConsumption_kW.reset();
-    	acc_dailyAverageFinalEnergyConsumption_kW.reset();
     	
     	acc_dailyAveragePVProduction_kW.reset();
     	acc_dailyAverageWindProduction_kW.reset();
@@ -378,7 +375,6 @@ public J_RapidRunData getClone() {
         clone.acc_dailyAverageElectricCookingConsumption_kW=this.acc_dailyAverageElectricCookingConsumption_kW.getClone();
         clone.acc_dailyAverageElectrolyserElectricityConsumption_kW=this.acc_dailyAverageElectrolyserElectricityConsumption_kW.getClone();
         clone.acc_dailyAverageDistrictHeatingConsumption_kW=this.acc_dailyAverageDistrictHeatingConsumption_kW.getClone();
-        clone.acc_dailyAverageFinalEnergyConsumption_kW=this.acc_dailyAverageFinalEnergyConsumption_kW.getClone();
         clone.acc_dailyAveragePVProduction_kW=this.acc_dailyAveragePVProduction_kW.getClone();
         clone.acc_dailyAverageWindProduction_kW=this.acc_dailyAverageWindProduction_kW.getClone();
         clone.acc_dailyAverageV2GProduction_kW=this.acc_dailyAverageV2GProduction_kW.getClone();