Skip to content

J ea cleanup #233

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 5 commits into from
Dec 18, 2025
Merged

J ea cleanup #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
046b9b2
Parameters PBL data toegevoegd
naudloomans Dec 12, 2025
2f42ccb
Removed v_powerFraction_fr state from J_EA class
GillisHommen Dec 17, 2025
7cd0ada
Further minor cleanups
GillisHommen Dec 17, 2025
52d5779
Merge branch 'main' into J_EA_cleanup
AteZenmo Dec 18, 2025
d1b3812
cleanup + overrides added
AteZenmo Dec 18, 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
12 changes: 0 additions & 12 deletions Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,12 +1351,6 @@
<Name><![CDATA[J_EAConversionElectricHeater]]></Name>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1666189454453</Id>
<Name><![CDATA[J_EAConversionCurtailer]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1666879973864</Id>
<Name><![CDATA[J_SimulationResults]]></Name>
Expand Down Expand Up @@ -1412,12 +1406,6 @@
<Name><![CDATA[J_ConnectionContract]]></Name>
<Folder>1752680962144</Folder>
</JavaClass>
<JavaClass>
<Id>1678469210821</Id>
<Name><![CDATA[J_EAConversionCurtailerHeat]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1692861398767</Id>
<Name><![CDATA[J_ActivityTracker]]></Name>
Expand Down
575 changes: 268 additions & 307 deletions Zero_engine.original.alp
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,9 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
}
}
if (e instanceof J_EAStorageHeat) { // includes J_EABuilding
totalAmbientHeating_MWh += ((J_EAStorageHeat)e).energyAbsorbed_kWh/1000;
totalHeatProduced_MWh += ((J_EAStorageHeat)e).energyAbsorbed_kWh/1000;
totalEnergyProduced_MWh += ((J_EAStorageHeat)e).energyAbsorbed_kWh/1000;
totalAmbientHeating_MWh += ((J_EAStorageHeat)e).ambientEnergyAbsorbed_kWh/1000;
totalHeatProduced_MWh += ((J_EAStorageHeat)e).ambientEnergyAbsorbed_kWh/1000;
totalEnergyProduced_MWh += ((J_EAStorageHeat)e).ambientEnergyAbsorbed_kWh/1000;
deltaThermalEnergySinceStart_MWh += (((J_EAStorageHeat)e).getRemainingHeatStorageHeat_kWh() - ((J_EAStorageHeat)e).getStartingHeatStorageHeat_kWh())/1000;
}
if (e instanceof J_EAEV) {
Expand Down
18 changes: 18 additions & 0 deletions _alp/Agents/EnergyModel/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,24 @@
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_buildingType_heatingPBL]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_ownership_heatingPBL]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_constructionPeriod_heatingPBL]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_localFactor_heatingPBL]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_regionalClimateCorrectionFactor_heatingPBL]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_schillabel_heatingPBL]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/GCEnergyConversion/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

@author: Gillis Hommen
@since: 28-12-2022]]></Description>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1230</X>
<Y>180</Y>
<Label>
Expand Down
5 changes: 3 additions & 2 deletions _alp/Agents/GCHouse/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,10 @@ else if (energyModel.t_h*60 < chargeDeadline_min ){
p_cookingTracker.manageActivities(energyModel.t_h-energyModel.p_runStartTime_h); // also calls f_updateAllFlows in HOB asset

double residualHeatGasPit_kW = -p_cookingTracker.HOB.getLastFlows().get(OL_EnergyCarriers.HEAT);
if (p_BuildingThermalAsset != null) {
throw new RuntimeException("Cooking trackers and HOBs are not properly integrated with current heating management!");
/*if (p_BuildingThermalAsset != null) {
p_BuildingThermalAsset.v_powerFraction_fr += residualHeatGasPit_kW / p_BuildingThermalAsset.getCapacityHeat_kW(); // Does this work out correctly with new heatingManagement structure??
}
}*/
}
/*ALCODEEND*/}

