Skip to content

Removal of double accumulator dailyAverageFinalEnergyConsumption and DailyAverageEnergyConsumption #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AteZenmo merged 1 commit into from
Mar 17, 2025
Merged

Removal of double accumulator dailyAverageFinalEnergyConsumption and DailyAverageEnergyConsumption #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _alp/Agents/EnergyDataViewer/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions _alp/Classes/Class.J_RapidRunData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down