diff --git a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
index 678be3fa..5667ec32 100644
--- a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
@@ -4,6 +4,12 @@ public void f_connectToJ_EA(J_EA j_ea){
f_connectTo_J_EA_House(j_ea);
}
+@Override
+public void f_removeTheJ_EA(J_EA j_ea){
+ f_removeTheJ_EA_default(j_ea);
+ f_removeTheJ_EA_house(j_ea);
+}
+
/*@Override
public void f_operateFixedConsumptionAssets(){
f_operateFixedConsumptionAssets_overwrite();
diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java
index e149f2b5..5fbb3b06 100644
--- a/_alp/Agents/GCHouse/Code/Functions.java
+++ b/_alp/Agents/GCHouse/Code/Functions.java
@@ -933,3 +933,10 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
}
/*ALCODEEND*/}
+double f_removeTheJ_EA_house(J_EA j_ea)
+{/*ALCODESTART::1749722407831*/
+if (j_ea instanceof J_EAEV) {
+ p_householdEV = null;
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GCHouse/Code/Functions.xml b/_alp/Agents/GCHouse/Code/Functions.xml
index 87c3e755..9e9c824c 100644
--- a/_alp/Agents/GCHouse/Code/Functions.xml
+++ b/_alp/Agents/GCHouse/Code/Functions.xml
@@ -240,8 +240,8 @@
double
1693300820997
- 1070
- 130
+ 1140
+ 90
+
+ VOID
+ double
+ 1749722407831
+
+ 1140
+ 110
+
+ false
+ true
+ true
+
+
+
+
+
+
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index 65ffc109..0d9cc437 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -384,7 +384,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
- v_hasPV = true;
+ v_liveAssetsMetaData.hasPV = true;
v_liveAssetsMetaData.totalInstalledPVPower_kW += ((J_EAProduction)j_ea).getCapacityElectric_kW();
if ( p_parentNodeElectric != null ) {
p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, ((J_EAProduction)j_ea).getCapacityElectric_kW(), true);
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 6e6e956c..1a6db546 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -1167,7 +1167,7 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
- v_hasPV = true;
+ v_liveAssetsMetaData.hasPV = true;
double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
if ( p_parentNodeElectric != null ) {
@@ -1531,7 +1531,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
J_EAProduction otherPV = findFirst(c_productionAssets, x -> x.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC);
if (otherPV == null) {
- v_hasPV = false;
+ v_liveAssetsMetaData.hasPV = false;
}
double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 6a5c4c3c..ac7ec367 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -849,25 +849,6 @@
-
- 1692972667627
-
- 270
- 300
-
- false
- true
- true
-
-
-
-
1695824940090
diff --git a/_alp/Classes/Class.J_EAConsumption.java b/_alp/Classes/Class.J_EAConsumption.java
index 985ca830..0720dfb5 100644
--- a/_alp/Classes/Class.J_EAConsumption.java
+++ b/_alp/Classes/Class.J_EAConsumption.java
@@ -104,6 +104,10 @@ public Pair curtailElectricityConsumption(double curtailment
return new Pair(flowsMap, this.energyUse_kW);
}
+ public J_ProfilePointer getProfilePointer() {
+ return this.profilePointer;
+ }
+
@Override
public String toString() {
return