Skip to content

hybrid heatpump management updates and AVGC adjustments #201

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 1 commit into from
Nov 18, 2025
Merged

hybrid heatpump management updates and AVGC adjustments #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion _alp/Agents/AVGC_data/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
dataAVGC.p_avgDieselConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
dataAVGC.p_avgDieselConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
dataAVGC.p_avgDieselConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
dataAVGC.p_avgOutputTemperatureHeatpump_degC = p_avgOutputTemperatureHeatpump_degC;
dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
dataAVGC.p_avgHydrogenConsumptionCar_kWhpkm = p_avgHydrogenConsumptionCar_kWhpkm;
dataAVGC.p_avgEfficiencyGasBurner_fr = p_avgEfficiencyGasBurner_fr;
dataAVGC.p_avgHydrogenConsumptionVan_kWhpkm = p_avgHydrogenConsumptionVan_kWhpkm;
Expand Down
6 changes: 3 additions & 3 deletions _alp/Agents/AVGC_data/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
<Id>1726584205568</Id>
<Name><![CDATA[txt_gasburners]]></Name>
<X>60</X>
<Y>600</Y>
<Y>620</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -436,7 +436,7 @@
<Id>1726584205570</Id>
<Name><![CDATA[txt_hydrogenburners]]></Name>
<X>60</X>
<Y>690</Y>
<Y>710</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -589,7 +589,7 @@
<Id>1745316061345</Id>
<Name><![CDATA[txt_CHP]]></Name>
<X>60</X>
<Y>780</Y>
<Y>800</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down
56 changes: 44 additions & 12 deletions _alp/Agents/AVGC_data/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,13 +1394,13 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
</Variable>
<Variable Class="Parameter">
<Id>1726584205714</Id>
<Name><![CDATA[p_avgOutputTemperatureHeatpump_degC]]></Name>
<Name><![CDATA[p_avgOutputTemperatureElectricHeatpump_degC]]></Name>
<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/?utm_source=chatgpt.com - max 45-55
https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.

-> Voor nu gemiddeld 40 genomen.]]></Description>
<X>70</X>
<Y>560</Y>
<Y>580</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1431,7 +1431,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra

--> SOURCE?]]></Description>
<X>70</X>
<Y>630</Y>
<Y>650</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1462,7 +1462,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra

--> Source?]]></Description>
<X>70</X>
<Y>650</Y>
<Y>670</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1495,7 +1495,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra

- https://www.csrf.ac.uk/blog/hydrogen-for-heating/]]></Description>
<X>70</X>
<Y>720</Y>
<Y>740</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1526,7 +1526,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra

--> Source?]]></Description>
<X>70</X>
<Y>740</Y>
<Y>760</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1827,7 +1827,7 @@ to 18 m3 p m2 for label G
<Description><![CDATA[50% -> blijkt uit aangeleverde data door "kas als energiebron". (https://www.kasalsenergiebron.nl/)
Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_Rapport_WKK_Barometer_2023.pdf]]></Description>
<X>70</X>
<Y>810</Y>
<Y>830</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1857,7 +1857,7 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
<Description><![CDATA[42% -> blijkt uit aangeleverde data door "kas als energiebron". (https://www.kasalsenergiebron.nl/)
Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_Rapport_WKK_Barometer_2023.pdf]]></Description>
<X>70</X>
<Y>830</Y>
<Y>850</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1888,7 +1888,7 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_

--> Source?]]></Description>
<X>70</X>
<Y>850</Y>
<Y>870</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2454,7 +2454,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k

