Refactor diesel to petroleum fuel

Zero_engine.alpx

@@ -71,7 +71,7 @@
 				</Option>
 				<Option>
 					<Id>1668600528877</Id>
-					<Name><![CDATA[DIESEL]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
@@ -291,7 +291,7 @@
 				</Option>
 				<Option>
 					<Id>1685008578606</Id>
-					<Name><![CDATA[DIESEL_DEMAND]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_DEMAND]]></Name>
 				</Option>
 				<Option>
 					<Id>1685030175392</Id>
@@ -303,15 +303,15 @@
 				</Option>
 				<Option>
 					<Id>1668602156278</Id>
-					<Name><![CDATA[DIESEL_VEHICLE]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_VEHICLE]]></Name>
 				</Option>
 				<Option>
 					<Id>1700138621293</Id>
-					<Name><![CDATA[DIESEL_VAN]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_VAN]]></Name>
 				</Option>
 				<Option>
 					<Id>1699367407696</Id>
-					<Name><![CDATA[DIESEL_TRUCK]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_TRUCK]]></Name>
 				</Option>
 				<Option>
 					<Id>1660202624229</Id>
@@ -535,7 +535,7 @@
 				</Option>
 				<Option>
 					<Id>1679503416680</Id>
-					<Name><![CDATA[DIESEL_FIXED]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_FIXED]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
@@ -912,11 +912,11 @@
 				</Option>
 				<Option>
 					<Id>1729599301974</Id>
-					<Name><![CDATA[DIESEL_PRODUCTION_KW]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_PRODUCTION_KW]]></Name>
 				</Option>
 				<Option>
 					<Id>1729161184713</Id>
-					<Name><![CDATA[DIESEL_CONSUMPTION_KW]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_CONSUMPTION_KW]]></Name>
 				</Option>
 				<Option>
 					<Id>1729161184714</Id>
@@ -1438,7 +1438,7 @@
 			</JavaClass>
 			<JavaClass>
 				<Id>1711009967838</Id>
-				<Name><![CDATA[J_EADieselVehicle]]></Name>
+				<Name><![CDATA[J_EAPetroleumFuelVehicle]]></Name>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
 			<JavaClass>
@@ -1493,7 +1493,7 @@
 			</JavaClass>
 			<JavaClass>
 				<Id>1737633433233</Id>
-				<Name><![CDATA[J_EADieselTractor]]></Name>
+				<Name><![CDATA[J_EAPetroleumFuelTractor]]></Name>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
 			<JavaClass>

_alp/Agents/ConnectionOwner/Code/Functions.java

@@ -81,7 +81,7 @@
 
 double f_updateFinances()
 {/*ALCODESTART::1660742520265*/
-//TODO: Diesel costs still missing!! [GH 21/11/2022] -> Won't be in anylogic model, but in postprocessing.
+//TODO: PetroleumFuel costs still missing!! [GH 21/11/2022] -> Won't be in anylogic model, but in postprocessing.
 
 // get current energy flows
 f_gatherEnergyFlows();
@@ -168,7 +168,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 	v_balanceHeat_eur -= transactionCost_eur;
 }
 
-v_balanceDiesel_eur += v_dieselVolume_kWh * .196; // TODO: UGLY HACK
+v_balancePetroleumFuel_eur += v_petroleumFuelVolume_kWh * .196; // TODO: UGLY HACK
 */
 /*ALCODEEND*/}
 
@@ -179,7 +179,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 v_heatVolume_kWh = 0;
 v_methaneVolume_kWh = 0;
 v_hydrogenVolume_kWh = 0;
-v_dieselVolume_kWh = 0;
+v_petroleumFuelVolume_kWh = 0;
 
 
 // gather electricity flows, convert to volume-per-timestep to facilitate financial transactions
