Skip to content

Asset flows map #180

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 17 commits into from
Aug 7, 2025
Merged

Asset flows map #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6584a16
replaced J_assetFlows with J_assetFlowsMap, all plots still work it s…
GillisHommen Jul 31, 2025
4104a26
toString of flowsMap uses newline for each key/value pair.
GillisHommen Jul 31, 2025
be8d1b6
Added J_AssetFlowsAccumulatorMap and added to J_RapidRunData
GillisHommen Aug 1, 2025
8754e2f
AccumulatorMap and DataSetMap now take OL.class as input, so they can…
GillisHommen Aug 1, 2025
46ed44e
J_AssetFlowsMap replaced by J_ValueMap, gets OL.class as argument in …
GillisHommen Aug 1, 2025
7092098
Commit before removing asset-flow-specific accumulators
GillisHommen Aug 4, 2025
1a66310
fix build error
GillisHommen Aug 4, 2025
af8bb49
Everything based on AssetFlowsMaps instead of hardcoded categories.
GillisHommen Aug 4, 2025
1c741aa
bugfix createEmptyAccumulators for am_assetFlowsWinterWeek_kW
GillisHommen Aug 4, 2025
f5d1110
Add new live AssetFlow datasets when a new assetFlowCategory is added…
GillisHommen Aug 5, 2025
026f415
Refactoring of logic to add energyCarriers and assetFlows to GridConn…
GillisHommen Aug 5, 2025
bfb040f
Cleanup of assetcollections for plots, added default assetCategory to…
GillisHommen Aug 5, 2025
7793b69
J_LoadDurationCurves now takes week with min/max load instead of fixe…
GillisHommen Aug 6, 2025
cd9ad4f
Merge branch 'main' into assetFlowsMap
GillisHommen Aug 6, 2025
fba3b5b
further fixes
GillisHommen Aug 6, 2025
d8302fd
added overloaded getDataSet() method to ZeroTimeSeries to get dataset…
GillisHommen Aug 7, 2025
0276a1c
Fixes after review of pullrequest
GillisHommen Aug 7, 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
72 changes: 71 additions & 1 deletion Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,62 @@
<Name><![CDATA[HEAT_STORAGE]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1753968826411</Id>
<Name><![CDATA[OL_AssetFlowCategories]]></Name>
<Option>
<Id>1753968826412</Id>
<Name><![CDATA[fixedConsumptionElectric_kW]]></Name>
</Option>
<Option>
<Id>1753968826413</Id>
<Name><![CDATA[heatPumpElectricityConsumption_kW]]></Name>
</Option>
<Option>
<Id>1753968826414</Id>
<Name><![CDATA[evChargingPower_kW]]></Name>
</Option>
<Option>
<Id>1754291180994</Id>
<Name><![CDATA[V2GPower_kW]]></Name>
</Option>
<Option>
<Id>1753968826415</Id>
<Name><![CDATA[batteriesChargingPower_kW]]></Name>
</Option>
<Option>
<Id>1754291194949</Id>
<Name><![CDATA[batteriesDischargingPower_kW]]></Name>
</Option>
<Option>
<Id>1753968826416</Id>
<Name><![CDATA[electrolyserElectricityConsumption_kW]]></Name>
</Option>
<Option>
<Id>1753968826417</Id>
<Name><![CDATA[electricHobConsumption_kW]]></Name>
</Option>
<Option>
<Id>1753968826418</Id>
<Name><![CDATA[districtHeatDelivery_kW]]></Name>
</Option>
<Option>
<Id>1753968826419</Id>
<Name><![CDATA[pvProductionElectric_kW]]></Name>
</Option>
<Option>
<Id>1753968826420</Id>
<Name><![CDATA[windProductionElectric_kW]]></Name>
</Option>
<Option>
<Id>1753968826421</Id>
<Name><![CDATA[ptProductionHeat_kW]]></Name>
</Option>
<Option>
<Id>1753968826422</Id>
<Name><![CDATA[CHPProductionElectric_kW]]></Name>
</Option>
</OptionList>
</OptionLists>
<Folders>
<Folder>
Expand Down Expand Up @@ -1505,6 +1561,7 @@
<JavaClass>
<Id>1671107396262</Id>
<Name><![CDATA[J_EAConversionElektrolyser]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
Expand Down Expand Up @@ -1611,7 +1668,8 @@
</JavaClass>
<JavaClass>
<Id>1729510354900</Id>
<Name><![CDATA[J_AccumulatorMap]]></Name>
<Name><![CDATA[J_AssetFlowsAccumulatorMap]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752679379816</Folder>
</JavaClass>
<JavaClass>
Expand Down Expand Up @@ -1755,6 +1813,8 @@
<JavaClass>
<Id>1753106536266</Id>
<Name><![CDATA[J_AssetFlows]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752679379816</Folder>
</JavaClass>
<JavaClass>
<Id>1753199813037</Id>
Expand Down Expand Up @@ -1796,6 +1856,16 @@
<Name><![CDATA[ActorMixin]]></Name>
<Folder>1753342021373</Folder>
</JavaClass>
<JavaClass>
<Id>1753968339982</Id>
<Name><![CDATA[J_ValueMap]]></Name>
<Folder>1752679379816</Folder>
</JavaClass>
<JavaClass>
<Id>1754038055004</Id>
<Name><![CDATA[J_AccumulatorMap]]></Name>
<Folder>1752679379816</Folder>
</JavaClass>
<JavaClass>
<Id>1754405220949</Id>
<Name><![CDATA[J_HeatingManagementBuildingWithPTBufferSimple]]></Name>
Expand Down
Loading