Merge pull request #139 from Zenmo/battery_cycle_KPI_update

Battery cycle KPI update to rapidRunData + bugfixes for maintaining totalBatteryCapacity values

Author: GillisHommen

_alp/Agents/EnergyModel/Code/Functions.java

@@ -540,15 +540,13 @@ null, roundToDecimal( a.v_electricityImported_kWh-a.v_electricityExported_kWh, 2
 		J_EAStorageElectric e = (J_EAStorageElectric)ea;
 		v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
 		v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
-		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += e.getStorageCapacity_kWh() / 1000;
 		v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
 	}
 
 	if( ea instanceof J_EAEV ) {
 		J_EAEV e = (J_EAEV)ea;
 		v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
 		v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
-		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += e.getStorageCapacity_kWh() / 1000;
 		v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
 	}
 }
@@ -1526,12 +1524,13 @@ ArrayList<GridConnection> f_getGridConnections()
 //f_initializeAccumulators();
 
 // Use parallelisation?
+if (c_gridConnections.size() > 100) {
+	b_parallelizeGridConnections = true;
+}
 if (pop_connectionOwners.size() > 500 && b_parallelizeGridConnections) {
 	b_parallelizeConnectionOwners = true;
 }
-if (c_gridConnections.size() < 100) {
-	b_parallelizeGridConnections = true;
-}
+
 
 // set initial values
 f_setInitialValues();

_alp/Agents/EnergyModel/Variables.xml

@@ -1765,7 +1765,7 @@
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[true]]></Code>
+				<Code><![CDATA[false]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1658752734131</Id>
@@ -1878,7 +1878,7 @@
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[true]]></Code>
+				<Code><![CDATA[false]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1663577621791</Id>

_alp/Agents/GridConnection/Code/Functions.java

@@ -1082,7 +1082,6 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 
 		if (energyModel.b_isInitialized) {
 			energyModel.f_addEnergyCarrier(EC);
-			//energyModel.v_activeEnergyCarriers.add(EC);
 			DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
 			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
 			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
 			}
 			v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
 			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
-			/*dsm_dailyAverageDemandDataSets_kW.put( EC, new DataSet(365));
-			dsm_dailyAverageSupplyDataSets_kW.put( EC, new DataSet(365));
-			dsm_summerWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
-			dsm_summerWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
-			dsm_winterWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
-			dsm_winterWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / energyModel.p_timeStep_h)));
-			*/
 		}
 	}
 }
@@ -2463,7 +2455,7 @@ else if (flowsMap.get(EC) > 0){
 		obj.gisRegion.setVisible(false);
 	}
 
-	
+
 	// update GN parents' wind / solar totals
 	l_parentNodeElectric.getConnectedAgent().f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, v_liveAssetsMetaData.totalInstalledPVPower_kW, false);
 	l_parentNodeElectric.getConnectedAgent().f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, v_liveAssetsMetaData.totalInstalledWindPower_kW, false);

_alp/Classes/Class.J_RapidRunData.java

@@ -555,6 +555,9 @@ public double getTotalDistrictHeatingConsumption_MWh() {
     	return acc_dailyAverageDistrictHeatingConsumption_kW.getIntegral_MWh();
     }
 
+    public double getTotalBatteryCycles() { 
+    	return acc_dailyAverageBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    }
 
 // Summerweek Getters
     public double getSummerWeekElectricityConsumed_MWh() {
@@ -602,6 +605,10 @@ public double getSummerWeekPrimaryEnergyProductionHeatpumps_MWh() {
         return acc_summerWeekPrimaryEnergyProductionHeatpumps_kW.getIntegral_MWh();
     }
 
+    public double getSummerWeekBatteryCycles() { 
+    	return acc_summerWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    }
+    
 // Winterweek Getters
     public double getWinterWeekElectricityConsumed_MWh() {
         return am_winterWeekConsumptionAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getIntegral_MWh();
@@ -647,6 +654,10 @@ public double getWinterWeekPrimaryEnergyProductionHeatpumps_MWh() {
         return acc_winterWeekPrimaryEnergyProductionHeatpumps_kW.getIntegral_MWh();
     }
 
+    public double getWinterWeekBatteryCycles() { 
+    	return acc_winterWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    }
+    
 // Daytime getters    
     public double getDaytimeElectricityConsumed_MWh() { 
         return acc_daytimeElectricityConsumption_kW.getIntegral_MWh();