Skip to content

bugfix #197

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
GillisHommen merged 2 commits into from
Sep 4, 2025
Merged

bugfix #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5305e26
bugfix
20182294 Sep 3, 2025
f4d4f08
removed 'duplicate' variables from energyModel canvas, such as curren…
GillisHommen Sep 4, 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
19 changes: 0 additions & 19 deletions _alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,25 +169,6 @@
<LineArrowPosition>END</LineArrowPosition>
</AgentLink>
</AgentLinks>
<ContainerLinks>
<ContainerLink>
<Id>1658752707227</Id>
<Name><![CDATA[energyModel]]></Name>
<X>50</X>
<Y>-100</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<ActiveObjectClass>
<PackageName>zero_engine</PackageName>
<ClassName>EnergyModel</ClassName>
</ActiveObjectClass>
</ContainerLink>
</ContainerLinks>
<Presentation>
<Level>
<Id>1658752695710</Id>
Expand Down
23 changes: 11 additions & 12 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@
b_isLastTimeStepOfDay = t_h % 24 == (24-p_timeStep_h);
t_hourOfDay = t_h % 24; // Assumes modelrun starts at midnight.


v_currentAmbientTemperature_degC = pp_ambientTemperature_degC.getCurrentValue();
c_profiles.forEach(p -> p.updateValue(t_h));
v_currentWindPowerNormalized_r = pp_windProduction_fr.getCurrentValue();
v_currentSolarPowerNormalized_r = pp_PVProduction35DegSouth_fr.getCurrentValue();
//v_currentAmbientTemperature_degC = pp_ambientTemperature_degC.getCurrentValue();
//v_currentWindPowerNormalized_r = pp_windProduction_fr.getCurrentValue();
//v_currentSolarPowerNormalized_r = pp_PVProduction35DegSouth_fr.getCurrentValue();
//v_currentCookingDemand_fr = tf_cooking_demand(t_h);

