Skip to content

Holon updates #98

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 3 commits into from
Jan 9, 2025
Merged

Holon updates #98

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef4caad
J_EA function f_updateAllFlows() is now overloaded with a method with…
GillisHommen Dec 17, 2024
9e48c67
Add method f_setPowerFraction_fr to J_EA
GillisHommen Dec 18, 2024
68c3ac5
Merge branch 'main' into holonUpdates
GillisHommen Jan 6, 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
22 changes: 15 additions & 7 deletions Zero_engine.alp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
AnyLogic Project File
*************************************************
-->
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.9.2.202410172112" AlpVersion="8.9.2">
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.9.2.202410172110" AlpVersion="8.9.2">
<Model>
<Id>1658477103134</Id>
<Name><![CDATA[Zero_engine]]></Name>
Expand Down Expand Up @@ -27132,7 +27132,7 @@ dsm_winterWeekSupplyDataSets_kW.createEmptyDataSets(v_activeEnergyCarriers, (int
<LineWidth>1.0</LineWidth>
</DatasetExpression>
<DatasetExpression>
<Title><![CDATA[NET LOAD]]></Title>
<Title><![CDATA[GRID LOAD]]></Title>
<Id>0</Id>
<Expression><![CDATA[my_dataset5]]></Expression>
<Color>-16776961</Color>
Expand Down Expand Up @@ -43342,7 +43342,7 @@ if( p_householdEV != null && p_chargingAttitudeVehicles == OL_ChargingAttitude.C
}
]]></Body>
</Function>
<Function AccessType="public" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType><![CDATA[double]]></ReturnType>
<Id>1676477303264</Id>
Expand Down Expand Up @@ -43421,7 +43421,7 @@ p_primaryHeatingAsset.v_powerFraction_fr = powerFraction_heatPump_fr;
//traceln( "heatpumpt power fraction: " + powerFraction_heatPump_fr);
]]></Body>
</Function>
<Function AccessType="public" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType><![CDATA[double]]></ReturnType>
<Id>1676976246060</Id>
Expand Down Expand Up @@ -43804,7 +43804,7 @@ if ( p_heatBuffer != null){
p_heatBuffer.removeEnergyAsset();
}]]></Body>
</Function>
<Function AccessType="default" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType><![CDATA[double]]></ReturnType>
<Id>1726301776809</Id>
Expand Down Expand Up @@ -43833,7 +43833,7 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
}
]]></Body>
</Function>
<Function AccessType="default" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType><![CDATA[double]]></ReturnType>
<Id>1726301785545</Id>
Expand All @@ -43859,7 +43859,7 @@ else {
traceln("House " + p_gridConnectionID + " has heatingtype DISTRICT HEAT, but no delivery set or building asset!");
} ]]></Body>
</Function>
<Function AccessType="default" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType><![CDATA[double]]></ReturnType>
<Id>1726334759211</Id>
Expand Down Expand Up @@ -53853,6 +53853,14 @@ abstract public class J_EA implements Cloneable {
//return this.flowsMap;
}

public void f_updateAllFlows() {
this.f_updateAllFlows(this.v_powerFraction_fr);
}

public void f_setPowerFraction_fr(double powerFraction_fr) {
this.v_powerFraction_fr = powerFraction_fr;
}

public void clear() {
flowsMap.clear();
energyUse_kW = 0;
Expand Down
Loading