Skip to content

Commit e90e34a

Browse files
Luc-SolLuc-Sol
authored
Primary Production of Heatpumps for weekend and daytime (#135)
* Primary Production of Heatpumps - Added accumulators for the primary energy production of heatpumps for weekend & daytime. - Refactored the rapidrundata class to use the accumulator and accumulatormaps' get MWh methods. * Bugfix * rewrote electricity self consumption
1 parent 3902f28 commit e90e34a

File tree

9 files changed

+248
-106
lines changed

9 files changed

+248
-106
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,6 +1522,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
15221522
v_rapidRunData.acc_daytimeElectricityConsumption_kW.addStep(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
15231523
v_rapidRunData.acc_daytimeEnergyProduction_kW.addStep(v_currentPrimaryEnergyProduction_kW);
15241524
v_rapidRunData.acc_daytimeFinalEnergyConsumption_kW.addStep(v_currentFinalEnergyConsumption_kW);
1525+
v_rapidRunData.acc_daytimePrimaryEnergyProductionHeatpumps_kW.addStep(v_currentPrimaryEnergyProductionHeatpumps_kW);
15251526
}
15261527

15271528
// Weekend totals. Use overal-totals minus weekend totals to get weekday totals.
@@ -1536,6 +1537,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
15361537
v_rapidRunData.acc_weekendElectricityConsumption_kW.addStep(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
15371538
v_rapidRunData.acc_weekendEnergyProduction_kW.addStep(v_currentPrimaryEnergyProduction_kW);
15381539
v_rapidRunData.acc_weekendFinalEnergyConsumption_kW.addStep(v_currentFinalEnergyConsumption_kW);
1540+
v_rapidRunData.acc_weekendPrimaryEnergyProductionHeatpumps_kW.addStep(v_currentPrimaryEnergyProductionHeatpumps_kW);
15391541
}
15401542

15411543
//========== SUMMER WEEK ==========//

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@
161161
v_summerWeekElectricityProduced_MWh = data.getRapidRunData().getSummerWeekElectricityProduced_MWh();
162162
v_summerWeekElectricitySelfConsumed_MWh = data.getRapidRunData().getSummerWeekElectricitySelfConsumed_MWh();
163163

164+
v_summerWeekPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getSummerWeekPrimaryEnergyProductionHeatpumps_MWh();
165+
164166
v_winterWeekEnergyImport_MWh = data.getRapidRunData().getWinterWeekEnergyImport_MWh();
165167
v_winterWeekEnergyExport_MWh = data.getRapidRunData().getWinterWeekEnergyExport_MWh();
166168

@@ -172,6 +174,8 @@
172174
v_winterWeekElectricityProduced_MWh = data.getRapidRunData().getWinterWeekElectricityProduced_MWh();
173175
v_winterWeekElectricitySelfConsumed_MWh = data.getRapidRunData().getWinterWeekElectricitySelfConsumed_MWh();
174176

177+
v_winterWeekPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWinterWeekPrimaryEnergyProductionHeatpumps_MWh();
178+
175179
//========== DAY/NIGHT ==========//
176180
fm_daytimeImports_MWh.clear();
177181
fm_nighttimeImports_MWh.clear();
@@ -198,6 +202,8 @@
198202
v_daytimeElectricityProduced_MWh = data.getRapidRunData().getDaytimeElectricityProduced_MWh();
199203
v_daytimeElectricitySelfConsumed_MWh = data.getRapidRunData().getDaytimeElectricitySelfConsumed_MWh();
200204

205+
v_daytimePrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getDaytimePrimaryEnergyProductionHeatpumps_MWh();
206+
201207
v_nighttimeEnergyImport_MWh = data.getRapidRunData().getNighttimeEnergyImport_MWh();
202208
v_nighttimeEnergyExport_MWh = data.getRapidRunData().getNighttimeEnergyExport_MWh();
203209

@@ -209,6 +215,7 @@
209215
v_nighttimeElectricityProduced_MWh = data.getRapidRunData().getNighttimeElectricityProduced_MWh();
210216
v_nighttimeElectricitySelfConsumed_MWh = data.getRapidRunData().getNighttimeElectricitySelfConsumed_MWh();
211217

218+
v_nighttimePrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getNighttimePrimaryEnergyProductionHeatpumps_MWh();
212219

213220
//========== WEEK/WEEKEND ==========//
214221
fm_weekdayImports_MWh.clear();
@@ -236,6 +243,8 @@
236243
v_weekdayElectricityProduced_MWh = data.getRapidRunData().getWeekdayElectricityProduced_MWh();
237244
v_weekdayElectricitySelfConsumed_MWh = data.getRapidRunData().getWeekdayElectricitySelfConsumed_MWh();
238245

246+
v_weekdayPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWeekdayPrimaryEnergyProductionHeatpumps_MWh();
247+
239248
v_weekendEnergyImport_MWh = data.getRapidRunData().getWeekendEnergyImport_MWh();
240249
v_weekendEnergyExport_MWh = data.getRapidRunData().getWeekendEnergyExport_MWh();
241250

@@ -247,6 +256,8 @@
247256
v_weekendElectricityProduced_MWh = data.getRapidRunData().getWeekendElectricityProduced_MWh();
248257
v_weekendElectricitySelfConsumed_MWh = data.getRapidRunData().getWeekendElectricitySelfConsumed_MWh();
249258

259+
v_weekendPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWeekendPrimaryEnergyProductionHeatpumps_MWh();
260+
250261
/*ALCODEEND*/}
251262

