Skip to content

Charge point charging updates #202

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
GillisHommen merged 9 commits into from
Sep 24, 2025
Merged

Charge point charging updates #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
97e3adb
added V1Gactive boolean to J_EAChargePoint
GillisHommen Sep 16, 2025
019df3a
Merge branch 'main' into ChargePointChargingUpdates
AteZenmo Sep 18, 2025
f2d4f39
added current charging information to gridnodes. Added new chargingma…
AteZenmo Sep 18, 2025
7a42c93
refactor of v2g and v1g activating
AteZenmo Sep 19, 2025
e77bfa4
start on net bewust laden for chargepoints.
AteZenmo Sep 19, 2025
9df5883
chargepoint grid load control management updates
AteZenmo Sep 22, 2025
75c0e65
Further tweaks to 'netbewust laden' for J_EAChargePoints.
GillisHommen Sep 23, 2025
a6eed59
added fast forward function for chargepoints to de f_setActive functi…
AteZenmo Sep 23, 2025
c2750ad
Fix voor 'achterblijvende' V2G accumulator, fix voor V2G assetFlow-sw…
GillisHommen Sep 24, 2025
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
11 changes: 10 additions & 1 deletion Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,11 @@
</Option>
<Option>
<Id>1755522163223</Id>
<Name><![CDATA[BALANCE]]></Name>
<Name><![CDATA[BALANCE_LOCAL]]></Name>
</Option>
<Option>
<Id>1758191806152</Id>
<Name><![CDATA[BALANCE_GRID]]></Name>
</Option>
<Option>
<Id>1668371973959</Id>
Expand Down Expand Up @@ -1705,6 +1709,11 @@
<Name><![CDATA[J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH]]></Name>
<Folder>1756210851750</Folder>
</JavaClass>
<JavaClass>
<Id>1758192949084</Id>
<Name><![CDATA[J_ChargingManagementOffPeak]]></Name>
<Folder>1755154772688</Folder>
</JavaClass>
</JavaClasses>
<RequiredLibraryReference>
<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/EnergyCoop/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
EnumSet<OL_EnergyCarriers> activeEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeEnergyCarriers);
EnumSet<OL_EnergyCarriers> activeConsumptionEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeConsumptionEnergyCarriers);
EnumSet<OL_EnergyCarriers> activeProductionEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeProductionEnergyCarriers);
EnumSet<OL_AssetFlowCategories> activeAssetFlows_rapidRun = EnumSet.copyOf(v_liveAssetsMetaData.activeAssetFlows);
//Need to do this, for if the sliders have changed, otherwise potential errors/missing data
boolean storeTotalAssetFlows = true;
for(GridConnection GC : c_memberGridConnections){
Expand All @@ -1559,7 +1559,7 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();

//Initialize the rapid run data
v_rapidRunData.initializeAccumulators(energyModel.p_runEndTime_h - energyModel.p_runStartTime_h, energyModel.p_timeStep_h, activeEnergyCarriers_rapidRun, activeConsumptionEnergyCarriers_rapidRun, activeProductionEnergyCarriers_rapidRun);
v_rapidRunData.initializeAccumulators(energyModel.p_runEndTime_h - energyModel.p_runStartTime_h, energyModel.p_timeStep_h, activeEnergyCarriers_rapidRun, activeConsumptionEnergyCarriers_rapidRun, activeProductionEnergyCarriers_rapidRun, activeAssetFlows_rapidRun);

/*ALCODEEND*/}

Expand Down
58 changes: 24 additions & 34 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,14 @@

