Skip to content

Commit 7ad3515

Browse files
Luc-SolLuc-Sol
committed
Merge branch 'main' of https://github.com/Zenmo/zero_engine 
2 parents 68c503b + 09fd919 commit 7ad3515

File tree

6 files changed

+194
-876
lines changed

6 files changed

+194
-876
lines changed

‎_alp/Agents/EnergyDataViewer/Code/Functions.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,32 +53,34 @@
5353

5454
double f_fillEnergyDataViewer(I_EnergyData data)
5555
{/*ALCODESTART::1741792546533*/
56-
v_engineAgent = data.getRapidRunData().parentAgent;
57-
//Number of connected gcs
58-
//v_numberOfGridconnections = 1;
56+
v_engineAgent = data;
5957

60-
//Set active energyCarriers
61-
v_activeConsumptionEnergyCarriers = data.getLiveData().activeConsumptionEnergyCarriers;
62-
v_activeProductionEnergyCarriers = data.getLiveData().activeProductionEnergyCarriers;
63-
64-
//Update active asset booleans
65-
//f_updateLiveActiveAssetBooleans(data);
66-
v_activeAssetFlows = data.getLiveData().assetsMetaData.activeAssetFlows;
67-
68-
//Update variables
69-
f_updateVariables(data);
58+
//Set live and rapidrun EnumSets for EnergyCarriers and AssetFlowCategories
59+
v_liveConsumptionEnergyCarriers = data.getLiveData().activeConsumptionEnergyCarriers;
60+
v_liveProductionEnergyCarriers = data.getLiveData().activeProductionEnergyCarriers;
61+
v_liveAssetFlowCategories = data.getLiveData().assetsMetaData.activeAssetFlows;
7062

7163
//Update variables
7264
f_updateLiveDatasets(data);
7365

74-
//Update variables
75-
f_updateWeeklyDatasets(data);
66+
if (data.getRapidRunData() != null) {
67+
v_rapidRunConsumptionEnergyCarriers = data.getRapidRunData().activeConsumptionEnergyCarriers;
68+
v_rapidRunProductionEnergyCarriers = data.getRapidRunData().activeProductionEnergyCarriers;
69+
v_rapidRunAssetFlowCategories = data.getRapidRunData().assetsMetaData.activeAssetFlows;
7670

77-
//Update variables
78-
f_updateYearlyDatasets(data);
71+
//Update variables
72+
f_updateVariables(data);
73+
74+
//Update variables
75+
f_updateWeeklyDatasets(data);
76+
77+
//Update variables
78+
f_updateYearlyDatasets(data);
79+
80+
//Get duurkromme
81+
f_updateLoadDurationCurve(data);
82+
}
7983

80-
//Get duurkromme
81-
f_updateLoadDurationCurve(data);
8284
/*ALCODEEND*/}
8385

8486
double f_updateVariables(I_EnergyData data)
@@ -112,10 +114,10 @@
112114
fm_totalImports_MWh.clear();
113115
fm_totalExports_MWh.clear();
114116

115-
for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
117+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
116118
fm_totalImports_MWh.put( energyCarrier, data.getRapidRunData().getTotalImport_MWh(energyCarrier) );
117119
}
118-
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
120+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
119121
fm_totalExports_MWh.put( energyCarrier, data.getRapidRunData().getTotalExport_MWh(energyCarrier) );
120122
}
121123

@@ -142,11 +144,11 @@
142144
fm_summerWeekExports_MWh.clear();
143145
fm_winterWeekExports_MWh.clear();
144146

145-
for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
147+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
146148
fm_summerWeekImports_MWh.put( energyCarrier, data.getRapidRunData().getSummerWeekImport_MWh(energyCarrier) );
147149
fm_winterWeekImports_MWh.put( energyCarrier, data.getRapidRunData().getWinterWeekImport_MWh(energyCarrier) );
148150
}
149-
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
151+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
150152
fm_summerWeekExports_MWh.put( energyCarrier, data.getRapidRunData().getSummerWeekExport_MWh(energyCarrier) );
151153
fm_winterWeekExports_MWh.put( energyCarrier, data.getRapidRunData().getWinterWeekExport_MWh(energyCarrier) );
152154
}
@@ -183,11 +185,11 @@
183185
fm_daytimeExports_MWh.clear();
184186
fm_nighttimeExports_MWh.clear();
185187

