Skip to content

Primary Production of Heatpumps #135

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
AteZenmo merged 3 commits into from
Mar 27, 2025
Merged

Primary Production of Heatpumps #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51af063
Primary Production of Heatpumps
Luc-Sol Mar 27, 2025
155f28e
Bugfix
Luc-Sol Mar 27, 2025
e85d6f1
rewrote electricity self consumption
Luc-Sol Mar 27, 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
2 changes: 2 additions & 0 deletions _alp/Agents/EnergyCoop/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
v_rapidRunData.acc_daytimeElectricityConsumption_kW.addStep(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
v_rapidRunData.acc_daytimeEnergyProduction_kW.addStep(v_currentPrimaryEnergyProduction_kW);
v_rapidRunData.acc_daytimeFinalEnergyConsumption_kW.addStep(v_currentFinalEnergyConsumption_kW);
v_rapidRunData.acc_daytimePrimaryEnergyProductionHeatpumps_kW.addStep(v_currentPrimaryEnergyProductionHeatpumps_kW);
}

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

//========== SUMMER WEEK ==========//
Expand Down
11 changes: 11 additions & 0 deletions _alp/Agents/EnergyDataViewer/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@
v_summerWeekElectricityProduced_MWh = data.getRapidRunData().getSummerWeekElectricityProduced_MWh();
v_summerWeekElectricitySelfConsumed_MWh = data.getRapidRunData().getSummerWeekElectricitySelfConsumed_MWh();

v_summerWeekPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getSummerWeekPrimaryEnergyProductionHeatpumps_MWh();

v_winterWeekEnergyImport_MWh = data.getRapidRunData().getWinterWeekEnergyImport_MWh();
v_winterWeekEnergyExport_MWh = data.getRapidRunData().getWinterWeekEnergyExport_MWh();

Expand All @@ -172,6 +174,8 @@
v_winterWeekElectricityProduced_MWh = data.getRapidRunData().getWinterWeekElectricityProduced_MWh();
v_winterWeekElectricitySelfConsumed_MWh = data.getRapidRunData().getWinterWeekElectricitySelfConsumed_MWh();

v_winterWeekPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWinterWeekPrimaryEnergyProductionHeatpumps_MWh();

//========== DAY/NIGHT ==========//
fm_daytimeImports_MWh.clear();
fm_nighttimeImports_MWh.clear();
Expand All @@ -198,6 +202,8 @@
v_daytimeElectricityProduced_MWh = data.getRapidRunData().getDaytimeElectricityProduced_MWh();
v_daytimeElectricitySelfConsumed_MWh = data.getRapidRunData().getDaytimeElectricitySelfConsumed_MWh();

v_daytimePrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getDaytimePrimaryEnergyProductionHeatpumps_MWh();

v_nighttimeEnergyImport_MWh = data.getRapidRunData().getNighttimeEnergyImport_MWh();
v_nighttimeEnergyExport_MWh = data.getRapidRunData().getNighttimeEnergyExport_MWh();

Expand All @@ -209,6 +215,7 @@
v_nighttimeElectricityProduced_MWh = data.getRapidRunData().getNighttimeElectricityProduced_MWh();
v_nighttimeElectricitySelfConsumed_MWh = data.getRapidRunData().getNighttimeElectricitySelfConsumed_MWh();

v_nighttimePrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getNighttimePrimaryEnergyProductionHeatpumps_MWh();

//========== WEEK/WEEKEND ==========//
fm_weekdayImports_MWh.clear();
Expand Down Expand Up @@ -236,6 +243,8 @@
v_weekdayElectricityProduced_MWh = data.getRapidRunData().getWeekdayElectricityProduced_MWh();
v_weekdayElectricitySelfConsumed_MWh = data.getRapidRunData().getWeekdayElectricitySelfConsumed_MWh();

v_weekdayPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWeekdayPrimaryEnergyProductionHeatpumps_MWh();

v_weekendEnergyImport_MWh = data.getRapidRunData().getWeekendEnergyImport_MWh();
v_weekendEnergyExport_MWh = data.getRapidRunData().getWeekendEnergyExport_MWh();

Expand All @@ -247,6 +256,8 @@
v_weekendElectricityProduced_MWh = data.getRapidRunData().getWeekendElectricityProduced_MWh();
v_weekendElectricitySelfConsumed_MWh = data.getRapidRunData().getWeekendElectricitySelfConsumed_MWh();

v_weekendPrimaryEnergyProductionHeatpumps_MWh = data.getRapidRunData().getWeekendPrimaryEnergyProductionHeatpumps_MWh();

/*ALCODEEND*/}