Expand Down
74 changes: 74 additions & 0 deletions _alp/Agents/GCHouse/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,78 @@
</Font>
<Alignment>LEFT</Alignment>
</Text>
<TimePlot>
<Id>1765379026595</Id>
<Name><![CDATA[HeatpumpPlot1]]></Name>
<X>1940</X>
<Y>790</Y>
<Label>
<X>0</X>
<Y>-10</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
<AutoUpdate>true</AutoUpdate>
<RecurrenceProperties>
<Id>1765379026593</Id>
<OccurrenceAtTime>true</OccurrenceAtTime>
<OccurrenceDate>1674979200000</OccurrenceDate>
<OccurrenceTime Class="CodeUnitValue">
<Code><![CDATA[0]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</OccurrenceTime>
<RecurrenceCode Class="CodeUnitValue">
<Code><![CDATA[15]]></Code>
<Unit Class="TimeUnits">MINUTE</Unit>
</RecurrenceCode>
</RecurrenceProperties>
<EmbeddedIcon>false</EmbeddedIcon>
<Width>490</Width>
<Height>260</Height>
<BackgroundColor/>
<BorderColor/>
<ChartArea>
<XOffset>50</XOffset>
<YOffset>30</YOffset>
<Width>410</Width>
<Height>170</Height>
<BackgroundColor>-1</BackgroundColor>
<BorderColor>-16777216</BorderColor>
<GridColor>-12566464</GridColor>
</ChartArea>
<Legend>
<Place>SOUTH</Place>
<TextColor>-16777216</TextColor>
<Size>30</Size>
</Legend>
<Labels>
<HorLabelsPosition>DEFAULT</HorLabelsPosition>
<VerLabelsPosition>DEFAULT</VerLabelsPosition>
<TextColor>-12566464</TextColor>
</Labels>
<ShowLegend>true</ShowLegend>
<TimeWindowsMovementType>MOVEMENT_WITH_TIME</TimeWindowsMovementType>
<TimeWindowUnits>DAY</TimeWindowUnits>
<VerScaleFromExpression>0</VerScaleFromExpression>
<VerScaleToExpression>1</VerScaleToExpression>
<VerScaleType>AUTO</VerScaleType>
<DrawLine>true</DrawLine>
<Interpolation>LINEAR</Interpolation>
<DatasetExpression>
<Title>Min</Title>
<Id>1765380741625</Id>
<Expression>my_dataset</Expression>
<Color>-2448096</Color>
<Expression2>p_BuildingThermalAsset.getCurrentTemperature()</Expression2>
<Expression2Flag>true</Expression2Flag>
<PointStyle>NONE</PointStyle>
<LineWidth>1.0</LineWidth>
</DatasetExpression>
<SamplesToKeep>288</SamplesToKeep>
<TimeWindowExpression>3</TimeWindowExpression>
<FillAreaUnderLine>false</FillAreaUnderLine>
<LabelFormat>dd_MM_HH</LabelFormat>
</TimePlot>
</Presentation>
150 changes: 150 additions & 0 deletions _alp/Agents/GCHouse/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,154 @@
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765292486713</Id>
<Name><![CDATA[p_buildingType_heatingPBL]]></Name>
<X>-300</X>
<Y>50</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[int]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<ParameterEditor>
<Id>1765292486711</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765292501616</Id>
<Name><![CDATA[p_ownership_heatingPBL]]></Name>
<X>-300</X>
<Y>70</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[int]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<ParameterEditor>
<Id>1765292501614</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765292517522</Id>
<Name><![CDATA[p_constructionPeriod_heatingPBL]]></Name>
<X>-300</X>
<Y>90</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[int]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<ParameterEditor>
<Id>1765292517520</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765292532994</Id>
<Name><![CDATA[p_localFactor_heatingPBL]]></Name>
<X>-300</X>
<Y>130</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>
<ParameterEditor>
<Id>1765292532992</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765292546817</Id>
<Name><![CDATA[p_regionalClimateCorrectionFactor_heatingPBL]]></Name>
<X>-300</X>
<Y>150</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>
<ParameterEditor>
<Id>1765292546815</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765357455086</Id>
<Name><![CDATA[p_schillabel_heatingPBL]]></Name>
<X>-300</X>
<Y>110</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[OL_GridConnectionIsolationLabel]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<ParameterEditor>
<Id>1765357455084</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
</Variables>
1 change: 1 addition & 0 deletions _alp/Agents/GCNeighborhood/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
<ReturnType>double</ReturnType>
<Id>1736869275213</Id>
<Name><![CDATA[f_batteryManagementBalanceNoGCCapacity_NBH]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1680</X>
<Y>570</Y>
<Label>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/GridConnection/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
c_hydrogenVehicles.forEach(v -> v.f_updateAllFlows());
c_consumptionAssets.forEach(c -> c.f_updateAllFlows());
c_productionAssets.forEach(p -> p.f_updateAllFlows());
c_profileAssets.forEach(p -> p.f_updateAllFlows(energyModel.t_h));
c_profileAssets.forEach(p -> p.f_updateProfileFlows(energyModel.t_h));
/*ALCODEEND*/}

double f_resetStates()
Expand Down
Loading
Loading