if (GC.v_rapidRunData != null) {
if (b_storePreviousRapidRunData) {
GC.v_previousRunData = GC.v_rapidRunData.getClone();
GC.v_previousRunData = GC.v_rapidRunData;
}
GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
} else {
GC.v_rapidRunData = new J_RapidRunData(GC);
GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
GC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, GC.v_liveData.activeEnergyCarriers, GC.v_liveData.activeConsumptionEnergyCarriers, GC.v_liveData.activeProductionEnergyCarriers); //f_initializeAccumulators();
}
GC.v_rapidRunData = new J_RapidRunData(GC);
GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
GC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, GC.v_liveData.activeEnergyCarriers, GC.v_liveData.activeConsumptionEnergyCarriers, GC.v_liveData.activeProductionEnergyCarriers, GC.v_liveAssetsMetaData.activeAssetFlows); //f_initializeAccumulators();

}

GC.f_resetStates();

GC.c_tripTrackers.forEach(tt->{
Expand Down Expand Up @@ -287,21 +283,22 @@
for (EnergyCoop EC : pop_energyCoops) {
if (EC.v_rapidRunData != null) {
if (b_storePreviousRapidRunData) {
EC.v_previousRunData = EC.v_rapidRunData.getClone();
EC.v_previousRunData = EC.v_rapidRunData;
}
EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
/*EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();
if(EC.v_rapidRunData.getStoreTotalAssetFlows() == false){
EC.v_rapidRunData.setStoreTotalAssetFlows(true);
EC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, EC.v_liveData.activeEnergyCarriers, EC.v_liveData.activeConsumptionEnergyCarriers, EC.v_liveData.activeProductionEnergyCarriers);
}
} else {
EC.v_rapidRunData = new J_RapidRunData(EC);
EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();

EC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, EC.v_liveData.activeEnergyCarriers, EC.v_liveData.activeConsumptionEnergyCarriers, EC.v_liveData.activeProductionEnergyCarriers);
}
EC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, EC.v_liveData.activeEnergyCarriers, EC.v_liveData.activeConsumptionEnergyCarriers, EC.v_liveData.activeProductionEnergyCarriers, EC.v_liveAssetsMetaData.activeAssetFlows);
}*/
}
EC.v_rapidRunData = new J_RapidRunData(EC);
EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();
//if(EC.v_rapidRunData.getStoreTotalAssetFlows() == false){
EC.v_rapidRunData.setStoreTotalAssetFlows(true);
//}
EC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, EC.v_liveData.activeEnergyCarriers, EC.v_liveData.activeConsumptionEnergyCarriers, EC.v_liveData.activeProductionEnergyCarriers, EC.v_liveAssetsMetaData.activeAssetFlows);
EC.f_resetStates();

}
Expand All @@ -313,22 +310,15 @@
c_profiles.forEach(p -> p.updateValue(p_runStartTime_h));
c_forecasts.forEach(p -> p.initializeForecast(p_runStartTime_h));

if (v_rapidRunData != null) {
if (b_storePreviousRapidRunData) {
v_previousRunData = v_rapidRunData.getClone();
}
v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();
v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
} else {
v_rapidRunData = new J_RapidRunData(this);
v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();
v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, v_liveData.activeEnergyCarriers, v_liveData.activeConsumptionEnergyCarriers, v_liveData.activeProductionEnergyCarriers); //f_initializeAccumulators();
if (v_rapidRunData != null && b_storePreviousRapidRunData) {
v_previousRunData = v_rapidRunData;
}

v_rapidRunData = new J_RapidRunData(this);
v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();
v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, v_liveData.activeEnergyCarriers, v_liveData.activeConsumptionEnergyCarriers, v_liveData.activeProductionEnergyCarriers, v_liveAssetsMetaData.activeAssetFlows); //f_initializeAccumulators();
f_resetAnnualValues();


v_isRapidRun = true;

////Run energy calculations loop
Expand Down
27 changes: 0 additions & 27 deletions _alp/Agents/EnergyModel/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -924,9 +921,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1104,9 +1098,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1257,9 +1248,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1407,9 +1395,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1614,9 +1599,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1755,9 +1737,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -2244,9 +2223,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -2431,9 +2407,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCHouse/AOC.GCHouse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCIndustry/AOC.GCIndustry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCUtility/AOC.GCUtility.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
<Parameter>
<Name><![CDATA[p_ownerID]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down
Loading