-> (4+5+2)/3 -> Gemiddeld ongeveer 3.6 thermisch-> 3.6/3 = 1.2 elektrisch]]></Description>
<X>70</X>
<Y>580</Y>
<Y>600</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2483,7 +2483,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
<Name><![CDATA[p_minGasBurnerOutputCapacity_kW]]></Name>
<Description><![CDATA[https://www.warmteservice.nl/Verwarming/CV-ketel/HR-Combiketel/c/163 -> Minimum ranged van 4 - 7.8 -> gekozen voor 6 ]]></Description>
<X>70</X>
<Y>670</Y>
<Y>690</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2512,7 +2512,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
<Name><![CDATA[p_minHydrogenBurnerOutputCapacity_kW]]></Name>
<Description><![CDATA[Zelfde gekozen als gasbrander.]]></Description>
<X>70</X>
<Y>760</Y>
<Y>780</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -2565,4 +2565,36 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1763396237774</Id>
<Name><![CDATA[p_avgOutputTemperatureHybridHeatpump_degC]]></Name>
<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/?utm_source=chatgpt.com - max 45-55
https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.

-> Voor nu gemiddeld 40 genomen.]]></Description>
<X>70</X>
<Y>560</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" ModificatorType="STATIC">
<Type><![CDATA[double]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[40]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1763396237772</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
</Variables>
4 changes: 2 additions & 2 deletions _alp/Agents/UI_company/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
//Add primary heating asset (heatpump)
capacityElectric_kW = capacityThermal_kW / 3; //-- /3, want is hybride, dus kleiner
efficiency = zero_Interface.energyModel.avgc_data.p_avgEfficiencyHeatpump_fr;
outputTemperature_degC = zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureHybridHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand All @@ -315,7 +315,7 @@
//Add primary heating asset (heatpump)
capacityElectric_kW = capacityThermal_kW;
efficiency = zero_Interface.energyModel.avgc_data.p_avgEfficiencyHeatpump_fr;
outputTemperature_degC = zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureElectricHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand Down
8 changes: 5 additions & 3 deletions _alp/Agents/Zero_Loader/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2827,7 +2827,7 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW / 3); //-- /3, kan nog kleiner want is hybride zodat gasbrander ook bij springt, dus kleiner MOETEN aanname voor hoe klein onderzoeken
efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHybridHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand All @@ -2849,7 +2849,7 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW); // Could be a lot smaller due to high cop
efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = avgc_data.p_avgOutputTemperatureElectricHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand Down Expand Up @@ -4261,7 +4261,9 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
triple = Triple.of(OL_GridConnectionHeatingType.HYBRID_HEATPUMP, false, false);
energyModel.c_defaultHeatingStrategies.put( triple, J_HeatingManagementProfileHybridHeatPump.class );
triple = Triple.of(OL_GridConnectionHeatingType.HYBRID_HEATPUMP, true, false);
energyModel.c_defaultHeatingStrategies.put( triple, J_HeatingManagementBuildingHybridHeatPump.class );
energyModel.c_defaultHeatingStrategies.put( triple, J_HeatingManagementPIcontrolHybridHeatpump.class );
triple = Triple.of(OL_GridConnectionHeatingType.HYBRID_HEATPUMP, true, true);
energyModel.c_defaultHeatingStrategies.put( triple, J_HeatingManagementPIcontrolHybridHeatpump.class );

triple = Triple.of(OL_GridConnectionHeatingType.DISTRICTHEAT, false, false);
energyModel.c_defaultHeatingStrategies.put( triple, J_HeatingManagementSimple.class );
Expand Down
5 changes: 4 additions & 1 deletion _alp/Agents/Zero_Loader/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
<Name><![CDATA[p_avgEfficiencyHeatpump_fr]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_avgOutputTemperatureHeatpump_degC]]></Name>
<Name><![CDATA[p_avgOutputTemperatureElectricHeatpump_degC]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_avgEfficiencyGasBurner_fr]]></Name>
Expand Down Expand Up @@ -388,6 +388,9 @@
<Parameter>
<Name><![CDATA[p_minDistrictHeatingDeliverySetOutputCapacity_kW]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_avgOutputTemperatureHybridHeatpump_degC]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>false</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down
3 changes: 3 additions & 0 deletions _alp/Agents/tabHeating/Code/AdditionalClassCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ public ShapeGroup getGroupHeatDemandSlidersResidentialArea() {
public ShapeSlider getSliderHeatDemandSlidersResidentialAreaHouseholdsGasBurner_pct() {
return this.sl_householdGasBurnerResidentialArea_pct;
}
public ShapeSlider getSl_householdHybridHeatpumpResidentialArea() {
return this.sl_householdHybridHeatpumpResidentialArea;
}

public ShapeSlider getSliderHeatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct() {
return this.sl_householdElectricHeatPumpResidentialArea_pct;
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/tabHeating/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ else if(changedSliderHeatingType == OL_GridConnectionHeatingType.LT_DISTRICTHEAT

efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHybridHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand All @@ -1228,7 +1228,7 @@ else if(changedSliderHeatingType == OL_GridConnectionHeatingType.LT_DISTRICTHEAT
inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW); // Could be smaller due to high cop
efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHeatpump_degC;
outputTemperature_degC = avgc_data.p_avgOutputTemperatureElectricHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;
Expand Down