Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions _alp/Agents/EnergyCoop/Code/Functions.java
Original file line number Diff line number Diff line change
Expand Up @@ -1230,13 +1230,15 @@

//Loop over membered grid connections
for(GridConnection GC : c_memberGridConnections){
//Add self consumption of gc individually
v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC.v_rapidRunData.getTotalElectricitySelfConsumed_MWh();
v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC.v_rapidRunData.getTotalEnergySelfConsumed_MWh();

//Add all peaks for member grid connections
v_cumulativeIndividualPeakDelivery_kW += GC.v_rapidRunData.getPeakDelivery_kW();
v_cumulativeIndividualPeakFeedin_kW += GC.v_rapidRunData.getPeakFeedin_kW();
if(GC.v_isActive){
//Add self consumption of gc individually
v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC.v_rapidRunData.getTotalElectricitySelfConsumed_MWh();
v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC.v_rapidRunData.getTotalEnergySelfConsumed_MWh();

//Add all peaks for member grid connections
v_cumulativeIndividualPeakDelivery_kW += GC.v_rapidRunData.getPeakDelivery_kW();
v_cumulativeIndividualPeakFeedin_kW += GC.v_rapidRunData.getPeakFeedin_kW();
}
}

//Add all max peaks of GC
Expand Down
10 changes: 5 additions & 5 deletions _alp/Agents/GCGridBattery/Code/Functions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<ReturnType>double</ReturnType>
<Id>1666956527771</Id>
<Name><![CDATA[f_operateFlexAssets_overwrite]]></Name>
<X>800</X>
<Y>240</Y>
<X>910</X>
<Y>220</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -43,8 +43,8 @@
<Id>1666967854749</Id>
<Name><![CDATA[f_operateFixedConsumptionAssets_overwrite]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>800</X>
<Y>220</Y>
<X>910</X>
<Y>200</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -108,7 +108,7 @@
<Id>1688369593905</Id>
<Name><![CDATA[f_calculateEnergyBalance_overwrite]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>780</X>
<X>890</X>
<Y>180</Y>
<Label>
<X>10</X>
Expand Down