From b1166242fa5e4e73e1d83d939e4c537606af4136 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Thu, 7 May 2026 09:45:36 +0200
Subject: [PATCH 1/5] bugfixes

---
 .../Agents/Zero_Interface/Code/Functions.java | 30 ++++++-------
 _alp/Agents/Zero_Interface/Code/Functions.xml |  2 +-
 .../Zero_Interface/Levels/Level.level.xml     | 44 +++++++++----------
 _alp/Agents/Zero_Loader/Code/Functions.java   |  7 ++-
 _alp/Agents/tabElectricity/Code/Functions.xml |  4 +-
 .../tabElectricity/Levels/Level.level.xml     |  4 +-
 _alp/Classes/Class.Electrolyser_data.java     |  1 +
 7 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 01cd4d9..e576d54 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -287,12 +287,7 @@
 
 
 // Set info text
-if ( GN.p_realCapacityAvailable ) {
-	v_clickedObjectText = GN.p_nodeType + "-station, " + Integer.toString( ((int)GN.p_capacity_kW) ) + " kW, ID: " + GN.p_gridNodeID + ", aansluitingen: " + GN.f_getConnectedGridConnections().size() + ", Type station: " + GN.p_description;
-}
-else {
-	v_clickedObjectText =  GN.p_nodeType + "-station, " + Integer.toString( ((int)GN.p_capacity_kW) ) + " kW (ingeschat), ID: " + GN.p_gridNodeID + ", aansluitingen: " + GN.f_getConnectedGridConnections().size() + ", Type station: " + GN.p_description;
-}
+f_setSelectedGNText();
 
 // Color the GridNode
 GN.gisRegion.setFillColor( v_selectionColor );
@@ -380,9 +375,6 @@ else if(b.p_annotation != null){
 //Set the button for going to the company UI (needs to be at the end of this function!)
 f_setUIButton();
 
-//alle panden met meerdere adressen hebben op dit moment (16-7-24) dezelfde functie(s) voor ieder adres, dus dit is op dit moment zinloos
-//f_listFunctions();
-
 /*ALCODEEND*/}
 
 double f_deselectPreviousSelect()
@@ -2018,14 +2010,22 @@ Pair<ShapeEmbeddedObjectPresentation, Point> f_getPresentationPositionIteration(
 }
 /*ALCODEEND*/}
 
