From c159b6c421ff794ac2b42ab4a8cfa19df6ef4aa6 Mon Sep 17 00:00:00 2001 From: Ate Hempenius Date: Mon, 31 Mar 2025 11:09:19 +0200 Subject: [PATCH] bugfix ts soc filling --- _alp/Agents/EnergyCoop/Code/Functions.java | 6 +++--- _alp/Agents/GridConnection/Code/Functions.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java index a8782d38..36cde390 100644 --- a/_alp/Agents/EnergyCoop/Code/Functions.java +++ b/_alp/Agents/EnergyCoop/Code/Functions.java @@ -1578,7 +1578,7 @@ HashSet f_getAllChildCustomerGridConnections_recursion(HashSet 0){ - v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep(0); @@ -1621,7 +1621,7 @@ HashSet f_getAllChildCustomerGridConnections_recursion(HashSet 0){ - v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep(0); @@ -1657,7 +1657,7 @@ HashSet f_getAllChildCustomerGridConnections_recursion(HashSet 0){ - v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep(0); diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java index da6b0b82..6c8ab36b 100644 --- a/_alp/Agents/GridConnection/Code/Functions.java +++ b/_alp/Agents/GridConnection/Code/Functions.java @@ -2360,7 +2360,7 @@ else if (flowsMap.get(EC) > 0){ v_rapidRunData.acc_summerWeekCHPElectricityProduction_kW.addStep( v_CHPProductionElectric_kW ); v_rapidRunData.ts_summerWeekBatteriesStoredEnergy_MWh.addStep(v_batteryStoredEnergy_kWh); if(v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){ - v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_summerWeekBatteriesSOC_fr.addStep(0); @@ -2404,7 +2404,7 @@ else if (flowsMap.get(EC) > 0){ v_rapidRunData.acc_winterWeekCHPElectricityProduction_kW.addStep( v_CHPProductionElectric_kW ); v_rapidRunData.ts_winterWeekBatteriesStoredEnergy_MWh.addStep(v_batteryStoredEnergy_kWh); if(v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){ - v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_winterWeekBatteriesSOC_fr.addStep(0); @@ -2439,7 +2439,7 @@ else if (flowsMap.get(EC) > 0){ v_rapidRunData.acc_dailyAverageCHPElectricityProduction_kW.addStep( v_CHPProductionElectric_kW ); v_rapidRunData.ts_dailyAverageBatteriesStoredEnergy_MWh.addStep(v_batteryStoredEnergy_kWh); if(v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){ - v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep(v_batteryStoredEnergy_kWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); + v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep((v_batteryStoredEnergy_kWh/1000)/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh); } else{ v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.addStep(0);