if (b_enableDLR) {
v_currentDLRfactor_fr = 1 + max(-0.1,v_currentWindPowerNormalized_r * 0.025*(30-v_currentAmbientTemperature_degC) + 0.5 - v_currentSolarPowerNormalized_r);
v_currentDLRfactor_fr = 1 + max(-0.1,pp_windProduction_fr.getCurrentValue() * 0.025*(30-pp_ambientTemperature_degC.getCurrentValue()) + 0.5 - pp_PVProduction35DegSouth_fr.getCurrentValue());
//v_currentDLRfactor_fr = 1 + uniform(-0.1, 1.0);
v_minDLRfactor_fr = min (v_minDLRfactor_fr, v_currentDLRfactor_fr);
v_maxDLRfactor_fr = max (v_maxDLRfactor_fr, v_currentDLRfactor_fr);
Expand All @@ -68,14 +67,14 @@

// Update forecasts, the relevant profile pointers are already updated above
c_forecasts.forEach(f -> f.updateForecast(t_h));
v_SolarYieldForecast_fr = pf_PVProduction35DegSouth_fr.getForecast();
v_WindYieldForecast_fr = pf_windProduction_fr.getForecast();
//v_SolarYieldForecast_fr = pf_PVProduction35DegSouth_fr.getForecast();
//v_WindYieldForecast_fr = pf_windProduction_fr.getForecast();
// The ElectricityYieldForecast assumes solar and wind forecasts have the same forecast time
if ( v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW > 0 ) {
v_electricityYieldForecast_fr = (v_SolarYieldForecast_fr * v_liveAssetsMetaData.totalInstalledPVPower_kW + v_WindYieldForecast_fr * v_liveAssetsMetaData.totalInstalledWindPower_kW) / (v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW);
v_electricityYieldForecast_fr = (pf_PVProduction35DegSouth_fr.getForecast() * v_liveAssetsMetaData.totalInstalledPVPower_kW + pf_windProduction_fr.getForecast() * v_liveAssetsMetaData.totalInstalledWindPower_kW) / (v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW);
}
// And price forecast!
v_epexForecast_eurpkWh = 0.001*pf_dayAheadElectricityPricing_eurpMWh.getForecast();
//v_epexForecast_eurpkWh = 0.001*pf_dayAheadElectricityPricing_eurpMWh.getForecast();

for (GridNode GN : c_gridNodeExecutionList) {
GN.f_updateForecasts();
Expand Down Expand Up @@ -883,7 +882,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
//Do nothing, use preset ambient temp
break;
case AMBIENT_AIR:
((J_EAStorageHeat)e).updateAmbientTemperature( v_currentAmbientTemperature_degC );
((J_EAStorageHeat)e).updateAmbientTemperature( pp_ambientTemperature_degC.getCurrentValue() );
break;
case BUILDING:
new RuntimeException("AmbientTempType 'BUILDING' is not supported yet for J_EAStorageHeat!");
Expand Down Expand Up @@ -912,7 +911,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
//Do nothing, use preset ambient temp
break;
case AMBIENT_AIR:
((J_EAConversionHeatPump)e).updateAmbientTemperature( v_currentAmbientTemperature_degC );
((J_EAConversionHeatPump)e).updateAmbientTemperature( pp_ambientTemperature_degC.getCurrentValue() );
break;
case BUILDING:
new RuntimeException("AmbientTempType 'BUILDING' is not supported yet for J_EAConversionHeatPump!");
Expand All @@ -936,7 +935,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
}
if( e instanceof J_EABuilding ) {
//traceln("v_currentSolarPowerNormalized_r: %s", v_currentSolarPowerNormalized_r);
((J_EABuilding)e).updateSolarRadiation(v_currentSolarPowerNormalized_r*1000);
((J_EABuilding)e).updateSolarRadiation(pp_PVProduction35DegSouth_fr.getCurrentValue()*1000);
}
}
/*ALCODEEND*/}
Expand Down
60 changes: 30 additions & 30 deletions _alp/Agents/EnergyModel/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@
<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
<Id>1716890117265</Id>
<Name><![CDATA[f_getActiveGridConnections]]></Name>
<X>1580</X>
<Y>730</Y>
<X>1640</X>
<Y>370</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -273,8 +273,8 @@
<ReturnType>ArrayList&lt;ConnectionOwner&gt;</ReturnType>
<Id>1716897568717</Id>
<Name><![CDATA[f_getConnectionOwners]]></Name>
<X>1580</X>
<Y>770</Y>
<X>1640</X>
<Y>410</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -289,8 +289,8 @@
<ReturnType>double</ReturnType>
<Id>1716899946694</Id>
<Name><![CDATA[f_getTopLevelGridCapacity_kW]]></Name>
<X>1580</X>
<Y>790</Y>
<X>1640</X>
<Y>430</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -305,8 +305,8 @@
<ReturnType>ArrayList&lt;J_EA&gt;</ReturnType>
<Id>1717058801652</Id>
<Name><![CDATA[f_getEnergyAssets]]></Name>
<X>1580</X>
<Y>810</Y>
<X>1640</X>
<Y>450</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -321,8 +321,8 @@
<ReturnType>ArrayList&lt;GridNode&gt;</ReturnType>
<Id>1718289616227</Id>
<Name><![CDATA[f_getGridNodesTopLevel]]></Name>
<X>1580</X>
<Y>860</Y>
<X>1640</X>
<Y>500</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -337,8 +337,8 @@
<ReturnType>ArrayList&lt;GridNode&gt;</ReturnType>
<Id>1718289761647</Id>
<Name><![CDATA[f_getGridNodesNotTopLevel]]></Name>
<X>1580</X>
<Y>880</Y>
<X>1640</X>
<Y>520</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -407,8 +407,8 @@
<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
<Id>1727167397666</Id>
<Name><![CDATA[f_getPausedGridConnections]]></Name>
<X>1580</X>
<Y>750</Y>
<X>1640</X>
<Y>390</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -475,8 +475,8 @@
<ReturnType>EnergyCoop</ReturnType>
<Id>1739958854535</Id>
<Name><![CDATA[f_addEnergyCoop]]></Name>
<X>1580</X>
<Y>540</Y>
<X>1640</X>
<Y>180</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -495,8 +495,8 @@
<ReturnType>EnergyCoop</ReturnType>
<Id>1739972940581</Id>
<Name><![CDATA[f_removeEnergyCoop]]></Name>
<X>1580</X>
<Y>560</Y>
<X>1640</X>
<Y>200</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -515,8 +515,8 @@
<ReturnType>EnergyCoop</ReturnType>
<Id>1740056275008</Id>
<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
<X>1580</X>
<Y>600</Y>
<X>1640</X>
<Y>240</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -535,8 +535,8 @@
<ReturnType>double</ReturnType>
<Id>1741710906926</Id>
<Name><![CDATA[f_updateActiveAssetsMetaData]]></Name>
<X>1580</X>
<Y>440</Y>
<X>1640</X>
<Y>80</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -551,8 +551,8 @@
<ReturnType>EnergyCoop</ReturnType>
<Id>1746021439807</Id>
<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
<X>1580</X>
<Y>620</Y>
<X>1640</X>
<Y>260</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -635,8 +635,8 @@
<ReturnType>EnergyCoop</ReturnType>
<Id>1754379679149</Id>
<Name><![CDATA[f_addAssetFlow]]></Name>
<X>1580</X>
<Y>640</Y>
<X>1640</X>
<Y>280</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -655,8 +655,8 @@
<ReturnType>List&lt;GridConnection&gt;</ReturnType>
<Id>1754908171225</Id>
<Name><![CDATA[f_getGridConnectionsCollectionPointer]]></Name>
<X>1580</X>
<Y>920</Y>
<X>1640</X>
<Y>560</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -671,8 +671,8 @@
<ReturnType>List&lt;GridConnection&gt;</ReturnType>
<Id>1755014169405</Id>
<Name><![CDATA[f_getPausedGridConnectionsCollectionPointer]]></Name>
<X>1580</X>
<Y>940</Y>
<X>1640</X>
<Y>580</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down
Loading