252263
double f_updateLiveDatasets(I_EnergyData data)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<X>1226</X>
4242
<Y>-250</Y>
4343
<Label>
44-
<X>10</X>
44+
<X>9</X>
4545
<Y>0</Y>
4646
</Label>
4747
<PublicFlag>false</PublicFlag>

‎_alp/Agents/EnergyDataViewer/Levels/Level.level.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<Id>1741792546461</Id>
182182
<Name><![CDATA[txt_SummerWinterWeekTotals]]></Name>
183183
<X>616</X>
184-
<Y>640</Y>
184+
<Y>620</Y>
185185
<Label>
186186
<X>0</X>
187187
<Y>-10</Y>

‎_alp/Agents/EnergyDataViewer/Variables.xml‎

Lines changed: 134 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
<Id>1741792546581</Id>
330330
<Name><![CDATA[v_summerWeekEnergySelfConsumed_MWh]]></Name>
331331
<X>686</X>
332-
<Y>900</Y>
332+
<Y>880</Y>
333333
<Label>
334334
<X>10</X>
335335
<Y>0</Y>
@@ -348,7 +348,7 @@
348348
<Id>1741792546583</Id>
349349
<Name><![CDATA[v_summerWeekEnergyImport_MWh]]></Name>
350350
<X>686</X>
351-
<Y>720</Y>
351+
<Y>700</Y>
352352
<Label>
353353
<X>10</X>
354354
<Y>0</Y>
@@ -367,7 +367,7 @@
367367
<Id>1741792546585</Id>
368368
<Name><![CDATA[v_summerWeekEnergyExport_MWh]]></Name>
369369
<X>686</X>
370-
<Y>740</Y>
370+
<Y>720</Y>
371371
<Label>
372372
<X>10</X>
373373
<Y>0</Y>
@@ -386,7 +386,7 @@
386386
<Id>1741792546587</Id>
387387
<Name><![CDATA[v_summerWeekElectricitySelfConsumed_MWh]]></Name>
388388
<X>686</X>
389-
<Y>820</Y>
389+
<Y>800</Y>
390390
<Label>
391391
<X>10</X>
392392
<Y>0</Y>
@@ -1593,7 +1593,7 @@
15931593
<Id>1741792546743</Id>
15941594
<Name><![CDATA[fm_summerWeekImports_MWh]]></Name>
15951595
<X>686</X>
1596-
<Y>680</Y>
1596+
<Y>660</Y>
15971597
<Label>
15981598
<X>10</X>
15991599
<Y>0</Y>
@@ -1615,7 +1615,7 @@
16151615
<Id>1741792546745</Id>
16161616
<Name><![CDATA[fm_summerWeekExports_MWh]]></Name>
16171617
<X>686</X>
1618-
<Y>700</Y>
1618+
<Y>680</Y>
16191619
<Label>
16201620
<X>10</X>
16211621
<Y>0</Y>
@@ -1700,7 +1700,7 @@
17001700
<Id>1741792546753</Id>
17011701
<Name><![CDATA[v_summerWeekEnergyConsumed_MWh]]></Name>
17021702
<X>686</X>
1703-
<Y>880</Y>
1703+
<Y>860</Y>
17041704
<Label>
17051705
<X>10</X>
17061706
<Y>0</Y>
@@ -1719,7 +1719,7 @@
17191719
<Id>1741792546755</Id>
17201720
<Name><![CDATA[v_summerWeekEnergyProduced_MWh]]></Name>
17211721
<X>686</X>
1722-
<Y>860</Y>
1722+
<Y>840</Y>
17231723
<Label>
17241724
<X>10</X>
17251725
<Y>0</Y>
@@ -1738,7 +1738,7 @@
17381738
<Id>1741792546757</Id>
17391739
<Name><![CDATA[v_summerWeekElectricityConsumed_MWh]]></Name>
17401740
<X>686</X>
1741-
<Y>800</Y>
1741+
<Y>780</Y>
17421742
<Label>
17431743
<X>10</X>
17441744
<Y>0</Y>
@@ -1757,7 +1757,7 @@
17571757
<Id>1741792546759</Id>
17581758
<Name><![CDATA[v_summerWeekElectricityProduced_MWh]]></Name>
17591759
<X>686</X>
1760-
<Y>780</Y>
1760+
<Y>760</Y>
17611761
<Label>
17621762
<X>10</X>
17631763
<Y>0</Y>
@@ -2323,7 +2323,7 @@
23232323
<Id>1741792546817</Id>
23242324
<Name><![CDATA[v_weekendEnergyImport_MWh]]></Name>
23252325
<X>686</X>
2326-
<Y>2360</Y>
2326+
<Y>2390</Y>
23272327
<Label>
23282328
<X>10</X>
23292329
<Y>0</Y>
@@ -2342,7 +2342,7 @@
23422342
<Id>1741792546819</Id>
23432343
<Name><![CDATA[v_weekendEnergyExport_MWh]]></Name>
23442344
<X>686</X>
2345-
<Y>2380</Y>
2345+
<Y>2410</Y>
23462346
<Label>
23472347
<X>10</X>
23482348
<Y>0</Y>
@@ -2361,7 +2361,7 @@
23612361
<Id>1741792546821</Id>
23622362
<Name><![CDATA[v_weekendEnergyConsumed_MWh]]></Name>
23632363
<X>686</X>
2364-
<Y>2255</Y>
2364+
<Y>2285</Y>
23652365
<Label>
23662366
<X>10</X>
23672367
<Y>0</Y>
@@ -2380,7 +2380,7 @@
23802380
<Id>1741792546823</Id>
23812381
<Name><![CDATA[v_weekendEnergyProduced_MWh]]></Name>
23822382
<X>686</X>
2383-
<Y>2235</Y>
2383+
<Y>2265</Y>
23842384
<Label>
23852385
<X>10</X>
23862386
<Y>0</Y>
@@ -2399,7 +2399,7 @@
23992399
<Id>1741792546825</Id>
24002400
<Name><![CDATA[v_weekendEnergySelfConsumed_MWh]]></Name>
24012401
<X>686</X>
2402-
<Y>2275</Y>
2402+
<Y>2305</Y>
24032403
<Label>
24042404
<X>10</X>
24052405
<Y>0</Y>
@@ -2462,7 +2462,7 @@
24622462
<Id>1741792546831</Id>
24632463
<Name><![CDATA[v_weekendElectricityConsumed_MWh]]></Name>
24642464
<X>686</X>
2465-
<Y>2175</Y>
2465+
<Y>2205</Y>
24662466
<Label>
24672467
<X>10</X>
24682468
<Y>0</Y>
@@ -2572,7 +2572,7 @@
25722572
<Id>1741792546841</Id>
25732573
<Name><![CDATA[v_weekendElectricityProduced_MWh]]></Name>
25742574
<X>686</X>
2575-
<Y>2155</Y>
2575+
<Y>2185</Y>
25762576
<Label>
25772577
<X>10</X>
25782578
<Y>0</Y>
@@ -2594,7 +2594,7 @@
25942594
<Id>1741792546843</Id>
25952595
<Name><![CDATA[v_weekendElectricitySelfConsumed_MWh]]></Name>
25962596
<X>686</X>
2597-
<Y>2195</Y>
2597+
<Y>2225</Y>
25982598
<Label>
25992599
<X>10</X>
26002600
<Y>0</Y>
@@ -2704,7 +2704,7 @@
27042704
<Id>1741792546853</Id>
27052705
<Name><![CDATA[fm_weekendImports_MWh]]></Name>
27062706
<X>686</X>
2707-
<Y>2320</Y>
2707+
<Y>2350</Y>
27082708
<Label>
27092709
<X>10</X>
27102710
<Y>0</Y>
@@ -2726,7 +2726,7 @@
27262726
<Id>1741792546855</Id>
27272727
<Name><![CDATA[fm_weekendExports_MWh]]></Name>
27282728
<X>686</X>
2729-
<Y>2340</Y>
2729+
<Y>2370</Y>
27302730
<Label>
27312731
<X>10</X>
27322732
<Y>0</Y>
@@ -3810,6 +3810,120 @@
38103810
<Type><![CDATA[double]]></Type>
38113811
</Properties>
38123812
</Variable>
3813+
<Variable Class="PlainVariable">
3814+
<Id>1743067237799</Id>
3815+
<Name><![CDATA[v_summerWeekPrimaryEnergyProductionHeatpumps_MWh]]></Name>
3816+
<X>685</X>
3817+
<Y>910</Y>
3818+
<Label>
3819+
<X>10</X>
3820+
<Y>0</Y>
3821+
</Label>
3822+
<PublicFlag>false</PublicFlag>
3823+
<PresentationFlag>true</PresentationFlag>
3824+
<ShowLabel>true</ShowLabel>
3825+
<Properties SaveInSnapshot="true"
3826+
Constant="false"
3827+
AccessType="public"
3828+
StaticVariable="false">
3829+
<Type><![CDATA[double]]></Type>
3830+
</Properties>
3831+
</Variable>
3832+
<Variable Class="PlainVariable">
3833+
<Id>1743067333060</Id>
3834+
<Name><![CDATA[v_winterWeekPrimaryEnergyProductionHeatpumps_MWh]]></Name>
3835+
<X>685</X>
3836+
<Y>1195</Y>
3837+
<Label>
3838+
<X>10</X>
3839+
<Y>0</Y>
3840+
</Label>
3841+
<PublicFlag>false</PublicFlag>
3842+
<PresentationFlag>true</PresentationFlag>
3843+
<ShowLabel>true</ShowLabel>
3844+
<Properties SaveInSnapshot="true"
3845+
Constant="false"
3846+
AccessType="public"
3847+
StaticVariable="false">
3848+
<Type><![CDATA[double]]></Type>
3849+
</Properties>
3850+
</Variable>
3851+
<Variable Class="PlainVariable">
3852+
<Id>1743067347245</Id>
3853+
<Name><![CDATA[v_daytimePrimaryEnergyProductionHeatpumps_MWh]]></Name>
3854+
<X>685</X>
3855+
<Y>1515</Y>
3856+
<Label>
3857+
<X>10</X>
3858+
<Y>0</Y>
3859+
</Label>
3860+
<PublicFlag>false</PublicFlag>
3861+
<PresentationFlag>true</PresentationFlag>
3862+
<ShowLabel>true</ShowLabel>
3863+
<Properties SaveInSnapshot="true"
3864+
Constant="false"
3865+
AccessType="public"
3866+
StaticVariable="false">
3867+
<Type><![CDATA[double]]></Type>
3868+
</Properties>
3869+
</Variable>
3870+
<Variable Class="PlainVariable">
3871+
<Id>1743067361421</Id>
3872+
<Name><![CDATA[v_nighttimePrimaryEnergyProductionHeatpumps_MWh]]></Name>
3873+
<X>686</X>
3874+
<Y>1805</Y>
3875+
<Label>
3876+
<X>10</X>
3877+
<Y>0</Y>
3878+
</Label>
3879+
<PublicFlag>false</PublicFlag>
3880+
<PresentationFlag>true</PresentationFlag>
3881+
<ShowLabel>true</ShowLabel>
3882+
<Properties SaveInSnapshot="true"
3883+
Constant="false"
3884+
AccessType="public"
3885+
StaticVariable="false">
3886+
<Type><![CDATA[double]]></Type>
3887+
</Properties>
3888+
</Variable>
3889+
<Variable Class="PlainVariable">
3890+
<Id>1743067393031</Id>
3891+
<Name><![CDATA[v_weekdayPrimaryEnergyProductionHeatpumps_MWh]]></Name>
3892+
<X>686</X>
3893+
<Y>2148</Y>
3894+
<Label>
3895+
<X>10</X>
3896+
<Y>0</Y>
3897+
</Label>
3898+
<PublicFlag>false</PublicFlag>
3899+
<PresentationFlag>true</PresentationFlag>
3900+
<ShowLabel>true</ShowLabel>
3901+
<Properties SaveInSnapshot="true"
3902+
Constant="false"
3903+
AccessType="public"
3904+
StaticVariable="false">
3905+
<Type><![CDATA[double]]></Type>
3906+
</Properties>
3907+
</Variable>
3908+
<Variable Class="PlainVariable">
3909+
<Id>1743067406399</Id>
3910+
<Name><![CDATA[v_weekendPrimaryEnergyProductionHeatpumps_MWh]]></Name>
3911+
<X>686</X>
3912+
<Y>2442</Y>
3913+
<Label>
3914+
<X>10</X>
3915+
<Y>0</Y>
3916+
</Label>
3917+
<PublicFlag>false</PublicFlag>
3918+
<PresentationFlag>true</PresentationFlag>
3919+
<ShowLabel>true</ShowLabel>
3920+
<Properties SaveInSnapshot="true"
3921+
Constant="false"
3922+
AccessType="public"
3923+
StaticVariable="false">
3924+
<Type><![CDATA[double]]></Type>
3925+
</Properties>
3926+
</Variable>
38133927
<Variable Class="Parameter">
38143928
<Id>1741792546958</Id>
38153929
<Name><![CDATA[p_areaType]]></Name>

0 commit comments

Comments
 (0)