186-
for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
188+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
187189
fm_daytimeImports_MWh.put( energyCarrier, data.getRapidRunData().getDaytimeImport_MWh(energyCarrier) );
188190
fm_nighttimeImports_MWh.put( energyCarrier, data.getRapidRunData().getNighttimeImport_MWh(energyCarrier) );
189191
}
190-
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
192+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
191193
fm_daytimeExports_MWh.put( energyCarrier, data.getRapidRunData().getDaytimeExport_MWh(energyCarrier) );
192194
fm_nighttimeExports_MWh.put( energyCarrier, data.getRapidRunData().getNighttimeExport_MWh(energyCarrier) );
193195
}
@@ -224,11 +226,11 @@
224226
fm_weekdayExports_MWh.clear();
225227
fm_weekendExports_MWh.clear();
226228

227-
for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
229+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
228230
fm_weekdayImports_MWh.put( energyCarrier, data.getRapidRunData().getWeekdayImport_MWh(energyCarrier) );
229231
fm_weekendImports_MWh.put( energyCarrier, data.getRapidRunData().getWeekendImport_MWh(energyCarrier) );
230232
}
231-
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
233+
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
232234
fm_weekdayExports_MWh.put( energyCarrier, data.getRapidRunData().getWeekdayExport_MWh(energyCarrier) );
233235
fm_weekendExports_MWh.put( energyCarrier, data.getRapidRunData().getWeekendExport_MWh(energyCarrier) );
234236
}

‎_alp/Agents/EnergyDataViewer/Code/Functions.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Name><![CDATA[f_updatePreviousTotalsGC]]></Name>
2424
<ExcludeFromBuild>true</ExcludeFromBuild>
2525
<X>1246</X>
26-
<Y>-90</Y>
26+
<Y>-70</Y>
2727
<Label>
2828
<X>10</X>
2929
<Y>0</Y>
@@ -59,7 +59,7 @@
5959
<Id>1741792546535</Id>
6060
<Name><![CDATA[f_updateVariables]]></Name>
6161
<X>1246</X>
62-
<Y>-230</Y>
62+
<Y>-220</Y>
6363
<Label>
6464
<X>10</X>
6565
<Y>0</Y>
@@ -79,7 +79,7 @@
7979
<Id>1741792546537</Id>
8080
<Name><![CDATA[f_updateLiveDatasets]]></Name>
8181
<X>1246</X>
82-
<Y>-210</Y>
82+
<Y>-200</Y>
8383
<Label>
8484
<X>10</X>
8585
<Y>0</Y>
@@ -99,7 +99,7 @@
9999
<Id>1741792546539</Id>
100100
<Name><![CDATA[f_updateWeeklyDatasets]]></Name>
101101
<X>1246</X>
102-
<Y>-190</Y>
102+
<Y>-180</Y>
103103
<Label>
104104
<X>10</X>
105105
<Y>0</Y>
@@ -119,7 +119,7 @@
119119
<Id>1741792546541</Id>
120120
<Name><![CDATA[f_updateYearlyDatasets]]></Name>
121121
<X>1246</X>
122-
<Y>-170</Y>
122+
<Y>-160</Y>
123123
<Label>
124124
<X>10</X>
125125
<Y>0</Y>
@@ -140,7 +140,7 @@
140140
<Name><![CDATA[f_addTimeStepLiveDataSetsGC]]></Name>
141141
<ExcludeFromBuild>true</ExcludeFromBuild>
142142
<X>1246</X>
143-
<Y>-110</Y>
143+
<Y>-90</Y>
144144
<Label>
145145
<X>10</X>
146146
<Y>0</Y>
@@ -160,7 +160,7 @@
160160
<Id>1741792546545</Id>
161161
<Name><![CDATA[f_updateLoadDurationCurve]]></Name>
162162
<X>1246</X>
163-
<Y>-150</Y>
163+
<Y>-140</Y>
164164
<Label>
165165
<X>10</X>
166166
<Y>0</Y>
@@ -181,7 +181,7 @@
181181
<Name><![CDATA[f_updateLiveActiveAssetBooleans]]></Name>
182182
<ExcludeFromBuild>true</ExcludeFromBuild>
183183
<X>1246</X>
184-
<Y>-130</Y>
184+
<Y>-110</Y>
185185
<Label>
186186
<X>10</X>
187187
<Y>0</Y>

0 commit comments

Comments
 (0)