double f_updateLiveDatasets(I_EnergyData data)
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/EnergyDataViewer/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<X>1226</X>
<Y>-250</Y>
<Label>
<X>10</X>
<X>9</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/EnergyDataViewer/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<Id>1741792546461</Id>
<Name><![CDATA[txt_SummerWinterWeekTotals]]></Name>
<X>616</X>
<Y>640</Y>
<Y>620</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down
154 changes: 134 additions & 20 deletions _alp/Agents/EnergyDataViewer/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
<Id>1741792546581</Id>
<Name><![CDATA[v_summerWeekEnergySelfConsumed_MWh]]></Name>
<X>686</X>
<Y>900</Y>
<Y>880</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -348,7 +348,7 @@
<Id>1741792546583</Id>
<Name><![CDATA[v_summerWeekEnergyImport_MWh]]></Name>
<X>686</X>
<Y>720</Y>
<Y>700</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -367,7 +367,7 @@
<Id>1741792546585</Id>
<Name><![CDATA[v_summerWeekEnergyExport_MWh]]></Name>
<X>686</X>
<Y>740</Y>
<Y>720</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -386,7 +386,7 @@
<Id>1741792546587</Id>
<Name><![CDATA[v_summerWeekElectricitySelfConsumed_MWh]]></Name>
<X>686</X>
<Y>820</Y>
<Y>800</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1593,7 +1593,7 @@
<Id>1741792546743</Id>
<Name><![CDATA[fm_summerWeekImports_MWh]]></Name>
<X>686</X>
<Y>680</Y>
<Y>660</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -1615,7 +1615,7 @@
<Id>1741792546745</Id>
<Name><![CDATA[fm_summerWeekExports_MWh]]></Name>
<X>686</X>
<Y>700</Y>
<Y>680</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1700,7 +1700,7 @@
<Id>1741792546753</Id>
<Name><![CDATA[v_summerWeekEnergyConsumed_MWh]]></Name>
<X>686</X>
<Y>880</Y>
<Y>860</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -1719,7 +1719,7 @@
<Id>1741792546755</Id>
<Name><![CDATA[v_summerWeekEnergyProduced_MWh]]></Name>
<X>686</X>
<Y>860</Y>
<Y>840</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -1738,7 +1738,7 @@
<Id>1741792546757</Id>
<Name><![CDATA[v_summerWeekElectricityConsumed_MWh]]></Name>
<X>686</X>
<Y>800</Y>
<Y>780</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -1757,7 +1757,7 @@
<Id>1741792546759</Id>
<Name><![CDATA[v_summerWeekElectricityProduced_MWh]]></Name>
<X>686</X>
<Y>780</Y>
<Y>760</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2323,7 +2323,7 @@
<Id>1741792546817</Id>
<Name><![CDATA[v_weekendEnergyImport_MWh]]></Name>
<X>686</X>
<Y>2360</Y>
<Y>2390</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2342,7 +2342,7 @@
<Id>1741792546819</Id>
<Name><![CDATA[v_weekendEnergyExport_MWh]]></Name>
<X>686</X>
<Y>2380</Y>
<Y>2410</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2361,7 +2361,7 @@
<Id>1741792546821</Id>
<Name><![CDATA[v_weekendEnergyConsumed_MWh]]></Name>
<X>686</X>
<Y>2255</Y>
<Y>2285</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2380,7 +2380,7 @@
<Id>1741792546823</Id>
<Name><![CDATA[v_weekendEnergyProduced_MWh]]></Name>
<X>686</X>
<Y>2235</Y>
<Y>2265</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2399,7 +2399,7 @@
<Id>1741792546825</Id>
<Name><![CDATA[v_weekendEnergySelfConsumed_MWh]]></Name>
<X>686</X>
<Y>2275</Y>
<Y>2305</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2462,7 +2462,7 @@
<Id>1741792546831</Id>
<Name><![CDATA[v_weekendElectricityConsumed_MWh]]></Name>
<X>686</X>
<Y>2175</Y>
<Y>2205</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2572,7 +2572,7 @@
<Id>1741792546841</Id>
<Name><![CDATA[v_weekendElectricityProduced_MWh]]></Name>
<X>686</X>
<Y>2155</Y>
<Y>2185</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2594,7 +2594,7 @@
<Id>1741792546843</Id>
<Name><![CDATA[v_weekendElectricitySelfConsumed_MWh]]></Name>
<X>686</X>
<Y>2195</Y>
<Y>2225</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2704,7 +2704,7 @@
<Id>1741792546853</Id>
<Name><![CDATA[fm_weekendImports_MWh]]></Name>
<X>686</X>
<Y>2320</Y>
<Y>2350</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -2726,7 +2726,7 @@
<Id>1741792546855</Id>
<Name><![CDATA[fm_weekendExports_MWh]]></Name>
<X>686</X>
<Y>2340</Y>
<Y>2370</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -3810,6 +3810,120 @@
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067237799</Id>
<Name><![CDATA[v_summerWeekPrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>685</X>
<Y>910</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067333060</Id>
<Name><![CDATA[v_winterWeekPrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>685</X>
<Y>1195</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067347245</Id>
<Name><![CDATA[v_daytimePrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>685</X>
<Y>1515</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067361421</Id>
<Name><![CDATA[v_nighttimePrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>686</X>
<Y>1805</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067393031</Id>
<Name><![CDATA[v_weekdayPrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>686</X>
<Y>2148</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1743067406399</Id>
<Name><![CDATA[v_weekendPrimaryEnergyProductionHeatpumps_MWh]]></Name>
<X>686</X>
<Y>2442</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1741792546958</Id>
<Name><![CDATA[p_areaType]]></Name>
Expand Down
Loading