Skip to content

Commit

Permalink
Feature price bands update (#145)
Browse files Browse the repository at this point in the history
* Electricity price profiles

- Added class epriceprofiles
- changed flow and functions of f_operateAssetsHouse
- started simple implementation of price profile construction

* Charging based on price structure

f_chargeCheap now operates based on the price structure.

* Price band incentives from holon and gridOperator with TreeMap

*GridOperator is created from config excel and gridNodes linked to it, also from config excel,
*Alternative way of constructing and checking incentive price bands using TreeMap functionality,
*gridConnections receive (placeholder) price band incentive signals from gridOperator (communicated via gridNodes) and from their energyHolon if they have one,
*gridConnections check and combine the two signals with their supplier price by adding them up (for now).

* Consumption assets profiles scaled by yearly demand, data-agnostic heat network

** Consumption type energy assets schalen bepalen nu hun vermogensvraag a.d.h.v. hun jaarlijkse vraag in MWh en genormaliseerd vraagprofiel (telt op tot 1).
** werkende profiles toegevoegd voor house_electricity_demand_other en building_electricity_demand_other, house_heat_demand_hot_water.
** Technical debt: gehardcode energyAssets voor districtHeating data-agnost gemaakt via defaultEnergyAssets

* Heat network assets data-agnostisch, fixes

**District heating verder data-agnostisch gemaakt m.b.v. default energy assets. Parameter tweaks. Warmtepomp+gas-peak variant toegevoegd.
Bug: warmteverlies in district heating network gaat nog iets mis
**Kleine tweaks in configdata voor gridConnections en tweede heat-node
**kleine fixes hernoemen variabelen naar (grid ipv net)

* Kleine update main event

In main event:
- Snellere code door lokale variabele tijdstap te definieren ipv 5 keer de functie tijd aan te roepen
- electricity prices code ondergebracht onder 1 functie

* Flow door tijdstappen goed gezet

- collectie met alle productionassets toegevoegd in de main ( vanuit backbone functie EN vanuit addProductionAsset functie).
- overbodige parameters in EnergyAsset weggezet (zie kanvas)
- operateAssets functie per GC type bijgwerkt (omdat productie nu vanuit main komt en omdat veel verwijderd kon worden per specifieke GC)
- update energy flow in Energy Asset heeft nu input Double powerfraction nodig, en zet dan vervolgens zijn powerfraction gelijk aan die input (is fraaier bij aanroepen van functie)
- Wat gecommente code verwijderd bij meerdere functies
- f_calculateEnergy balance opgesplitst in meerdere functies (op volgorde): reset flows, operate consumption assets, operate flex assets, update flows. allemaal aangeroepen vanuit de main
- operate fixed consumption assets are overwritten in subclasses
-update energy asset flow function gesplitst in twee losse functies voor elektriciteit en voor alles tegelijk, waarschijnlijk verder uitsplitsen beter (ivm computational speed)
- paralel runnen weggehaald
- In f_update flows van GC is the energy asset loop over subconnexions switched to loop over energy assets. All we do here is retrieve the flows for the gridconnection. In the update funciton is the extensive list of double declerations replaced with direct decleration of variables.

Main event:
- alles in losse functies in volgorde
- production assets operation wordt nu aangeroepen vanuit de main

TECHNICAL DEBT:
- operate assets in GCDIstrictheating moet nog aangepast worden
- geen flex assets nog in de GCBuilding

* EV gedrag en GC flow update

- GC: Reset flows functie deleted, code put in update flows
- EAEV: charge functie vervangt nu de operate functie, de operate functie wordt nog wel aangeroepen maar verwijst door.
- EV charging now arranged through energy asset and the J_EAEV (prikkels en sturing WEL in GCHouse).

* Aanpassingen in main

- Losse functies voor update finances en gridnode balances
- electricity prices worden nu aan het einde van de tijdstap bepaald voor de volgende tijdstap
- restructuring user interface with input, output en model stuff

* Tarief structuur en paar andere dingen

- Main: Nieuwe logische namen voor de functies mbt de flow binnen iedere tijdstap
- NationalEnergyMarket: prijsupdate gebeurt nu 1x per uur ipv iedere tijdstap (om model sneller te maken)
- GridNode: congestionmode boolean toegevoegd: true als er congestietarief actief is

Eerste implementatie van tariefstructuur in gridoperator:
- gridnodes hebben drie 'bands' variabelen die ze afhankelijk van de situatie toepassen op hun nodes.
- alleen nodes waar overbelasting is komen extra tarieven van de gridoperator
- er zijn funcities om de bands waarden aan te passen
- complexere bands zijn momenteel niet mogelijk, maar kunnen op termijn simpel en generiek toegepast worden. Nadeel is dat het dan wel computational intensief wordt.

* Start prijzen vanuit energy supplier

Work in progress:
- Energy supplier subagents
- pricebands for electricity supplier
- elektriciteitstax parameter toegevoegd

* Data agnostic heatingSystemTypes, isolationLabels, fixes

* Het type heatingsysteem voor gridConnections wordt nu extern meegegeven in de backboneConfigExcel en json.
* Het schillabel van houses en buildings wordt nu extern meegegeven in de backBoneConfigExcel en json.
* Houses hebben nu een werkend energielabel en bijbehorend warmtevraagmodel
* Heat Storage en -Conversion energyassets die afhankelijk zijn van buitentemperatuur worden nu uurlijks voorzien van de juiste waarden hiervoor, vanuit main. Bodemtemperatuur-afhankelijke assets krijgen deze temperatuur éénmalig mee bij opstart.
* Fix: heat conversion- en storageAssets werden nog niet ge-operate in de nieuwe structuur. Dit werkt nu weer.
* Lege GCIndustry agenttype en population aangemaakt
* Profielen voor industry_steel en industry_other uit ETM in profiles-excel toegevoegd
* Run starttijd teruggezet naar 1-1-2022 zodat tijdreeksdata klopt bij de datum.

* Added rudimentary industry STEEL and OTHER functionality

* industry gridConnection types STEEL and OTHER toegevoegd voor GCIndustry in backBoneConfig300 excel. Deze worden ook aangemaakt bij model configuration.
* profielen voor elektriciteits- en warmtevraag updaten elk uur voor industry STEEL en OTHER.
* bijbehorende defaultEnergyAssets toegevoegd voor electriciteitsvraag en warmtevraag.
* defaultEnergyAssets methane_furnace en hydrogen_furnace voor de industry toegevoegd.
* J_EAConversionHydrogenBurner toegevoegd, analoog aan GasBurner.
* GCIndustry agent: simpele energyAsset aansturing toegevoegd voor consumption assets en conversion assets.
BUG: dubbeltelling flows in GCIndustry als warmtevraag wordt bepaald en vervolgens ingevuld met conversionasset!

* Data agnostic policy configuration

*Policies niet meer hardcoden maar extern configureren, in een nieuwe tab in de backBoneConfig excel!
*Python-scripts aangepast: experimenten bevatten nu ook policy-configs, worden ook omgezet in JSON-string.
*Policy values worden uit JSON-string ingelezen on model startup en waarden worden centraal geset in de betreffende agents.
*Nu geïmplementeerd: default charging behavior voor EVs (CHEAP), gridOperator congestion policy values (o.a. congestion thresholds en tarieven, boolean wel of niet congestionpricing toepassen voor consumption en production)
*Nieuwe policy-waarden kunnen zo eenvoudig en generiek data-agnost toegevoegd worden aan het model

* District Heating multiple heaters WIP

-Checking behavior of gas-fired district-heater and thermal storage
-Preparing for multiple-heater functionality and opportunity heating based on energy balance

* DH with heatpump and boiler functional

Some changes to the J_EAConversionHeatPump class to have correct results from getHeatCapacity_kW() method

Parameters not yet tuned, at the moment boiler is not being used yet. Also, no 'opportunity heating' active as there is not yet any energySurpluss variable that can be used for that.

* District Heating system H1 applies opportunity heating based on electricity surpluss of energy Holon 1

* Electricity prices bijna af (heel anders dan voorheen)

NIeuwe logische structuur voor pricebands

Deleted
- deleted electricity price profile class and variables
- deleted priceband variables en functies in GC and GO
- deleted messages of pricebands
- deleted pricebands and setPrices in ESelectricity

New
- p_fixedElectricityPrice in main (evt verplaatsen naar ES, maar eerst structuur van ES aanpassen)
- ES: update energy price overwritten in ESelectricity, functie communiceert prijs nu ook naar alle contractanten (moet de GSHEAT wel die functie hebben.. ?)
-GO: f_updateCongestionTariff checkt of er congestie is, en laat dan de GN zijn prijzen zetten
- CO: nieuwe functionaliteten waarin, als het nodig is, iedere tijdstap een priceband gemaakt wordt obv input geleverd vanuit de energy supplier en grid operator.
- GN: Meerdere funcites om congestie door te zetten naar verbonden gridconnections
- GN:
- Main: startup initialiseert nu consumpion en produciton congestie prijs

Vragen:
moet p_owenrActor type agetn zijn? Of can dat connectionOwner worden?

* Improvements on congestion tracking

- added congestion mode information in GN
- added collection that track congested parts of network in GO

* Additional updates on monitoring

- collections fix

* Priceband kleine update

minimale aanpassing

* House can now be heated with heatingtype "HEATPUMP_GASPEAK"

* DHW demand supplied by house heating systems, fixes to heatpump

*Added check to heatPump class: is base temp lower than output temp? Should always hold!
*Fixed mixup of base and output temps in heatpump class
*Connected DHW demand to heating systems
*For heating type HEATPUMP_GASPEAK the gas burner is always used to supply DHW
*Disabled selfSufficiency and selfConsumption calculations; needs rework.

* Final price updates

- checked all behavior
- fixed signs
- added correct behavior for fixed and variable contracts

Technical debt: add input to excel sheets

* Electricity prices bijna af (heel anders dan voorheen)

NIeuwe logische structuur voor pricebands

Deleted
- deleted electricity price profile class and variables
- deleted priceband variables en functies in GC and GO
- deleted messages of pricebands
- deleted pricebands and setPrices in ESelectricity

New
- p_fixedElectricityPrice in main (evt verplaatsen naar ES, maar eerst structuur van ES aanpassen)
- ES: update energy price overwritten in ESelectricity, functie communiceert prijs nu ook naar alle contractanten (moet de GSHEAT wel die functie hebben.. ?)
-GO: f_updateCongestionTariff checkt of er congestie is, en laat dan de GN zijn prijzen zetten
- CO: nieuwe functionaliteten waarin, als het nodig is, iedere tijdstap een priceband gemaakt wordt obv input geleverd vanuit de energy supplier en grid operator.
- GN: Meerdere funcites om congestie door te zetten naar verbonden gridconnections
- GN:
- Main: startup initialiseert nu consumpion en produciton congestie prijs

Vragen:
moet p_owenrActor type agetn zijn? Of can dat connectionOwner worden?

* Improvements on congestion tracking

- added congestion mode information in GN
- added collection that track congested parts of network in GO

* Additional updates on monitoring

- collections fix

* Priceband kleine update

minimale aanpassing

* Final price updates

- checked all behavior
- fixed signs
- added correct behavior for fixed and variable contracts

Technical debt: add input to excel sheets

* Fixed minus-sign in connectionOwner energySurpluss calculation

Co-authored-by: Peter Hogeveen <[email protected]>
Co-authored-by: JorritvandenHouten <[email protected]>
  • Loading branch information
3 people authored Oct 27, 2022
1 parent 0dddda7 commit 0b97274
Show file tree
Hide file tree
Showing 33 changed files with 63,155 additions and 18,154 deletions.
6,120 changes: 4,864 additions & 1,256 deletions Base/Base.alp

Large diffs are not rendered by default.

20,470 changes: 20,470 additions & 0 deletions Base/Base.alp.autosave

Large diffs are not rendered by default.

19,251 changes: 11,373 additions & 7,878 deletions Base/Base.original.alp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Base/OutputAgentData.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Base/OutputRunSettingsData.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"timeStep_h":"0.25","timeStepsElapsed":"35041","modelHoursElapsed_h":"8760.0","modelStartUpDuration_s":"1.292","modelRunDuration_s":"7.198","nGridNodes":"5","nGridConnections":"300","nEnergyAssets":"1702","nConnectionOwners":"288","nEnergySuppliers":"2","nEnergyHolons":"1","nAdministrativeHolons":"0","nGridOperators":"0","nNationalEnergyMarket":"1","totalElectricityImported_MWh":"88.905","totalElectricityExported_MWh":"49757.106"}]
[{"timeStep_h":"0.25","timeStepsElapsed":"1039","modelHoursElapsed_h":"259.7","modelStartUpDuration_s":"0.984","modelRunDuration_s":"257.944","nGridNodes":"6","nGridConnections":"302","nEnergyAssets":"1730","nConnectionOwners":"290","nEnergySuppliers":"2","nEnergyHolons":"1","nAdministrativeHolons":"0","nGridOperators":"1","nNationalEnergyMarket":"1","totalElectricityImported_MWh":"0.063","totalElectricityExported_MWh":"4682.946"}]
Binary file modified Base/__pycache__/API_test_Holon_JSON.cpython-310.pyc
Binary file not shown.
Binary file modified Base/__pycache__/API_test_Holon_JSON.cpython-38.pyc
Binary file not shown.
Binary file modified Base/__pycache__/experiment.cpython-310.pyc
Binary file not shown.
Binary file modified Base/__pycache__/experiment.cpython-38.pyc
Binary file not shown.
Binary file modified Base/__pycache__/generateConfigJSONs.cpython-310.pyc
Binary file not shown.
Binary file modified Base/__pycache__/generateConfigJSONs.cpython-38.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion Base/config_actors_1000_gridConnections.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Base/config_actors_300_gridConnections.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Base/config_actors_default.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"index":0,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh1","parent_actor":"sup1"},{"index":1,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh2","parent_actor":"sup1"},{"index":2,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh3","parent_actor":"sup1"},{"index":3,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh4","parent_actor":"hol1"},{"index":4,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh5","parent_actor":"sup1"},{"index":5,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh6","parent_actor":"sup1"},{"index":6,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh7","parent_actor":"sup1"},{"index":7,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh8","parent_actor":"sup1"},{"index":8,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh9","parent_actor":"sup1"},{"index":9,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh10","parent_actor":"hol1"},{"index":10,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh11","parent_actor":"hol1"},{"index":11,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh12","parent_actor":"hol1"},{"index":12,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh13","parent_actor":"sup1"},{"index":13,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh14","parent_actor":"sup1"},{"index":14,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh15","parent_actor":"sup1"},{"index":15,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh16","parent_actor":"sup1"},{"index":16,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh17","parent_actor":"sup1"},{"index":17,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh18","parent_actor":"sup1"},{"index":18,"type":"commercial","agenttype":"CONNECTIONOWNER","id":"com1","parent_actor":"hol1"},{"index":19,"type":"commercial","agenttype":"CONNECTIONOWNER","id":"com2","parent_actor":"sup1"},{"index":20,"type":"energysupplier","agenttype":"ENERGYSUPPLIER","id":"sup1","parent_actor":"nat"},{"index":21,"type":"energysupplier","agenttype":"ENERGYSUPPLIER","id":"sup2","parent_actor":"nat"},{"index":22,"type":"holon","agenttype":"ENERGYHOLON","id":"hol1","parent_actor":"sup2"}]
[{"index":0,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh1","parent_actor":"sup1"},{"index":1,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh2","parent_actor":"sup1"},{"index":2,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh3","parent_actor":"sup1"},{"index":3,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh4","parent_actor":"hol1"},{"index":4,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh5","parent_actor":"sup1"},{"index":5,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh6","parent_actor":"sup1"},{"index":6,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh7","parent_actor":"sup1"},{"index":7,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh8","parent_actor":"sup1"},{"index":8,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh9","parent_actor":"sup1"},{"index":9,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh10","parent_actor":"hol1"},{"index":10,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh11","parent_actor":"hol1"},{"index":11,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh12","parent_actor":"hol1"},{"index":12,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh13","parent_actor":"sup1"},{"index":13,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh14","parent_actor":"sup1"},{"index":14,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh15","parent_actor":"sup1"},{"index":15,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh16","parent_actor":"sup1"},{"index":16,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh17","parent_actor":"sup1"},{"index":17,"type":"household","agenttype":"CONNECTIONOWNER","id":"hh18","parent_actor":"sup1"},{"index":18,"type":"commercial","agenttype":"CONNECTIONOWNER","id":"com1","parent_actor":"hol1"},{"index":19,"type":"commercial","agenttype":"CONNECTIONOWNER","id":"com2","parent_actor":"sup1"},{"index":20,"type":"energysupplier","agenttype":"ENERGYSUPPLIER","id":"sup1","parent_actor":"nat"},{"index":21,"type":"energysupplier","agenttype":"ENERGYSUPPLIER","id":"sup2","parent_actor":"nat"},{"index":22,"type":"holon","agenttype":"ENERGYHOLON","id":"hol1","parent_actor":"sup2"},{"index":23,"type":"gridoperator","agenttype":"GRIDOPERATOR","id":"o1","parent_actor":null}]
2 changes: 1 addition & 1 deletion Base/config_energyAssets_300_gridConnections.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"index":0,"agenttype":"energyAsset","id":"a1","type":"PRODUCTION","type2":"WINDMILL","parent":"b25","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":1,"agenttype":"energyAsset","id":"a2","type":"PRODUCTION","type2":"WINDMILL","parent":"b25","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":2,"agenttype":"energyAsset","id":"a3","type":"PRODUCTION","type2":"WINDMILL","parent":"b26","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":3,"agenttype":"energyAsset","id":"a4","type":"PRODUCTION","type2":"WINDMILL","parent":"b26","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":4,"agenttype":"energyAsset","id":"a5","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b27","capacity_electric_kw":1000,"capacity_heat_kw":0},{"index":5,"agenttype":"energyAsset","id":"a6","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b27","capacity_electric_kw":1000,"capacity_heat_kw":0}]
[{"index":0,"agenttype":"energyAsset","id":"a1","type":"PRODUCTION","type2":"WINDMILL","parent":"b25","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":1,"agenttype":"energyAsset","id":"a2","type":"PRODUCTION","type2":"WINDMILL","parent":"b25","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":2,"agenttype":"energyAsset","id":"a3","type":"PRODUCTION","type2":"WINDMILL","parent":"b26","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":3,"agenttype":"energyAsset","id":"a4","type":"PRODUCTION","type2":"WINDMILL","parent":"b26","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":4,"agenttype":"energyAsset","id":"a5","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b27","capacity_electric_kw":1000,"capacity_heat_kw":0},{"index":5,"agenttype":"energyAsset","id":"a6","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b27","capacity_electric_kw":1000,"capacity_heat_kw":0},{"index":6,"agenttype":"energyAsset","id":"a1","type":"PRODUCTION","type2":"WINDMILL","parent":"b219","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":7,"agenttype":"energyAsset","id":"a2","type":"PRODUCTION","type2":"WINDMILL","parent":"b219","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":8,"agenttype":"energyAsset","id":"a3","type":"PRODUCTION","type2":"WINDMILL","parent":"b220","capacity_electric_kw":5000,"capacity_heat_kw":0},{"index":9,"agenttype":"energyAsset","id":"a4","type":"PRODUCTION","type2":"WINDMILL","parent":"b220","capacity_electric_kw":3000,"capacity_heat_kw":0},{"index":10,"agenttype":"energyAsset","id":"a5","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b221","capacity_electric_kw":1000,"capacity_heat_kw":0},{"index":11,"agenttype":"energyAsset","id":"a6","type":"PRODUCTION","type2":"PHOTOVOLTAIC","parent":"b221","capacity_electric_kw":1000,"capacity_heat_kw":0}]
2 changes: 1 addition & 1 deletion Base/config_gridConnections_300_gridConnections.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Base/config_gridNodes_1000_gridConnections.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"index":0,"agenttype":"netNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":1,"agenttype":"netNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":2,"agenttype":"netNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":3,"agenttype":"netNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000},{"index":4,"agenttype":"netNode","id":"H1","type":"HEAT","type2":"MT","parent":null,"capacity_kw":300000}]
[{"index":0,"agenttype":"netNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":1,"agenttype":"netNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":2,"agenttype":"netNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":3,"agenttype":"netNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000,"owner":"o1"},{"index":4,"agenttype":"netNode","id":"H1","type":"HEAT","type2":"MT","parent":null,"capacity_kw":300000,"owner":null}]
2 changes: 1 addition & 1 deletion Base/config_gridNodes_300_gridConnections.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"index":0,"agenttype":"netNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":1,"agenttype":"netNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":2,"agenttype":"netNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":3,"agenttype":"netNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000},{"index":4,"agenttype":"netNode","id":"H1","type":"HEAT","type2":"MT","parent":null,"capacity_kw":300000}]
[{"index":0,"agenttype":"gridNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":1,"agenttype":"gridNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":2,"agenttype":"gridNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"owner":"o1"},{"index":3,"agenttype":"gridNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000,"owner":"o1"},{"index":4,"agenttype":"gridNode","id":"H1","type":"HEAT","type2":"HT","parent":null,"capacity_kw":300000,"owner":null},{"index":5,"agenttype":"gridNode","id":"H2","type":"HEAT","type2":"HT","parent":null,"capacity_kw":300000,"owner":null}]
2 changes: 1 addition & 1 deletion Base/config_gridNodes_default.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"index":0,"agenttype":"gridNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":1,"agenttype":"gridNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":2,"agenttype":"gridNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000},{"index":3,"agenttype":"gridNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000},{"index":4,"agenttype":"gridNode","id":"H1","type":"HEAT","type2":"MT","parent":null,"capacity_kw":300000}]
[{"index":0,"agenttype":"gridNode","id":"E2","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"operator":"o1"},{"index":1,"agenttype":"gridNode","id":"E3","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"operator":"o1"},{"index":2,"agenttype":"gridNode","id":"E4","type":"ELECTRICITY","type2":"MSLS","parent":"E1","capacity_kw":1000,"operator":"o1"},{"index":3,"agenttype":"gridNode","id":"E1","type":"ELECTRICITY","type2":"HSMS","parent":null,"capacity_kw":500000,"operator":"o1"},{"index":4,"agenttype":"gridNode","id":"H1","type":"HEAT","type2":"MT","parent":null,"capacity_kw":300000,"operator":null}]
1 change: 1 addition & 0 deletions Base/config_policies_300_gridConnections.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"index":0,"parameter":"EV_charging_attitude_standard","value":"CHEAP","unit":null,"comment":"charging behaviour not contingent on holon"},{"index":1,"parameter":"Grid_MS_congestion_allowance_level_kW","value":3,"unit":"kW","comment":"gridOperator policy variable"},{"index":2,"parameter":"Grid_MS_congestion_price","value":0.5,"unit":"kW","comment":"gridOperator policy value"},{"index":3,"parameter":"Grid_MS_congestion_threshold","value":0.7,"unit":"fr","comment":"gridOperator policy value"},{"index":4,"parameter":"Grid_MS_congestion_pricing_consumption","value":true,"unit":null,"comment":"gridOperator policy value"},{"index":5,"parameter":"Grid_MS_congestion_pricing_production","value":false,"unit":null,"comment":"gridOperator policy value"}]
Binary file modified Base/database/db.lck
Binary file not shown.
Loading

0 comments on commit 0b97274

Please sign in to comment.