Skip to content

Cooking updates #100

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
Luc-Sol merged 1 commit into from
Jan 24, 2025
Merged

Cooking updates #100

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
2 changes: 1 addition & 1 deletion Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<AnyLogicWorkspace splitVersion="1"
WorkspaceVersion="1.9"
AnyLogicVersion="8.9.2.202410172110"
AnyLogicVersion="8.9.2.202410172112"
AlpVersion="8.9.2">
<Model>
<Id>1658477103134</Id>
Expand Down
148 changes: 127 additions & 21 deletions _alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ import java.util.EnumSet;]]></Import>
<Name><![CDATA[data_naturalGasDemand_kW]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>60</X>
<Y>1450</Y>
<Y>1430</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -153,7 +153,7 @@ import java.util.EnumSet;]]></Import>
<Id>1709636537281</Id>
<Name><![CDATA[data_heatPumpElectricityDemand_kW]]></Name>
<X>60</X>
<Y>1530</Y>
<Y>1510</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -265,7 +265,7 @@ import java.util.EnumSet;]]></Import>
<Id>1709636537321</Id>
<Name><![CDATA[data_batteryCharging_kW]]></Name>
<X>60</X>
<Y>1570</Y>
<Y>1550</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -293,7 +293,7 @@ import java.util.EnumSet;]]></Import>
<Id>1709636537330</Id>
<Name><![CDATA[data_baseloadElectricityDemand_kW]]></Name>
<X>60</X>
<Y>1510</Y>
<Y>1490</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -350,7 +350,7 @@ import java.util.EnumSet;]]></Import>
<Name><![CDATA[data_dieselDemand_kW]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>60</X>
<Y>1469</Y>
<Y>1449</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -378,7 +378,7 @@ import java.util.EnumSet;]]></Import>
<Id>1709636537360</Id>
<Name><![CDATA[data_electricVehicleDemand_kW]]></Name>
<X>60</X>
<Y>1550</Y>
<Y>1530</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -435,7 +435,7 @@ import java.util.EnumSet;]]></Import>
<Name><![CDATA[data_hydrogenDemand_kW]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>60</X>
<Y>1490</Y>
<Y>1470</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -516,8 +516,8 @@ import java.util.EnumSet;]]></Import>
<DataSet>
<Id>1723103882837</Id>
<Name><![CDATA[data_annualWindGeneration_kW]]></Name>
<X>392.66666666666663</X>
<Y>2125.333333333333</Y>
<X>392.667</X>
<Y>2135.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand All @@ -542,8 +542,8 @@ import java.util.EnumSet;]]></Import>
<DataSet>
<Id>1723103882840</Id>
<Name><![CDATA[data_annualV2GSupply_kW]]></Name>
<X>392.66666666666663</X>
<Y>2165.333333333333</Y>
<X>392.667</X>
<Y>2175.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand All @@ -568,8 +568,8 @@ import java.util.EnumSet;]]></Import>
<DataSet>
<Id>1723103882845</Id>
<Name><![CDATA[data_annualPVGeneration_kW]]></Name>
<X>392.66666666666663</X>
<Y>2105.333333333333</Y>
<X>392.667</X>
<Y>2115.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -672,8 +672,8 @@ import java.util.EnumSet;]]></Import>
<DataSet>
<Id>1723103882880</Id>
<Name><![CDATA[data_annualBatteriesSupply_kW]]></Name>
<X>392.66666666666663</X>
<Y>2145.333333333333</Y>
<X>392.667</X>
<Y>2155.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -834,8 +834,8 @@ import java.util.EnumSet;]]></Import>
<Id>1723103882930</Id>
<Name><![CDATA[data_annualNaturalGasSupply_kW]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>392.66666666666663</X>
<Y>2185.333333333333</Y>
<X>392.667</X>
<Y>2195.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand All @@ -861,8 +861,8 @@ import java.util.EnumSet;]]></Import>
<Id>1723103882937</Id>
<Name><![CDATA[data_annualDistrictHeatSupply_MWh]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>392.66666666666663</X>
<Y>2225.333333333333</Y>
<X>392.667</X>
<Y>2235.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -915,8 +915,8 @@ import java.util.EnumSet;]]></Import>
<Id>1723103882953</Id>
<Name><![CDATA[data_annualHydrogenSupply_kW]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>392.66666666666663</X>
<Y>2205.333333333333</Y>
<X>392.667</X>
<Y>2215.333</Y>
<Label>
<X>15</X>
<Y>0</Y>
Expand Down Expand Up @@ -1624,6 +1624,112 @@ import java.util.EnumSet;]]></Import>
<FreezeXAxis>false</FreezeXAxis>
<SamplesToKeep>672</SamplesToKeep>
</DataSet>
<DataSet>
<Id>1736518694619</Id>
<Name><![CDATA[data_cookingElectricityDemand_kW]]></Name>
<X>60</X>
<Y>1570</Y>
<Label>
<X>15</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<AutoUpdate>false</AutoUpdate>
<OccurrenceAtTime>true</OccurrenceAtTime>
<OccurrenceDate>1687075200000</OccurrenceDate>
<OccurrenceTime Class="CodeUnitValue">
<Code><![CDATA[0]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</OccurrenceTime>
<RecurrenceCode Class="CodeUnitValue">
<Code><![CDATA[1]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</RecurrenceCode>
<FreezeXAxis>false</FreezeXAxis>
<HorizontalAxisExpression>energyModel.t_h-energyModel.p_runStartTime_h</HorizontalAxisExpression>
<VerticalAxisExpression>v_electricHobConsumption_kW</VerticalAxisExpression>
<SamplesToKeep>672</SamplesToKeep>
</DataSet>
<DataSet>
<Id>1736518845396</Id>
<Name><![CDATA[data_annualCookingElectricityDemand_kW]]></Name>
<X>393</X>
<Y>2084</Y>
<Label>
<X>15</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<AutoUpdate>false</AutoUpdate>
<OccurrenceAtTime>true</OccurrenceAtTime>
<OccurrenceDate>1687075200000</OccurrenceDate>
<OccurrenceTime Class="CodeUnitValue">
<Code><![CDATA[0]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</OccurrenceTime>
<RecurrenceCode Class="CodeUnitValue">
<Code><![CDATA[1]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</RecurrenceCode>
<FreezeXAxis>false</FreezeXAxis>
<SamplesToKeep>365</SamplesToKeep>
</DataSet>
<DataSet>
<Id>1736518921685</Id>
<Name><![CDATA[data_summerWeekCookingElectricityDemand_kW]]></Name>
<X>391</X>
<Y>2417</Y>
<Label>
<X>15</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<AutoUpdate>false</AutoUpdate>
<OccurrenceAtTime>true</OccurrenceAtTime>
<OccurrenceDate>1687075200000</OccurrenceDate>
<OccurrenceTime Class="CodeUnitValue">
<Code><![CDATA[0]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</OccurrenceTime>
<RecurrenceCode Class="CodeUnitValue">
<Code><![CDATA[1]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</RecurrenceCode>
<FreezeXAxis>false</FreezeXAxis>
<SamplesToKeep>672</SamplesToKeep>
</DataSet>
<DataSet>
<Id>1736518998850</Id>
<Name><![CDATA[data_winterWeekCookingElectricityDemand_kW]]></Name>
<X>390</X>
<Y>2727</Y>
<Label>
<X>15</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<AutoUpdate>false</AutoUpdate>
<OccurrenceAtTime>true</OccurrenceAtTime>
<OccurrenceDate>1687075200000</OccurrenceDate>
<OccurrenceTime Class="CodeUnitValue">
<Code><![CDATA[0]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</OccurrenceTime>
<RecurrenceCode Class="CodeUnitValue">
<Code><![CDATA[1]]></Code>
<Unit Class="TimeUnits">HOUR</Unit>
</RecurrenceCode>
<FreezeXAxis>false</FreezeXAxis>
<SamplesToKeep>672</SamplesToKeep>
</DataSet>
</AnalysisData>
<AgentLinks>
<AgentLink>
Expand Down
8 changes: 7 additions & 1 deletion _alp/Agents/EnergyCoop/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@
v_dailyHeatPumpElectricityDemand_kW = 0;
v_dailyElectricVehicleDemand_kW = 0;
v_dailyBatteriesDemand_kW = 0;

v_dailyCookingElectricityDemand_kW = 0;

// Supply
fm_dailyAverageSupply_kW.clear();
Expand Down Expand Up @@ -1315,6 +1315,7 @@
data_heatPumpElectricityDemand_kW.update();
data_electricVehicleDemand_kW.update();
data_batteryCharging_kW.update();
data_cookingElectricityDemand_kW.update();

data_PVGeneration_kW.update();
data_V2GSupply_kW.update();
Expand Down Expand Up @@ -1771,6 +1772,7 @@ DataSet f_getDuurkromme()
data_summerWeekHeatPumpElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_heatPumpElectricityConsumption_kW);
data_summerWeekElectricVehicleDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, max(0,v_evChargingPowerElectric_kW));
data_summerWeekBatteriesDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, max(0,v_batteryPowerElectric_kW));
data_summerWeekCookingElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_electricHobConsumption_kW);

data_summerWeekPVGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_pvProductionElectric_kW);
data_summerWeekWindGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_windProductionElectric_kW);
Expand All @@ -1790,6 +1792,7 @@ DataSet f_getDuurkromme()
data_winterWeekHeatPumpElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_heatPumpElectricityConsumption_kW);
data_winterWeekElectricVehicleDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, max(0, v_evChargingPowerElectric_kW));
data_winterWeekBatteriesDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, max(0, v_batteryPowerElectric_kW));
data_winterWeekCookingElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_electricHobConsumption_kW);

