File tree Expand file tree Collapse file tree 2 files changed +14
-12
lines changed
Expand file tree Collapse file tree 2 files changed +14
-12
lines changed Original file line number Diff line number Diff line change 12301230
12311231//Loop over membered grid connections
12321232for (GridConnection GC : c_memberGridConnections ){
1233- //Add self consumption of gc individually
1234- v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC .v_rapidRunData .getTotalElectricitySelfConsumed_MWh ();
1235- v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC .v_rapidRunData .getTotalEnergySelfConsumed_MWh ();
1236-
1237- //Add all peaks for member grid connections
1238- v_cumulativeIndividualPeakDelivery_kW += GC .v_rapidRunData .getPeakDelivery_kW ();
1239- v_cumulativeIndividualPeakFeedin_kW += GC .v_rapidRunData .getPeakFeedin_kW ();
1233+ if (GC .v_isActive ){
1234+ //Add self consumption of gc individually
1235+ v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC .v_rapidRunData .getTotalElectricitySelfConsumed_MWh ();
1236+ v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC .v_rapidRunData .getTotalEnergySelfConsumed_MWh ();
1237+
1238+ //Add all peaks for member grid connections
1239+ v_cumulativeIndividualPeakDelivery_kW += GC .v_rapidRunData .getPeakDelivery_kW ();
1240+ v_cumulativeIndividualPeakFeedin_kW += GC .v_rapidRunData .getPeakFeedin_kW ();
1241+ }
12401242}
12411243
12421244//Add all max peaks of GC
Original file line number Diff line number Diff line change 2626 <ReturnType >double</ReturnType >
2727 <Id >1666956527771</Id >
2828 <Name ><![CDATA[ f_operateFlexAssets_overwrite]]> </Name >
29- <X >800 </X >
30- <Y >240 </Y >
29+ <X >910 </X >
30+ <Y >220 </Y >
3131 <Label >
3232 <X >10</X >
3333 <Y >0</Y >
4343 <Id >1666967854749</Id >
4444 <Name ><![CDATA[ f_operateFixedConsumptionAssets_overwrite]]> </Name >
4545 <ExcludeFromBuild >true</ExcludeFromBuild >
46- <X >800 </X >
47- <Y >220 </Y >
46+ <X >910 </X >
47+ <Y >200 </Y >
4848 <Label >
4949 <X >10</X >
5050 <Y >0</Y >
108108 <Id >1688369593905</Id >
109109 <Name ><![CDATA[ f_calculateEnergyBalance_overwrite]]> </Name >
110110 <ExcludeFromBuild >true</ExcludeFromBuild >
111- <X >780 </X >
111+ <X >890 </X >
112112 <Y >180</Y >
113113 <Label >
114114 <X >10</X >
You can’t perform that action at this time.
0 commit comments