Skip to content

Commit 312463a

Browse files
authored
Merge pull request #139 from Zenmo/battery_cycle_KPI_update
Battery cycle KPI update to rapidRunData + bugfixes for maintaining totalBatteryCapacity values
2 parents 0845072 + 869d101 commit 312463a

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

_alp/Agents/EnergyModel/Code/Functions.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,15 +540,13 @@ null, roundToDecimal( a.v_electricityImported_kWh-a.v_electricityExported_kWh, 2
540540
J_EAStorageElectric e = (J_EAStorageElectric)ea;
541541
v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
542542
v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
543-
v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += e.getStorageCapacity_kWh() / 1000;
544543
v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
545544
}
546545

547546
if( ea instanceof J_EAEV ) {
548547
J_EAEV e = (J_EAEV)ea;
549548
v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
550549
v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
551-
v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += e.getStorageCapacity_kWh() / 1000;
552550
v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
553551
}
554552
}
@@ -1526,12 +1524,13 @@ ArrayList<GridConnection> f_getGridConnections()
15261524
//f_initializeAccumulators();
15271525

15281526
// Use parallelisation?
1527+
if (c_gridConnections.size() > 100) {
1528+
b_parallelizeGridConnections = true;
1529+
}
15291530
if (pop_connectionOwners.size() > 500 && b_parallelizeGridConnections) {
15301531
b_parallelizeConnectionOwners = true;
15311532
}
1532-
if (c_gridConnections.size() < 100) {
1533-
b_parallelizeGridConnections = true;
1534-
}
1533+
15351534

15361535
// set initial values
15371536
f_setInitialValues();

_alp/Agents/EnergyModel/Variables.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@
17651765
<UnitType>NONE</UnitType>
17661766
<SdArray>false</SdArray>
17671767
<DefaultValue Class="CodeValue">
1768-
<Code><![CDATA[true]]></Code>
1768+
<Code><![CDATA[false]]></Code>
17691769
</DefaultValue>
17701770
<ParameterEditor>
17711771
<Id>1658752734131</Id>
@@ -1878,7 +1878,7 @@
18781878
<UnitType>NONE</UnitType>
18791879
<SdArray>false</SdArray>
18801880
<DefaultValue Class="CodeValue">
1881-
<Code><![CDATA[true]]></Code>
1881+
<Code><![CDATA[false]]></Code>
18821882
</DefaultValue>
18831883
<ParameterEditor>
18841884
<Id>1663577621791</Id>

_alp/Agents/GridConnection/Code/Functions.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,6 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
10821082

10831083
if (energyModel.b_isInitialized) {
10841084
energyModel.f_addEnergyCarrier(EC);
1085-
//energyModel.v_activeEnergyCarriers.add(EC);
10861085
DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
10871086
DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
10881087
double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
@@ -1093,13 +1092,6 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
10931092
}
10941093
v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
10951094
v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
1096-
/*dsm_dailyAverageDemandDataSets_kW.put( EC, new DataSet(365));
1097-
dsm_dailyAverageSupplyDataSets_kW.put( EC, new DataSet(365));
1098-
dsm_summerWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
1099-
dsm_summerWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
1100-
dsm_winterWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
1101-
dsm_winterWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
1102-
*/
11031095
}
11041096
}
11051097
}
@@ -2463,7 +2455,7 @@ else if (flowsMap.get(EC) > 0){
24632455
obj.gisRegion.setVisible(false);
24642456
}
24652457

2466-
2458+
24672459
// update GN parents' wind / solar totals
24682460
l_parentNodeElectric.getConnectedAgent().f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, v_liveAssetsMetaData.totalInstalledPVPower_kW, false);
24692461
l_parentNodeElectric.getConnectedAgent().f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, v_liveAssetsMetaData.totalInstalledWindPower_kW, false);

_alp/Classes/Class.J_RapidRunData.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,9 @@ public double getTotalDistrictHeatingConsumption_MWh() {
555555
return acc_dailyAverageDistrictHeatingConsumption_kW.getIntegral_MWh();
556556
}
557557

558+
public double getTotalBatteryCycles() {
559+
return acc_dailyAverageBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
560+
}
558561

559562
// Summerweek Getters
560563
public double getSummerWeekElectricityConsumed_MWh() {
@@ -602,6 +605,10 @@ public double getSummerWeekPrimaryEnergyProductionHeatpumps_MWh() {
602605
return acc_summerWeekPrimaryEnergyProductionHeatpumps_kW.getIntegral_MWh();
603606
}
604607

608+
public double getSummerWeekBatteryCycles() {
609+
return acc_summerWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
610+
}
611+
605612
// Winterweek Getters
606613
public double getWinterWeekElectricityConsumed_MWh() {
607614
return am_winterWeekConsumptionAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getIntegral_MWh();
@@ -647,6 +654,10 @@ public double getWinterWeekPrimaryEnergyProductionHeatpumps_MWh() {
647654
return acc_winterWeekPrimaryEnergyProductionHeatpumps_kW.getIntegral_MWh();
648655
}
649656

657+
public double getWinterWeekBatteryCycles() {
658+
return acc_winterWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
659+
}
660+
650661
// Daytime getters
651662
public double getDaytimeElectricityConsumed_MWh() {
652663
return acc_daytimeElectricityConsumption_kW.getIntegral_MWh();

0 commit comments

Comments
 (0)