data_winterWeekPVGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_pvProductionElectric_kW);
data_winterWeekWindGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_windProductionElectric_kW);
Expand All @@ -1805,6 +1808,7 @@ DataSet f_getDuurkromme()
v_dailyHeatPumpElectricityDemand_kW += v_heatPumpElectricityConsumption_kW;
v_dailyElectricVehicleDemand_kW += max(0,v_evChargingPowerElectric_kW);
v_dailyBatteriesDemand_kW += max(0,v_batteryPowerElectric_kW);
v_dailyCookingElectricityDemand_kW += v_electricHobConsumption_kW;

// Supply
fm_dailyAverageSupply_kW.addFlows(fm_currentProductionFlows_kW);
Expand All @@ -1825,6 +1829,7 @@ DataSet f_getDuurkromme()
data_annualHeatPumpElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyHeatPumpElectricityDemand_kW/(24 / energyModel.p_timeStep_h));
data_annualElectricVehicleDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyElectricVehicleDemand_kW/(24 / energyModel.p_timeStep_h));
data_annualBatteriesDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyBatteriesDemand_kW/(24 / energyModel.p_timeStep_h));
data_annualCookingElectricityDemand_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyCookingElectricityDemand_kW/(24 / energyModel.p_timeStep_h));
// Supply
data_annualPVGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyPVGeneration_kW/(24 / energyModel.p_timeStep_h));
data_annualWindGeneration_kW.add(energyModel.t_h-energyModel.p_runStartTime_h, v_dailyWindGeneration_kW/(24 / energyModel.p_timeStep_h));
Expand All @@ -1838,6 +1843,7 @@ DataSet f_getDuurkromme()
v_dailyHeatPumpElectricityDemand_kW = 0;
v_dailyElectricVehicleDemand_kW = 0;
v_dailyBatteriesDemand_kW = 0;
v_dailyCookingElectricityDemand_kW = 0;
// Supply
fm_dailyAverageSupply_kW.clear();
v_dailyPVGeneration_kW = 0;
Expand Down
Loading
Loading