diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 0fee2ff..42027ee 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -349,6 +349,14 @@
1749651086661
+
+
1659525715752
@@ -1029,6 +1037,14 @@
1769617059977
+
+
1762354709855
diff --git a/_alp/Agents/GCUtility/Code/Functions.java b/_alp/Agents/GCUtility/Code/Functions.java
index cb4d386..c2a1b25 100644
--- a/_alp/Agents/GCUtility/Code/Functions.java
+++ b/_alp/Agents/GCUtility/Code/Functions.java
@@ -5,13 +5,6 @@
f_manageEVCharging(timeVariables);
f_manageBattery(timeVariables);
-
-/*
-// Disabled the fuelcell call, the specific asset has been removed. If there is need for it again, please use the generic conversion asset.
-if (v_enableFuelCell) {
- f_manageFuelCell();
-}
-*/
/*ALCODEEND*/}
double f_manageFuelCell()
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index cd685dd..e73f4ad 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -397,7 +397,7 @@
-
+
VOID
double
1722512642645
diff --git a/_alp/Classes/Class.J_EAConversion.java b/_alp/Classes/Class.J_EAConversion.java
index 09308cf..ce4c630 100644
--- a/_alp/Classes/Class.J_EAConversion.java
+++ b/_alp/Classes/Class.J_EAConversion.java
@@ -10,26 +10,36 @@ public class J_EAConversion extends zero_engine.J_EAFlex implements Serializable
/**
* Default constructor
*/
- public J_EAConversion() {
+ public J_EAConversion() {
+ }
+
+ /**
+ * Constructor initializing the fields, and setting assetFlowCatagory (Assetflowcatagory is filled with OUTPUT product of the conversion!)
+ */
+ public J_EAConversion(I_AssetOwner owner, OL_EnergyAssetType energyAssetType, double outputCapacity_kW, double efficiency_r, OL_EnergyCarriers energyCarrierProduced, OL_EnergyCarriers energyCarrierConsumed, OL_AssetFlowCategories assetFlowCatagory, J_TimeParameters timeParameters) {
+ this.assetFlowCategory = assetFlowCatagory;
+ construct(owner, energyAssetType, outputCapacity_kW, efficiency_r, energyCarrierProduced, energyCarrierConsumed, timeParameters);
}
/**
* Constructor initializing the fields
*/
-
public J_EAConversion(I_AssetOwner owner, OL_EnergyAssetType energyAssetType, double outputCapacity_kW, double efficiency_r, OL_EnergyCarriers energyCarrierProduced, OL_EnergyCarriers energyCarrierConsumed, J_TimeParameters timeParameters) {
- this.setOwner(owner);
- this.timeParameters = timeParameters;
- this.energyAssetType = energyAssetType;
- this.outputCapacity_kW = outputCapacity_kW;
- this.eta_r = efficiency_r;
- this.inputCapacity_kW = this.outputCapacity_kW / this.eta_r;
- this.energyCarrierProduced = energyCarrierProduced;
- this.energyCarrierConsumed = energyCarrierConsumed;
- this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);
- this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
- registerEnergyAsset(timeParameters);
+ construct(owner, energyAssetType, outputCapacity_kW, efficiency_r, energyCarrierProduced, energyCarrierConsumed, timeParameters);
}
+ private void construct(I_AssetOwner owner, OL_EnergyAssetType energyAssetType, double outputCapacity_kW, double efficiency_r, OL_EnergyCarriers energyCarrierProduced, OL_EnergyCarriers energyCarrierConsumed, J_TimeParameters timeParameters) {
+ this.setOwner(owner);
+ this.timeParameters = timeParameters;
+ this.energyAssetType = energyAssetType;
+ this.outputCapacity_kW = outputCapacity_kW;
+ this.eta_r = efficiency_r;
+ this.inputCapacity_kW = this.outputCapacity_kW / this.eta_r;
+ this.energyCarrierProduced = energyCarrierProduced;
+ this.energyCarrierConsumed = energyCarrierConsumed;
+ this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);
+ this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
+ registerEnergyAsset(timeParameters);
+ }
@Override
public J_FlowPacket f_updateAllFlows(double powerFraction_fr, J_TimeVariables timeVariables) {
@@ -118,11 +128,4 @@ public String toString() {
+ "with efficiency: " + this.eta_r + ", "
+ "Current output: " + -this.getLastFlows().get(this.energyCarrierProduced) + " kW";
}
-
- /**
- * This number is here for model snapshot storing purpose
- * It needs to be changed when this class gets changed
- */
- private static final long serialVersionUID = 1L;
-
}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EAConversionElectricHeater.java b/_alp/Classes/Class.J_EAConversionElectricHeater.java
index a22b973..a968861 100644
--- a/_alp/Classes/Class.J_EAConversionElectricHeater.java
+++ b/_alp/Classes/Class.J_EAConversionElectricHeater.java
@@ -37,10 +37,4 @@ public void operate(double powerFraction_fr, J_TimeVariables timeVariables) {
public double getCurrentTemperature() {
return outputTemperature_degC;
}
-
- /**
- * This number is here for model snapshot storing purpose
- * It needs to be changed when this class gets changed
- */
- private static final long serialVersionUID = 1L;
}
\ No newline at end of file