-double f_setTrafoText()
+double f_setSelectedGNText()
 {/*ALCODESTART::1750261221085*/
-if ( v_clickedGridNode.p_realCapacityAvailable ) {
-	v_clickedObjectText = v_clickedGridNode.p_nodeType + "-station, " + Integer.toString( ((int)v_clickedGridNode.p_capacity_kW) ) + " kW, ID: " + v_clickedGridNode.p_gridNodeID + ", aansluitingen: " + v_clickedGridNode.f_getConnectedGridConnections().size() + ", Type station: " + v_clickedGridNode.p_description;
-}
-else {
-	v_clickedObjectText =  v_clickedGridNode.p_nodeType + "-station, " + Integer.toString( ((int)v_clickedGridNode.p_capacity_kW) ) + " kW (ingeschat), ID: " + v_clickedGridNode.p_gridNodeID + ", aansluitingen: " + v_clickedGridNode.f_getConnectedGridConnections().size() + ", Type station: " + v_clickedGridNode.p_description;
+String GNCapacityUnitString = " kW"; 
+if ( !v_clickedGridNode.p_realCapacityAvailable ) {
+	GNCapacityUnitString += " (ingeschat)";
 }
+
+//Get total connected gcs
+int totalConnectedGCs = findAll(v_clickedGridNode.f_getAllLowerLVLConnectedGridConnections(), gc -> gc.f_isActive()).size();
+
+v_clickedObjectText =  v_clickedGridNode.p_nodeType + "-station, " + 
+					   roundToInt(v_clickedGridNode.p_capacity_kW) + GNCapacityUnitString +
+					   ", ID: " + v_clickedGridNode.p_gridNodeID + 
+					   ", aansluitingen: " + totalConnectedGCs + 
+					   ", Type station: " + v_clickedGridNode.p_description;
+
 /*ALCODEEND*/}
 
 double f_setSpecialGISObjectLegendItem(OL_GISObjectType activeSpecialGISObjectType,ShapeText legendText,ShapeRectangle legendRect)
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index 35e242b..6194302 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -1418,7 +1418,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1750261221085</Id>
-		<Name><![CDATA[f_setTrafoText]]></Name>
+		<Name><![CDATA[f_setSelectedGNText]]></Name>
 		<X>60</X>
 		<Y>1520</Y>
 		<Label>
diff --git a/_alp/Agents/Zero_Interface/Levels/Level.level.xml b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
index fbe342e..ca98c4b 100644
--- a/_alp/Agents/Zero_Interface/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
@@ -1796,28 +1796,6 @@ v_selectedGridConnectionIndex &gt; 0 ?
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<EmbeddedObjectPresentation>
-		<Id>1722252542596</Id>
-		<Name><![CDATA[uI_Tabs_presentation]]></Name>
-		<X>0</X>
-		<Y>0</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<ScaleType>AUTOMATICALLY_CALCULATED</ScaleType>
-		<GISScaleForRealEmbeddedObjectPresentationSize>1000</GISScaleForRealEmbeddedObjectPresentationSize>
-		<GISScaleForFixedEmbeddedObjectPresentationSize>1000000000</GISScaleForFixedEmbeddedObjectPresentationSize>
-		<Latitude>52.51902183517265</Latitude>
-		<Longitude>6.169494834925871</Longitude>
-	</EmbeddedObjectPresentation>
 	<Rectangle>
 		<Id>1724419174775</Id>
 		<Name><![CDATA[rect_scenarioText]]></Name>
@@ -8351,4 +8329,26 @@ else{
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<EmbeddedObjectPresentation>
+		<Id>1722252542596</Id>
+		<Name><![CDATA[uI_Tabs_presentation]]></Name>
+		<X>0</X>
+		<Y>0</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<ScaleType>AUTOMATICALLY_CALCULATED</ScaleType>
+		<GISScaleForRealEmbeddedObjectPresentationSize>1000</GISScaleForRealEmbeddedObjectPresentationSize>
+		<GISScaleForFixedEmbeddedObjectPresentationSize>1000000000</GISScaleForFixedEmbeddedObjectPresentationSize>
+		<Latitude>52.51902183517265</Latitude>
+		<Longitude>6.169494834925871</Longitude>
+	</EmbeddedObjectPresentation>
 </Presentation>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 0f87b26..02f251c 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -517,8 +517,13 @@ else if(RegionCoords.startsWith("LineString")){
 	H2Electrolyser.f_setExternalAssetManagement(electrolyserManagement);
 	
 	//Create EA for the electrolyser GC
-	J_EAConversionElectrolyser h2ElectrolyserEA = new J_EAConversionElectrolyser(H2Electrolyser, dataElectrolyser.capacity_electric_kw(), dataElectrolyser.conversion_efficiency(), energyModel.p_timeParameters, OL_ElectrolyserState.STANDBY, dataElectrolyser.idle_consumption_power_ratio(), dataElectrolyser.min_production_ratio(), dataElectrolyser.load_change_time_h(), dataElectrolyser.start_up_time_shutdown_h(), dataElectrolyser.start_up_time_standby_h(), dataElectrolyser.start_up_time_idle_h());
+	if(dataElectrolyser.detailedElectrolyserModel()){
+		new J_EAConversionElectrolyser(H2Electrolyser, dataElectrolyser.capacity_electric_kw(), dataElectrolyser.conversion_efficiency(), energyModel.p_timeParameters, OL_ElectrolyserState.STANDBY, dataElectrolyser.idle_consumption_power_ratio(), dataElectrolyser.min_production_ratio(), dataElectrolyser.load_change_time_h(), dataElectrolyser.start_up_time_shutdown_h(), dataElectrolyser.start_up_time_standby_h(), dataElectrolyser.start_up_time_idle_h());
+	}
+	else{
+		new J_EAConversionElectrolyser(H2Electrolyser, dataElectrolyser.capacity_electric_kw(), dataElectrolyser.conversion_efficiency(), energyModel.p_timeParameters);
 	
+	}
 	//Set owner
 	ConnectionOwner owner;
 	if (!existing_actors.contains(H2Electrolyser.p_ownerID)){ // check if owner exists already, if not, create new owner.
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index e58296b..09813cb 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -325,7 +325,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1754926103685</Id>
@@ -357,7 +357,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1754926103689</Id>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 5013f6c..8bc988f 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -2899,7 +2899,7 @@ f_setWindTurbines( sl_largeScaleWind_MW_Residential.getValue() - p_currentWindTu
 					<Enabled>true</Enabled>
 					<ActionCode>zero_Interface.v_clickedGridNode.p_capacity_kW += sl_trafoReinforcement.getValue();
 
-zero_Interface.f_setTrafoText();</ActionCode>
+zero_Interface.f_setSelectedGNText();</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="11" Style="0"/>
@@ -2956,7 +2956,7 @@ zero_Interface.f_setTrafoText();</ActionCode>
 for (GridNode GN : zero_Interface.energyModel.f_getGridNodesTopLevel() ){
 	GN.p_capacity_kW = GN.p_originalCapacity_kW;
 } 
-zero_Interface.f_setTrafoText();
+zero_Interface.f_setSelectedGNText();
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
diff --git a/_alp/Classes/Class.Electrolyser_data.java b/_alp/Classes/Class.Electrolyser_data.java
index dba7f5b..425dc43 100644
--- a/_alp/Classes/Class.Electrolyser_data.java
+++ b/_alp/Classes/Class.Electrolyser_data.java
@@ -22,6 +22,7 @@ public class Electrolyser_data {
 		Double contracted_feed_in_capacity_kw;
 		OL_ElectrolyserOperationMode default_operation_mode;
 		double conversion_efficiency;
+		boolean detailedElectrolyserModel;
 		Double min_production_ratio;
 		Double idle_consumption_power_ratio;
 		Double start_up_time_shutdown_h;

From e846a6bc3c56a069cc3b65db328567c9e43ee30a Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Thu, 7 May 2026 17:06:43 +0200
Subject: [PATCH 2/5] visibility changes

---
 Zero_Interface-Loader.alpx                    | 2 +-
 _alp/Agents/Zero_Interface/Code/Functions.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index 34d638c..c1ca03e 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AnyLogicWorkspace splitVersion="1"
                    WorkspaceVersion="1.9"
-                   AnyLogicVersion="8.9.7.202512010504"
+                   AnyLogicVersion="8.9.7.202512121156"
                    AlpVersion="8.9.7">
 	<Model>
 		<Id>1658477103134</Id>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index 6194302..fc67cf6 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -2537,7 +2537,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1763657360843</Id>

From 45c72e27d4727d415a036960e9256e204849b69a Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Fri, 8 May 2026 17:07:29 +0200
Subject: [PATCH 3/5] bugfixes and added diesel gen option to gis object type

---
 .../Agents/Zero_Interface/Code/Functions.java | 12 ++++-
 _alp/Agents/Zero_Interface/Variables.xml      | 44 +++++++++++++++++++
 _alp/Agents/Zero_Loader/Code/Functions.java   |  9 ----
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 5c36234..9f1920e 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -2064,6 +2064,11 @@ Pair<ShapeEmbeddedObjectPresentation, Point> f_getPresentationPositionIteration(
 		legendRect.setFillColor(v_electrolyserColor);
 		legendRect.setLineColor(v_electrolyserLineColor);
 		break;
+	case DIESEL_GEN:
+		legendText.setText("Diesel Generator");
+		legendRect.setFillColor(v_dieselGeneratorColor);
+		legendRect.setLineColor(v_dieselGeneratorLineColor);
+		break;
 }
 /*ALCODEEND*/}
 
@@ -2838,8 +2843,11 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
 	
 	//After rapid run: remove loading screen
 	f_removeAllSimulateYearScreens();
-
-	if (c_selectedGridConnections.size() == 0){//Update main area collection
+	
+	if(v_clickedGridNode != null){
+		uI_Results.f_updateUIresultsGridNode(v_clickedGridNode);
+	}
+	else if (c_selectedGridConnections.size() == 0){//Update main area collection
 		uI_Results.f_updateResultsUI(energyModel);
 	}
 	else if (c_selectedGridConnections.size() == 1){//Update selected GC area collection
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index c65c240..23551d4 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -2117,6 +2117,50 @@
 			<Type><![CDATA[GIS_Object]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1778245388940</Id>
+		<Name><![CDATA[v_dieselGeneratorColor]]></Name>
+		<X>690</X>
+		<Y>1840</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[Color]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[black]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1778245388942</Id>
+		<Name><![CDATA[v_dieselGeneratorLineColor]]></Name>
+		<X>690</X>
+		<Y>1860</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[Color]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[darkGray]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1715858732720</Id>
 		<Name><![CDATA[energyModel]]></Name>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index d078add..e51980d 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -311,7 +311,6 @@ else if(RegionCoords.startsWith("LineString")){
 			owner = energyModel.add_pop_connectionOwners();
 			
 			owner.set_p_actorID( dataSolarfarm.owner_id());
-			owner.set_p_connectionOwnerType( OL_ConnectionOwnerType.SOLARFARM_OP );
 			owner.b_dataSharingAgreed = true;
 			existing_actors.add(owner.p_actorID);
 		}
@@ -429,7 +428,6 @@ else if(RegionCoords.startsWith("LineString")){
 		if (!existing_actors.contains(gridbattery.p_ownerID)){ // check if owner exists already, if not, create new owner.
 			owner = energyModel.add_pop_connectionOwners();
 			owner.set_p_actorID( gridbattery.p_ownerID );
-			owner.set_p_connectionOwnerType( OL_ConnectionOwnerType.BATTERY_OP );
 			owner.b_dataSharingAgreed = true;
 			existing_actors.add(gridbattery.p_ownerID);
 		}
@@ -530,7 +528,6 @@ else if(RegionCoords.startsWith("LineString")){
 		owner = energyModel.add_pop_connectionOwners();
 		
 		owner.set_p_actorID( H2Electrolyser.p_ownerID );
-		owner.set_p_connectionOwnerType( OL_ConnectionOwnerType.ELECTROLYSER_OP );
 		owner.b_dataSharingAgreed = true;
 		existing_actors.add(H2Electrolyser.p_ownerID);
 	}
@@ -611,7 +608,6 @@ else if(RegionCoords.startsWith("LineString")){
 			owner = energyModel.add_pop_connectionOwners();
 			
 			owner.set_p_actorID( windfarm.p_ownerID );
-			owner.set_p_connectionOwnerType( OL_ConnectionOwnerType.WINDFARM_OP );
 			owner.b_dataSharingAgreed = true;
 			existing_actors.add(windfarm.p_ownerID);
 		}
@@ -852,7 +848,6 @@ else if(RegionCoords.startsWith("LineString")){
 		ConnectionOwner COC = energyModel.add_pop_connectionOwners(); // Create Connection owner company
 			
 		COC.p_actorID = genericCompany.address_id();
-		COC.p_connectionOwnerType = OL_ConnectionOwnerType.COMPANY;
 		COC.p_detailedCompany = false;
 		COC.b_dataSharingAgreed = true;
 		
@@ -1059,7 +1054,6 @@ GIS_Object f_createGISObject(String name,double latitude,double longitude,String
 	//Create connection owner
 	ConnectionOwner survey_owner = energyModel.add_pop_connectionOwners();
 	survey_owner.p_actorID = survey.getCompanyName();
-	survey_owner.p_connectionOwnerType = OL_ConnectionOwnerType.COMPANY;
 	survey_owner.p_detailedCompany = true;
 	survey_owner.b_dataSharingAgreed = survey.getDataSharingAgreed();
 	survey_owner.b_dataIsAccessible = f_getAccessOfSurveyGC(survey.getDataSharingAgreed(), survey.getId());
@@ -1680,7 +1674,6 @@ String f_createChargerPolygon(double lat,double lon)
 	//Create and connect ConnectionOwner	
 	ConnectionOwner owner = energyModel.add_pop_connectionOwners();
 	owner.p_actorID = chargingStation.p_ownerID;
-	owner.p_connectionOwnerType = OL_ConnectionOwnerType.CHARGEPOINT_OP;
 	owner.b_dataSharingAgreed = true;
 	chargingStation.p_owner = owner;
 		
@@ -3488,7 +3481,6 @@ else if (houseBuildingData.insulation_label() != null) {
 		
 	//Set parameters for the Actor: ConnectionOwner
 	COH.p_actorID = GCH.p_ownerID;
-	COH.p_connectionOwnerType = OL_ConnectionOwnerType.HOUSEHOLD;
 	COH.p_detailedCompany = false;
 	GCH.p_owner = COH;
 	
@@ -3660,7 +3652,6 @@ else if (randomTrue(0.5) ){ // 25% kans op hele dag aan
 		ConnectionOwner COC = energyModel.add_pop_connectionOwners(); // Create Connection owner company
 			
 		COC.p_actorID = "Parking space connection owner: " + dataParkingSpace.parking_id();
-		COC.p_connectionOwnerType = OL_ConnectionOwnerType.PARKINGSPACE_OP;
 		COC.p_detailedCompany = false;
 		COC.b_dataSharingAgreed = true;
 		

From 83faba9cc053ffd5e36d70b5dd17eca0d6f6bbbd Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 12 May 2026 09:56:18 +0200
Subject: [PATCH 4/5] capex and opex values for hydrogen storage and fuel cell

---
 _alp/Agents/AVGC_data/Variables.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 78388f9..201916b 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -3178,6 +3178,8 @@ OL_GridConnectionInsulationLabel.G, 4.0
     Map.entry(OL_EnergyAssetType.PHOTOTHERMAL, 600.0),
     Map.entry(OL_EnergyAssetType.WINDMILL, 1200.0),
     Map.entry(OL_EnergyAssetType.ELECTROLYSER, 1300.0),
+    Map.entry(OL_EnergyAssetType.HYDROGEN_STORAGE, 15.0),
+    Map.entry(OL_EnergyAssetType.FUEL_CELL, 800.0),
     Map.entry(OL_EnergyAssetType.DIESEL_GENERATOR, 500.0),
     Map.entry(OL_EnergyAssetType.METHANE_GENERATOR, 8.0),
     Map.entry(OL_EnergyAssetType.GAS_BURNER, 9.0),
@@ -3221,6 +3223,8 @@ OL_GridConnectionInsulationLabel.G, 4.0
     Map.entry(OL_EnergyAssetType.PHOTOTHERMAL, 25.0),
     Map.entry(OL_EnergyAssetType.WINDMILL, 25.0),
     Map.entry(OL_EnergyAssetType.ELECTROLYSER, 20.0),
+    Map.entry(OL_EnergyAssetType.HYDROGEN_STORAGE, 20.0),
+    Map.entry(OL_EnergyAssetType.FUEL_CELL, 20.0),
     Map.entry(OL_EnergyAssetType.DIESEL_GENERATOR, 25.0),
     Map.entry(OL_EnergyAssetType.METHANE_GENERATOR, 25.0),
     Map.entry(OL_EnergyAssetType.GAS_BURNER, 30.0),
@@ -3264,6 +3268,8 @@ OL_GridConnectionInsulationLabel.G, 4.0
     Map.entry(OL_EnergyAssetType.PHOTOTHERMAL, 15.0),
     Map.entry(OL_EnergyAssetType.WINDMILL, 25.0),
     Map.entry(OL_EnergyAssetType.ELECTROLYSER, 35.0),
+    Map.entry(OL_EnergyAssetType.HYDROGEN_STORAGE, 0.15),
+    Map.entry(OL_EnergyAssetType.FUEL_CELL, 24.0),
     Map.entry(OL_EnergyAssetType.DIESEL_GENERATOR, 15.0),
     Map.entry(OL_EnergyAssetType.METHANE_GENERATOR, 30.0),
     Map.entry(OL_EnergyAssetType.GAS_BURNER, 3.0),
@@ -3697,6 +3703,8 @@ Definition: In the Netherlands each year every GridConnection that is considered
     Map.entry(OL_EnergyAssetType.PHOTOTHERMAL, 0.0),
     Map.entry(OL_EnergyAssetType.WINDMILL, 0.0),
     Map.entry(OL_EnergyAssetType.ELECTROLYSER, 0.0),
+    Map.entry(OL_EnergyAssetType.HYDROGEN_STORAGE, 0.0),
+    Map.entry(OL_EnergyAssetType.FUEL_CELL, 0.0),
     Map.entry(OL_EnergyAssetType.DIESEL_GENERATOR, 0.0),
     Map.entry(OL_EnergyAssetType.METHANE_GENERATOR, 0.0),
     Map.entry(OL_EnergyAssetType.GAS_BURNER, 0.0),
@@ -3740,6 +3748,8 @@ Definition: In the Netherlands each year every GridConnection that is considered
     Map.entry(OL_EnergyAssetType.PHOTOTHERMAL, 0.0),
     Map.entry(OL_EnergyAssetType.WINDMILL, 0.0),
     Map.entry(OL_EnergyAssetType.ELECTROLYSER, 0.0),
+    Map.entry(OL_EnergyAssetType.HYDROGEN_STORAGE, 0.0),
+    Map.entry(OL_EnergyAssetType.FUEL_CELL, 0.0),
     Map.entry(OL_EnergyAssetType.DIESEL_GENERATOR, 0.0),
     Map.entry(OL_EnergyAssetType.METHANE_GENERATOR, 0.0),
     Map.entry(OL_EnergyAssetType.GAS_BURNER, 0.0),

From c774c5804000b4d5d383403a622f0e51973a6bc3 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 12 May 2026 16:54:52 +0200
Subject: [PATCH 5/5] Update Functions.java

---
 _alp/Agents/Zero_Interface/Code/Functions.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 9f1920e..bceaf9d 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -2501,6 +2501,12 @@ public void action() {
 
 double f_setMapOverlay_ElectricityConsumption()
 {/*ALCODESTART::1753097345978*/
+if(energyModel.v_rapidRunData == null || !b_resultsUpToDate){
+	f_setErrorScreen("Dit overzicht wordt pas beschikbaar na het uitvoeren van een jaarsimulatie. In plaats daarvan is de standaard kaart geselecteerd.", 0, 0);
+	rb_mapOverlay.setValue(c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.DEFAULT),true);
+	return;			
+}
+
 //Set legend
 b_updateLiveCongestionColors = true;
 gr_mapOverlayLegend_ElectricityConsumption.setVisible(true);
@@ -2564,7 +2570,7 @@ public void action() {
 
 double f_setMapOverlay_Congestion()
 {/*ALCODESTART::1753097518541*/
-if(energyModel.v_rapidRunData == null){
+if(energyModel.v_rapidRunData == null || !b_resultsUpToDate){
 	f_setErrorScreen("Dit overzicht wordt pas beschikbaar na het uitvoeren van een jaarsimulatie. In plaats daarvan is de standaard kaart geselecteerd.", 0, 0);
 	rb_mapOverlay.setValue(c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.DEFAULT),true);
 	return;