@@ -188,14 +188,14 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 	v_heatVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)) * energyModel.p_timeStep_h;
 	v_methaneVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.METHANE) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.METHANE)) * energyModel.p_timeStep_h;
 	v_hydrogenVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HYDROGEN) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.HYDROGEN)) * energyModel.p_timeStep_h;
-	v_dieselVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.DIESEL) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.DIESEL)) * energyModel.p_timeStep_h;
+	v_petroleumFuelVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL)) * energyModel.p_timeStep_h;
 }
 
 v_totalElectricityUsed_kWh += v_electricityVolume_kWh;
 v_totalHeatUsed_kWh += v_heatVolume_kWh;
 v_totalMethaneUsed_kWh += v_methaneVolume_kWh;
 v_totalHydrogenUsed_kWh += v_hydrogenVolume_kWh;
-v_totalDieselUsed_kWh += v_dieselVolume_kWh;
+v_totalPetroleumFuelUsed_kWh += v_petroleumFuelVolume_kWh;
 /*ALCODEEND*/}
 
 double f_updateIncentives()
@@ -719,7 +719,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 double f_resetStates()
 {/*ALCODESTART::1704371830113*/
 // Reset energytotals
-//v_totalElectricityUsed_kWh = v_totalHeatUsed_kWh = v_totalMethaneUsed_kWh = v_totalHydrogenUsed_kWh = v_totalDieselUsed_kWh = 0;
+//v_totalElectricityUsed_kWh = v_totalHeatUsed_kWh = v_totalMethaneUsed_kWh = v_totalHydrogenUsed_kWh = v_totalPetroleumFuelUsed_kWh = 0;
 // Reset finances
 //v_balanceElectricity_eur = v_balanceElectricityDelivery_eur = v_balanceElectricityTransport_eur = v_balanceElectricityTax_eur = 0;
 

_alp/Agents/ConnectionOwner/Variables.xml

@@ -481,7 +481,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024165241</Id>
-		<Name><![CDATA[v_dieselVolume_kWh]]></Name>
+		<Name><![CDATA[v_petroleumFuelVolume_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>740</X>
 		<Y>770</Y>
@@ -504,7 +504,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024172107</Id>
-		<Name><![CDATA[v_balanceDiesel_eur]]></Name>
+		<Name><![CDATA[v_balancePetroleumFuel_eur]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-240</X>
 		<Y>750</Y>
@@ -870,7 +870,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1676900973470</Id>
-		<Name><![CDATA[v_totalDieselUsed_kWh]]></Name>
+		<Name><![CDATA[v_totalPetroleumFuelUsed_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>550</X>
 		<Y>770</Y>

_alp/Agents/EnergyCoop/Code/Functions.java

@@ -335,7 +335,7 @@
 
 //Total selfconsumption, selfsufficiency
 double totalSelfConsumption_fr = 1 - (v_electricityExported_kWh + v_methaneExported_kWh + v_hydrogenExported_kWh + v_heatExported_kWh)/energyProduced_kWh;
-double totalSelfSufficiency_fr = 1 - (v_electricityImported_kWh + v_methaneImported_kWh + v_hydrogenImported_kWh + v_heatImported_kWh + v_dieselImported_kWh)/energyConsumed_kWh;
+double totalSelfSufficiency_fr = 1 - (v_electricityImported_kWh + v_methaneImported_kWh + v_hydrogenImported_kWh + v_heatImported_kWh + v_petroleumFuelImported_kWh)/energyConsumed_kWh;
 
 double totalSelfSufficiency_fr_check = (energyProduced_kWh - (v_electricityExported_kWh + v_methaneExported_kWh + v_hydrogenExported_kWh + v_heatExported_kWh))/energyConsumed_kWh;
 traceln("Coop selfconsumption: " + totalSelfConsumption_fr + "%");
@@ -859,14 +859,14 @@
 double v_currentPowerElectricity_kW = - v_electricitySurplus_kW;
 double v_currentPowerMethane_kW = v_methaneVolume_kWh / energyModel.p_timeStep_h;
 double v_currentPowerHydrogen_kW = v_hydrogenVolume_kWh / energyModel.p_timeStep_h;
-double v_currentPowerDiesel_kW = v_dieselVolume_kWh / energyModel.p_timeStep_h;
+double v_currentPowerPetroleumFuel_kW = v_petroleumFuelVolume_kWh / energyModel.p_timeStep_h;
 double v_currentPowerHeat_kW = v_heatVolume_kWh / energyModel.p_timeStep_h;
 
-//double currentImport_kW = (max(0,v_currentPowerElectricity_kW) + max(0,v_currentPowerHeat_kW) + max(0,v_currentPowerMethane_kW) + max(0,v_currentPowerHydrogen_kW) + max(0,v_currentPowerDiesel_kW));
-//double currentExport_kW = (max(0,-v_currentPowerElectricity_kW) + max(0,-v_currentPowerHeat_kW) + max(0,-v_currentPowerMethane_kW) + max(0,-v_currentPowerHydrogen_kW) + max(0,-v_currentPowerDiesel_kW));
+//double currentImport_kW = (max(0,v_currentPowerElectricity_kW) + max(0,v_currentPowerHeat_kW) + max(0,v_currentPowerMethane_kW) + max(0,v_currentPowerHydrogen_kW) + max(0,v_currentPowerPetroleumFuel_kW));
+//double currentExport_kW = (max(0,-v_currentPowerElectricity_kW) + max(0,-v_currentPowerHeat_kW) + max(0,-v_currentPowerMethane_kW) + max(0,-v_currentPowerHydrogen_kW) + max(0,-v_currentPowerPetroleumFuel_kW));
 
-double currentImport_MWh = (max(0,v_electricityVolume_kWh) + max(0,v_heatVolume_kWh) + max(0,v_methaneVolume_kWh) + max(0,v_hydrogenVolume_kWh) + max(0,v_dieselVolume_kWh))/1000;
-double currentExport_MWh = (max(0,-v_electricityVolume_kWh) + max(0,-v_heatVolume_kWh) + max(0,-v_methaneVolume_kWh) + max(0,-v_hydrogenVolume_kWh) + max(0,-v_dieselVolume_kWh))/1000;
+double currentImport_MWh = (max(0,v_electricityVolume_kWh) + max(0,v_heatVolume_kWh) + max(0,v_methaneVolume_kWh) + max(0,v_hydrogenVolume_kWh) + max(0,v_petroleumFuelVolume_kWh))/1000;
+double currentExport_MWh = (max(0,-v_electricityVolume_kWh) + max(0,-v_heatVolume_kWh) + max(0,-v_methaneVolume_kWh) + max(0,-v_hydrogenVolume_kWh) + max(0,-v_petroleumFuelVolume_kWh))/1000;
 double currentImport_kW = currentImport_MWh * 1000 / energyModel.p_timeStep_h;
 double currentExport_kW = currentExport_MWh * 1000 / energyModel.p_timeStep_h;
 //traceln("ElectricityVolume_kWh: %s kWh, current production: %s kW", v_electricityVolume_kWh, v_currentOwnElectricityProduction_kW);	
@@ -883,15 +883,15 @@
 
 acc_annualMethaneBalance_kW.addStep( v_methaneVolume_kWh/energyModel.p_timeStep_h);
 acc_annualHydrogenBalance_kW.addStep( v_hydrogenVolume_kWh/energyModel.p_timeStep_h);
-acc_annualDieselBalance_kW.addStep( v_dieselVolume_kWh/energyModel.p_timeStep_h);
+acc_annualPetroleumFuelBalance_kW.addStep( v_petroleumFuelVolume_kWh/energyModel.p_timeStep_h);
 
 // Demand
 v_dailyBaseloadElectricityDemand_kW += v_fixedConsumptionElectric_kW;
 v_dailyHeatPumpElectricityDemand_kW += v_heatPumpElectricityConsumption_kW;
 v_dailyElectricVehicleDemand_kW += max(0,v_evChargingPowerElectric_kW);
 v_dailyBatteriesDemand_kW += max(0,v_batteryPowerElectric_kW);
 v_dailyNaturalGasDemand_kW += max(0, v_currentPowerMethane_kW);
-v_dailyDieselDemand_kW += max(0, v_currentPowerDiesel_kW);
+v_dailyPetroleumFuelDemand_kW += max(0, v_currentPowerPetroleumFuel_kW);
 v_dailyHydrogenDemand_kW += max(0, v_currentPowerHydrogen_kW);
 //v_dailyDistrictHeatDemand_kWh += 
 // Supply
@@ -913,7 +913,7 @@
 	data_annualElectricVehicleDemand_kW.add(energyModel.t_h, v_dailyElectricVehicleDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualBatteriesDemand_kW.add(energyModel.t_h, v_dailyBatteriesDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualNaturalGasDemand_kW.add(energyModel.t_h, v_dailyNaturalGasDemand_kW/(24 / energyModel.p_timeStep_h));
-	data_annualDieselDemand_kW.add(energyModel.t_h, v_dailyDieselDemand_kW/(24 / energyModel.p_timeStep_h));
+	data_annualPetroleumFuelDemand_kW.add(energyModel.t_h, v_dailyPetroleumFuelDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualHydrogenDemand_kW.add(energyModel.t_h, v_dailyHydrogenDemand_kW/(24 / energyModel.p_timeStep_h));
 	//data_annualDistrictHeatSupply_MWh.add(energyModel.t_h, v_dailyDistrictHeatDemand_kWh/(24 / energyModel.p_timeStep_h));
 	// Supply
@@ -933,7 +933,7 @@
 	v_dailyElectricVehicleDemand_kW = 0;
 	v_dailyBatteriesDemand_kW = 0;
 	v_dailyNaturalGasDemand_kW = 0;
-	v_dailyDieselDemand_kW = 0;
+	v_dailyPetroleumFuelDemand_kW = 0;
 	v_dailyHydrogenDemand_kW = 0;
 	//v_dailyDistrictHeatDemand_kWh = 0;
 	v_dailyPVGeneration_kW = 0;
@@ -953,7 +953,7 @@
 	data_summerWeekElectricVehicleDemand_kW.add(energyModel.t_h, max(0,v_evChargingPowerElectric_kW));
 	data_summerWeekBatteriesDemand_kW.add(energyModel.t_h, max(0,v_batteryPowerElectric_kW));
 	data_summerWeekNaturalGasDemand_kW.add(energyModel.t_h, max(0, v_currentPowerMethane_kW));
-	data_summerWeekDieselDemand_kW.add(energyModel.t_h, max(0, v_currentPowerDiesel_kW));
+	data_summerWeekPetroleumFuelDemand_kW.add(energyModel.t_h, max(0, v_currentPowerPetroleumFuel_kW));
 	data_summerWeekHydrogenDemand_kW.add(energyModel.t_h, max(0, v_currentPowerHydrogen_kW));
 
 	data_summerWeekPVGeneration_kW.add(energyModel.t_h, v_pvProductionElectric_kW);
@@ -966,7 +966,7 @@
 	acc_summerElectricityBalance_kW.addStep(v_currentPowerElectricity_kW);
 	acc_summerMethaneBalance_kW.addStep(v_currentPowerMethane_kW);
 	acc_summerHydrogenBalance_kW.addStep(v_currentPowerHydrogen_kW);
-	acc_summerDieselBalance_kW.addStep(v_currentPowerDiesel_kW);
+	acc_summerPetroleumFuelBalance_kW.addStep(v_currentPowerPetroleumFuel_kW);
 	acc_summerHeatBalance_kW.addStep(v_currentPowerHeat_kW);
 	acc_summerTotalImport_kW.addStep(currentImport_kW);
 	acc_summerTotalExport_kW.addStep(currentExport_kW);
@@ -987,7 +987,7 @@
 	data_winterWeekElectricVehicleDemand_kW.add(energyModel.t_h, max(0, v_evChargingPowerElectric_kW));
 	data_winterWeekBatteriesDemand_kW.add(energyModel.t_h, max(0, v_batteryPowerElectric_kW));
 	data_winterWeekNaturalGasDemand_kW.add(energyModel.t_h, max(0, v_currentPowerMethane_kW));
-	data_winterWeekDieselDemand_kW.add(energyModel.t_h, max(0, v_currentPowerDiesel_kW));
+	data_winterWeekPetroleumFuelDemand_kW.add(energyModel.t_h, max(0, v_currentPowerPetroleumFuel_kW));
 	data_winterWeekHydrogenDemand_kW.add(energyModel.t_h, max(0, v_currentPowerHydrogen_kW));
 
 	data_winterWeekPVGeneration_kW.add(energyModel.t_h, v_pvProductionElectric_kW);
@@ -1000,7 +1000,7 @@
 	acc_winterElectricityBalance_kW.addStep(v_currentPowerElectricity_kW);
 	acc_winterMethaneBalance_kW.addStep(v_currentPowerMethane_kW);
 	acc_winterHydrogenBalance_kW.addStep(v_currentPowerHydrogen_kW);
-	acc_winterDieselBalance_kW.addStep(v_currentPowerDiesel_kW);
+	acc_winterPetroleumFuelBalance_kW.addStep(v_currentPowerPetroleumFuel_kW);
 	acc_winterHeatBalance_kW.addStep(v_currentPowerHeat_kW);
 	acc_winterTotalImport_kW.addStep(currentImport_kW);
 	acc_winterTotalExport_kW.addStep(currentExport_kW);
@@ -1024,7 +1024,7 @@
 	v_daytimeEnergyProduced_MWh += v_currentEnergyProduction_kW / 1000 * energyModel.p_timeStep_h;
 
 	v_daytimeMethaneImport_MWh += v_currentPowerMethane_kW / 1000 * energyModel.p_timeStep_h;
-	v_daytimeDieselImport_MWh += v_currentPowerDiesel_kW / 1000 * energyModel.p_timeStep_h;
+	v_daytimePetroleumFuelImport_MWh += v_currentPowerPetroleumFuel_kW / 1000 * energyModel.p_timeStep_h;
 	v_daytimeHydrogenImport_MWh += max(0, v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	v_daytimeHydrogenExport_MWh += max(0, -v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 
@@ -1044,7 +1044,7 @@
 	v_weekdayEnergyProduced_MWh += v_currentEnergyProduction_kW * energyModel.p_timeStep_h/1000;
 
 	v_weekdayMethaneImport_MWh += v_currentPowerMethane_kW / 1000 * energyModel.p_timeStep_h;
-	v_weekdayDieselImport_MWh += v_currentPowerDiesel_kW / 1000 * energyModel.p_timeStep_h;
+	v_weekdayPetroleumFuelImport_MWh += v_currentPowerPetroleumFuel_kW / 1000 * energyModel.p_timeStep_h;
 	v_weekdayHydrogenImport_MWh += max(0, v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	v_weekdayHydrogenExport_MWh += max(0, -v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 

_alp/Agents/EnergyCoop/Variables.xml

@@ -323,7 +323,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024099515</Id>
-		<Name><![CDATA[v_dieselVolume_kWh]]></Name>
+		<Name><![CDATA[v_petroleumFuelVolume_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-320</X>
 		<Y>1000</Y>
@@ -346,7 +346,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024644541</Id>
-		<Name><![CDATA[v_balanceDiesel_eur]]></Name>
+		<Name><![CDATA[v_balancePetroleumFuel_eur]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-330</X>
 		<Y>820</Y>

_alp/Agents/EnergyModel/Code/Functions.java

@@ -1019,7 +1019,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	totalElectricitySelfConsumption_fr = 1 - fm_totalExports_MWh.get(OL_EnergyCarriers.ELECTRICITY)/v_totalElectricityProduced_MWh;
 }*/
 
-//v_modelSelfSufficiency_fr = 1 - (v_totalElectricityImport_MWh + max(0,v_totalMethaneImport_MWh - v_totalMethaneExport_MWh) + max(0,v_totalHydrogenImport_MWh - v_totalHydrogenExport_MWh) + v_totalDieselImport_MWh - v_batteryStoredEnergyDeltaSinceStart_MWh - deltaThermalEnergySinceStart_MWh) / v_totalEnergyUsed_MWh;
+//v_modelSelfSufficiency_fr = 1 - (v_totalElectricityImport_MWh + max(0,v_totalMethaneImport_MWh - v_totalMethaneExport_MWh) + max(0,v_totalHydrogenImport_MWh - v_totalHydrogenExport_MWh) + v_totalPetroleumFuelImport_MWh - v_batteryStoredEnergyDeltaSinceStart_MWh - deltaThermalEnergySinceStart_MWh) / v_totalEnergyUsed_MWh;
 v_modelSelfSufficiency_fr = v_totalEnergySelfConsumed_MWh / v_totalEnergyConsumed_MWh; // Calculation based on (total_consumption - total_import) / total_consumption. Positive delta-stored energy is contained in v_totalSelfConsumedEnergy_MWh. 
 //v_modelSelfSufficiency_fr = v_totalSelfConsumedEnergy_MWh / totalEnergyUsed_MWh; // Calculation based on (total_consumption - total_import) / total_consumption. Positive delta-stored energy is contained in v_totalSelfConsumedEnergy_MWh. 
 

_alp/Agents/GCEnergyConversion/Code/Functions.java

@@ -56,7 +56,7 @@
 		v_currentPowerMethane_kW += v.methaneConsumption_kW - v.methaneProduction_kW;
 		v_currentPowerHydrogen_kW += v.hydrogenConsumption_kW - v.hydrogenProduction_kW;
 		v_currentPowerHeat_kW += v.heatConsumption_kW - v.heatProduction_kW;
-		v_currentPowerDiesel_kW += v.dieselConsumption_kW;
+		v_currentPowerPetroleumFuel_kW += v.petroleumFuelConsumption_kW;
 	} */
 }
 

_alp/Agents/GCGridBattery/Code/Functions.java

@@ -80,7 +80,7 @@ else if(EA.j_ea instanceof J_EAStorageElectric && ((J_EAStorageElectric)EA.j_ea)
 v_currentPowerMethane_kW = 0;
 v_currentPowerHydrogen_kW = 0;
 v_currentPowerHeat_kW = 0;
-v_currentPowerDiesel_kW = 0;
+v_currentPowerPetroleumFuel_kW = 0;
 
 v_currentElectricityConsumption_kW = 0;
 v_currentElectricityProduction_kW = 0;

_alp/Agents/GCIndustry/Code/Functions.java

@@ -114,7 +114,7 @@ else if( ea.p_energyAssetType == OL_EnergyAssetType.HEAT_DEMAND ) {
 		//v_currentPowerMethane_kW += v.methaneConsumption_kW - v.methaneProduction_kW;
 		//v_currentPowerHydrogen_kW += v.hydrogenConsumption_kW - v.hydrogenProduction_kW;
 		//v_currentPowerHeat_kW += v.heatConsumption_kW - v.heatProduction_kW;
-		//v_currentPowerDiesel_kW += v.dieselConsumption_kW;
+		//v_currentPowerPetroleumFuel_kW += v.petroleumFuelConsumption_kW;
 	}
 
 	//traceln("Agroenergyhub logic!");