extending serial hybrid tests to S4 configuration, adapt model parameters

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs

@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			ElementExists(XMLNames.Battery_SOCmax) ? GetDouble(XMLNames.Battery_SOCmax) : (double?)null;
 
 		public virtual BatteryType BatteryType => GetString(XMLNames.REESS_BatteryType).ParseEnum<BatteryType>();
-		public virtual AmpereSecond Capacity => GetDouble(XMLNames.REESS_RatedCapacity).SI<AmpereSecond>() * 3600;
+		public virtual AmpereSecond Capacity => GetDouble(XMLNames.REESS_RatedCapacity).SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>();
 		public virtual bool ConnectorsSubsystemsIncluded => GetBool(XMLNames.REESS_ConnectorsSubsystemsIncluded);
 		public virtual bool JunctionboxIncluded => GetBool(XMLNames.REESS_JunctionboxIncluded);
 

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs

@@ -901,7 +901,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 					Voltage = entry.VoltageLevel,
 					ContinuousTorque = entry.ContinuousTorque * count,
 					ContinuousTorqueSpeed = entry.ContinuousTorqueSpeed,
-					OverloadTorque = entry.OverloadTorque ?? 0.SI<NewtonMeter>() * count,
+					OverloadTorque = (entry.OverloadTorque ?? 0.SI<NewtonMeter>()) * count,
 					OverloadTestSpeed = entry.OverloadTestSpeed ?? 0.RPMtoRad(),
 					OverloadTime = entry.OverloadTime,
 					FullLoadCurve = fullLoadCurveCombined,

VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs

@@ -297,6 +297,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					emTorque < 0 ? electricSupplyResponse.MaxPowerDrive : electricSupplyResponse.MaxPowerDrag, electricSupplyResponse.ConsumerPower);
 			}
 
+
+			if (Position == PowertrainPosition.Generator && emOff && !DataBus.EngineCtl.CombustionEngineOn) {
+				emTorqueDt = 0.SI<NewtonMeter>();
+			}
 			var inTorqueDt = outTorque + emTorqueDt;
 
 			IResponse retVal;

VectoCore/VectoCore/Models/SimulationComponent/Strategies/SerialHybridStrategy.cs

@@ -5,6 +5,7 @@ using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
 using TUGraz.VectoCore.Models.Simulation;
@@ -120,8 +121,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			}
 
 			GenSetOperatingPoint genSetOperatingPoint;
-			var emTorque = (-emResponse.TorqueRequest).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
-				emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+			var emTorque = GetMechanicalAllsistPower(absTime, dt, emResponse.TorqueRequest, emResponse, emResponse.AngularVelocity /* potentially not correct! */);
 			switch (CurrentState.SMState) {
 				case StateMachineState.Acc_S0:
 					genSetOperatingPoint = GensetOff;
@@ -130,8 +130,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					tmp.ElectricPower = 0.SI<Watt>();
 					drivetrainDemand = GetDrivetrainPowerDemand(absTime, dt, outTorque, outAngularVelocity, tmp);
 					emResponse = drivetrainDemand.Response.ElectricMotor;
-					emTorque = (-emResponse.TorqueRequest).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
-						emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+					//emTorque = (-emResponse.TorqueRequest).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
+					//	emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+					emTorque = GetMechanicalAllsistPower(absTime, dt, emResponse.TorqueRequest, emResponse, emResponse.AngularVelocity /* potentially not correct! */);
 					break;
 				case StateMachineState.Acc_S1:
 					var optimalPoint = DataBus.ElectricMotorInfo(PowertrainPosition.Generator).DeRatingActive ?
@@ -151,8 +152,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					genSetOperatingPoint = MaxGensetPower(absTime, dt, drivetrainDemand, maxPowerGenset);
 					emTorque = TestPowertrain.ElectricMotor.GetTorqueForElectricPower(
 						DataBus.BatteryInfo.InternalVoltage, drivetrainDemand.Response.ElectricSystem.MaxPowerDrive,
-						drivetrainDemand.Response.ElectricMotor.AngularVelocity, dt).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
-						emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+						drivetrainDemand.Response.ElectricMotor.AngularVelocity, dt);
+					if (emTorque == null) {
+						emTorque = emResponse.MaxDriveTorque;
+					}
+					emTorque = GetMechanicalAllsistPower(absTime, dt, emTorque, emResponse, emResponse.AngularVelocity /* potentially not correct! */);
+					//emTorque = emTorque.LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
+						//emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
 					break;
 				case StateMachineState.Break_S0:
 				case StateMachineState.Break_S1:
@@ -164,13 +170,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					tmpBr.ElectricPower = 0.SI<Watt>();
 					drivetrainDemand = GetDrivetrainPowerDemand(absTime, dt, outTorque, outAngularVelocity, tmpBr);
 					emResponse = drivetrainDemand.Response.ElectricMotor;
-					if (emTorque > 0 && emResponse.MaxRecuperationTorque == null) {
-						// we could recuperate, but max recuperation is null - so battery is full. turn off EM
-						emTorque = null;
-					} else {
-						emTorque = (-emResponse.TorqueRequest).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
-							emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
-					}
+
+					emTorque = GetMechanicalAllsistPower(absTime, dt, emResponse.TorqueRequest, emResponse, emResponse.AngularVelocity);
+					//if (emTorque > 0 && emResponse.MaxRecuperationTorque == null) {
+					//	// we could recuperate, but max recuperation is null - so battery is full. turn off EM
+					//	emTorque = null;
+					//} else {
+					//	emTorque = (-emResponse.TorqueRequest).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
+					//		emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+					//}
 					break;
 				default:
 					throw new ArgumentOutOfRangeException();
@@ -197,6 +205,30 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 
 		}
 
+		private NewtonMeter GetMechanicalAllsistPower(Second absTime, Second dt, NewtonMeter emOutTorque, ElectricMotorResponse emResponse, PerSecond currOutAngularVelocity)
+		{
+			if (!DataBus.GearboxInfo.GearEngaged(absTime) && DataBus.DriverInfo.DrivingAction == DrivingAction.Roll) {
+				var em = DataBus.ElectricMotorInfo(EmPosition);
+				var avgSpeed = (em.ElectricMotorSpeed + currOutAngularVelocity) / 2;
+				var inertiaTorqueLoss = avgSpeed.IsEqual(0)
+					? 0.SI<NewtonMeter>()
+					: Formulas.InertiaPower(currOutAngularVelocity, em.ElectricMotorSpeed, ModelData.ElectricMachinesData.First(x => x.Item1 == EmPosition).Item2.Inertia, dt) / avgSpeed;
+				//var dragTorque = ElectricMotorData.DragCurve.Lookup()
+				return (-inertiaTorqueLoss); //.LimitTo(maxDriveTorque, maxRecuperationTorque);
+			}
+
+			if (DataBus.DriverInfo.DrivingAction == DrivingAction.Coast ||
+				DataBus.DriverInfo.DrivingAction == DrivingAction.Roll) {
+				return null;
+			}
+
+			if (DataBus.VehicleInfo.VehicleSpeed.IsSmallerOrEqual(Constants.SimulationSettings.ClutchDisengageWhenHaltingSpeed) && emOutTorque.IsSmaller(0)) {
+				return null;
+			}
+			return (-emOutTorque).LimitTo(emResponse.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
+				emResponse.MaxRecuperationTorque ?? 0.SI<NewtonMeter>());
+		}
+
 		protected StateMachineState GetStateAccelerate(DrivetrainDemand drivetrainDemand,
 			GenSetOperatingPoint maxPowerGenset, Second dt)
 		{
@@ -494,6 +526,30 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			
 			TestGenSet.ElectricMotorCtl.EMTorque = emTqDt;
 			var r1 = TestGenSet.ElectricMotor.Request(absTime, dt, 0.SI<NewtonMeter>(), iceSpeed);
+			if (r1 is ResponseOverload && !TestGenSet.CombustionEngine.PreviousState.EngineSpeed.IsEqual(op.ICESpeed)) {
+				var rampUp = GenSetCharacteristics.OptimalPoints.Values.SelectMany(x => x).Where(x =>
+						TestGenSet.ElectricMotor.DeRatingActive
+							? x.EMTorque.IsSmallerOrEqual(GenSetCharacteristics.ContinuousTorque)
+							: true).Select(x => new {
+						OperatingPoint = x,
+						RemainingTorque = x.ICETorque - Formulas.InertiaPower(x.ICESpeed,
+								TestGenSet.CombustionEngine.PreviousState.EngineSpeed, ModelData.EngineData.Inertia,
+								dt) /
+							((TestGenSet.CombustionEngine.PreviousState.EngineSpeed + x.ICESpeed) / 2)
+					});
+					var rampUp2 = rampUp.Where(
+						x => x.OperatingPoint.ICESpeed.IsGreater(TestGenSet.CombustionEngine.PreviousState.EngineSpeed))
+					.ToArray();
+				if (rampUp2.Any()) {
+					var best = rampUp2.MaxBy(x => x.RemainingTorque);
+					emTqDt = best.OperatingPoint.EMTorque;
+					iceSpeed = best.OperatingPoint.ICESpeed;
+					TestGenSet.ElectricMotorCtl.EMTorque = emTqDt;
+					r1 = TestGenSet.ElectricMotor.Request(absTime, dt, 0.SI<NewtonMeter>(),
+						best.OperatingPoint.ICESpeed);
+				}
+			}
+
 			if (r1 is ResponseOverload ovl) {
 				emTqDt = SearchAlgorithm.Search(emTqDt, ovl.Delta, emTqDt * 0.1,
 					getYValue: r => {

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vecto

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-02-08T08:23:21.5081224Z",
+    "AppVersion": "3",
+    "FileVersion": 9
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehicleFile": "BEV_E4_Group31a.vveh",
+    "Padd_electric": 0.0,
+    "BusAux": "Smart_BusAux.vaux",
+    "VACC": "Truck.vacc",
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EngineStopStartUtilityFactorDriving": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
+    "LAC": {
+      "Enabled": true,
+      "PreviewDistanceFactor": 10.0,
+      "DF_offset": 2.5,
+      "DF_scaling": 1.5,
+      "DF_targetSpeedLookup": "",
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
+    },
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 2.5
+    },
+    "Cycles": [
+      "HeavyUrban.vdri",
+	  "Suburban.vdri",
+	  "Urban.vdri"
+    ]
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/BEV_E4_Group31a.vveh

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-02-08T08:23:19.3752854Z",
+    "AppVersion": "3",
+    "FileVersion": 10
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehCat": "CityBus",
+    "LegislativeClass": "Unknown",
+    "CurbWeight": 12841.5,
+    "CurbWeightExtra": 0.0,
+    "MassMax": 19.5,
+    "Loading": 5618.16,
+    "rdyn": 465.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "AxleConfig": {
+      "Type": "4x2",
+      "Axles": [
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.375,
+          "TwinTyres": false,
+          "RRCISO": 0.0034,
+          "FzISO": 31300.0,
+          "Type": "VehicleNonDriven"
+        },
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.625,
+          "TwinTyres": true,
+          "RRCISO": 0.004,
+          "FzISO": 31300.0,
+          "Type": "VehicleDriven"
+        }
+      ]
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "Option_1_2_3",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.9,
+    "VehicleHeight": 3.1,
+    "InitialSoC": 80,
+    "PowertrainConfiguration": "BatteryElectric",
+    "ElectricMotors": [
+      {
+        "Count": 2,
+        "Ratio": 12.47,
+        "Position": "E4",
+        "MotorFile": "GenericEMotor.vem",
+        "MechanicalEfficiency": 0.98
+      }
+    ],
+    "Batteries": [
+      {
+        "NumPacks": 1,
+        "BatteryFile": "GenericBattery.vreess",
+        "StreamId": 0
+      }
+    ]
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/EM_drag.vemd

+n [rpm] , T_drag [Nm]
+0, -1.19
+41.5076091583663, -1.26
+415.076091583663, -1.83
+830.152183167326, -2.47
+1245.22827475099, -3.11
+1660.30436633465, -3.75
+2075.38045791832, -4.39
+2490.45654950198, -5.03
+2905.53264108564, -5.66
+3320.6087326693, -6.3
+3735.68482425297, -6.94
+4150.76091583663, -7.58
+4565.83700742029, -8.22
+4980.91309900396, -8.86
+5395.98919058762, -9.5
+5811.06528217128, -10.13
+6226.14137375495, -10.77
+6641.21746533861, -11.41
+7056.29355692227, -12.05
+7471.36964850593, -12.69
+7886.4457400896, -13.33
+8301.52183167326, -13.97
+

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/EM_fld.vemp

+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 506.13, -506.13
+42, 506.13, -506.13
+415, 506.13, -506.13
+830, 506.13, -506.13
+1245, 506.13, -506.13
+1660, 506.13, -506.13
+2075, 506.13, -506.13
+2490, 421.78, -421.78
+2906, 361.52, -361.52
+3321, 316.33, -316.33
+3736, 281.19, -281.19
+4151, 253.07, -253.07
+4566, 230.06, -230.06
+4981, 210.89, -210.89
+5396, 194.67, -194.67
+5811, 180.76, -180.76
+6226, 168.71, -168.71
+6641, 158.17, -158.17
+7056, 148.86, -148.86
+7471, 140.59, -140.59
+7886, 133.19, -133.19
+8302, 126.53, -126.53
+
+

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/Gen_drag.vemd

+n [rpm] , T_drag [Nm]
+0, -1.85
+41.5076091583663, -1.94
+415.076091583663, -2.83
+830.152183167326, -3.82
+1245.22827475099, -4.81
+1660.30436633465, -5.79
+2075.38045791832, -6.78
+2490.45654950198, -7.77
+2905.53264108564, -8.75
+3320.6087326693, -9.74
+3735.68482425297, -10.73
+4150.76091583663, -11.71
+4565.83700742029, -12.7
+4980.91309900396, -13.69
+5395.98919058762, -14.67
+5811.06528217128, -15.66
+6226.14137375495, -16.65
+6641.21746533861, -17.64
+7056.29355692227, -18.62
+7471.36964850593, -19.61
+7886.4457400896, -20.6
+8301.52183167326, -21.58
+

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/Gen_fld.vemp

+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 782.21, -782.21
+42, 782.21, -782.21
+415, 782.21, -782.21
+830, 782.21, -782.21
+1245, 782.21, -782.21
+1660, 782.21, -782.21
+2075, 782.21, -782.21
+2490, 651.84, -651.84
+2906, 558.72, -558.72
+3321, 488.88, -488.88
+3736, 434.56, -434.56
+4151, 391.10, -391.10
+4566, 355.55, -355.55
+4981, 325.92, -325.92
+5396, 300.85, -300.85
+5811, 279.36, -279.36
+6226, 260.74, -260.74
+6641, 244.44, -244.44
+7056, 230.06, -230.06
+7471, 217.28, -217.28
+7886, 205.84, -205.84
+8302, 195.55, -195.55
+
+
+

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/GenericBattery.vbatr

+SoC, Ri
+0,  0.024
+100,  0.024
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/GenericBattery.vreess

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-06-16T09:37:48.3166199Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "REESSType": "Battery",
+    "Model": "Generic Battery",
+    "Capacity": 37.14,
+    "SOC_min": 20,
+    "SOC_max": 80,
+    "MaxCurrentMap": "MaxCurrent.vimax",
+    "InternalResistanceCurve": "GenericBattery.vbatr",
+    "SoCCurve": "REESS_SOC_curve.vbatv"
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/GenericEMotor.vem

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-08-05T14:49:40.5920495Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Electric Motor",
+    "Inertia": 0.134,
+    "ContinuousTorque": 506.13,
+    "ContinuousTorqueSpeed": 2075.38045791832,
+    "OverloadTorque": 506.13,
+    "OverloadTorqueSpeed": 2075.38045791832,
+    "OverloadTime": 120,
+    "ThermalOverloadRecoveryFactor": 0.9,
+    "VoltageLevels": [
+      {
+        "Voltage": 0.0,
+        "FullLoadCurve": "EM_fld.vemp",
+        "DragCurve": "EM_drag.vemd",
+        "EfficiencyMap": "EM_Map.vemo"
+      },
+      {
+        "Voltage": 1000.0,
+        "FullLoadCurve": "EM_fld.vemp",
+        "DragCurve": "EM_drag.vemd",
+        "EfficiencyMap": "EM_Map.vemo"
+      }
+    ]
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/GenericGen.vem

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-08-05T14:49:40.5920495Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Electric Motor",
+    "Inertia": 0.134,
+    "ContinuousTorque": 521,
+    "ContinuousTorqueSpeed": 2075.38045791832,
+    "OverloadTorque": 782.208589,
+    "OverloadTorqueSpeed": 2075.38045791832,
+    "OverloadTime": 120,
+    "ThermalOverloadRecoveryFactor": 0.9,
+    "VoltageLevels": [
+      {
+        "Voltage": 0.0,
+        "FullLoadCurve": "Gen_fld.vemp",
+        "DragCurve": "Gen_drag.vemd",
+        "EfficiencyMap": "Gen_Map.vemo"
+      },
+      {
+        "Voltage": 1000.0,
+        "FullLoadCurve": "Gen_fld.vemp",
+        "DragCurve": "Gen_drag.vemd",
+        "EfficiencyMap": "Gen_Map.vemo"
+      }
+    ]
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/Group2_6l.veng

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-06-17T07:29:46.1581600Z",
+    "AppVersion": "3",
+    "FileVersion": 5
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "ModelName": "175kW 6.0l Engine",
+    "Displacement": "6000",
+    "IdlingSpeed": 600.0,
+    "Inertia": 3.33,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0090832895,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "Group2_ICE_Map.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 170000,
+    "RatedSpeed": 2150.0,
+    "MaxTorque": 950,
+    "FullLoadCurve": "Group2_ICE_fld.vfld",
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/Group2_ICE_Map.vmap

+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+493.1,0,472.16
+493.1,68.14,1092.71
+493.1,97.34,1385.09
+493.1,193.47,2362.56
+493.1,290.81,3349.21
+493.1,388.15,4323.3
+493.1,484.28,5615.1
+493.1,581.62,6885.35
+493.1,677.75,8141.37
+493.1,775.09,9324.05
+493.1,872.43,10502.65
+493.1,968.56,11671.38
+493.1,1065.9,12854.85
+493.1,1163.24,14041.1
+493.1,1345.76,16279.46
+706.9,0,654.56
+706.9,63.38,1300.66
+706.9,90.54,1685.83
+706.9,179.94,2934.98
+706.9,270.48,4209.73
+706.9,361.01,5489.64
+706.9,450.42,7131.94
+706.9,540.96,8749.33
+706.9,630.36,10355.07
+706.9,720.9,11892.3
+706.9,811.43,13423.46
+706.9,900.84,14932.81
+706.9,991.38,16460.36
+706.9,1081.91,17990.15
+706.9,1251.67,20868.88
+920.69,0,834.13
+920.69,60.82,1539.32
+920.69,86.89,1996.25
+920.69,172.7,3527.91
+920.69,259.59,5103.77
+920.69,346.48,6698.6
+920.69,432.28,8534.56
+920.69,519.18,10302.62
+920.69,604.98,12051.26
+920.69,691.87,13799.21
+920.69,778.76,15560.69
+920.69,864.57,17324
+920.69,951.46,19082.4
+920.69,1038.35,20849.66
+920.69,1201.27,24184.98
+1134.48,0,1012.43
+1134.48,59.23,1702.79
+1134.48,84.62,2219.71
+1134.48,168.18,3986.47
+1134.48,252.8,5811.14
+1134.48,337.42,7665.32
+1134.48,420.98,9608.64
+1134.48,505.6,11442.89
+1134.48,589.17,13241.57
+1134.48,673.79,15118.07
+1134.48,758.41,17022.48
+1134.48,841.97,18944.17
+1134.48,926.59,20869.63
+1134.48,1011.21,23114.89
+1134.48,1169.87,27512.11
+1348.28,0,1294.34
+1348.28,58.15,1997.87
+1348.28,83.07,2598.94
+1348.28,165.1,4624.77
+1348.28,248.17,6737.78
+1348.28,331.24,8867.28
+1348.28,413.27,10944.84
+1348.28,496.34,13061.55
+1348.28,578.37,15269.8
+1348.28,661.44,17440.79
+1348.28,744.51,19507.76
+1348.28,826.54,21571.23
+1348.28,909.61,23711.69
+1348.28,992.68,25966.58
+1348.28,1148.43,30235.15
+1562.07,0,1564.61
+1562.07,57.36,2313.91
+1562.07,81.94,2984.72
+1562.07,162.86,5250.37
+1562.07,244.8,7668.52
+1562.07,326.75,10085.19
+1562.07,407.66,12512.83
+1562.07,489.61,14888.07
+1562.07,570.53,17294.79
+1562.07,652.47,19699.54
+1562.07,734.41,22035.67
+1562.07,815.33,24300.61
+1562.07,897.27,26869.17
+1562.07,979.21,29479.27
+1562.07,1132.86,34444.32
+1775.86,0,1863.36
+1775.86,56.76,2698.21
+1775.86,81.09,3431.79
+1775.86,161.16,5910.81
+1775.86,242.25,8635.74
+1775.86,323.34,11334.83
+1775.86,403.41,14031.9
+1775.86,484.5,16635.84
+1775.86,564.57,19283.72
+1775.86,645.66,22068.32
+1775.86,726.75,24815.91
+1775.86,806.82,27688.06
+1775.86,887.91,30790.81
+1775.86,968.99,33952.49
+1775.86,1121.03,40033.18
+1989.66,0,2223.14
+1989.66,56.29,3220.96
+1989.66,80.42,4008.53
+1989.66,159.83,6662.21
+1989.66,240.24,9700.2
+1989.66,320.66,12667.85
+1989.66,400.07,15692.26
+1989.66,480.49,18679.2
+1989.66,559.9,21609.8
+1989.66,640.31,24775.04
+1989.66,720.73,28010.68
+1989.66,800.14,31252.58
+1989.66,880.55,34385.56
+1989.66,960.97,37524.12
+1989.66,1111.75,43403.66
+2203.45,0,2709.67
+2203.45,55.91,3705.82
+2203.45,79.87,4568.38
+2203.45,158.75,7476.19
+2203.45,238.63,10780.73
+2203.45,318.5,14089.18
+2203.45,397.38,17362.53
+2203.45,477.25,20768.53
+2203.45,556.13,24379.4
+2203.45,636,28003.36
+2203.45,715.88,31565.94
+2203.45,794.75,35149.25
+2203.45,874.63,38779.16
+2203.45,954.5,42412.1
+2203.45,1104.27,49265.36
+2417.24,0,3185.92
+2417.24,55.6,4180.3
+2417.24,79.43,5130.88
+2417.24,157.87,8358.59
+2417.24,237.3,11902.92
+2417.24,316.72,15661.32
+2417.24,395.16,19569.39
+2417.24,474.59,23518.51
+2417.24,553.03,27751.41
+2417.24,632.46,32032.12
+2417.24,711.89,35952.81
+2417.24,790.32,39807.26
+2417.24,869.75,43671.01
+2417.24,949.18,47549.94
+2417.24,1098.11,54776.77
+493.1,-57.18,0
+706.9,-61.47,0
+920.69,-65.18,0
+1134.48,-69.57,0
+1348.28,-80.01,0
+1562.07,-86.98,0
+1775.86,-97.64,0
+1989.66,-111.91,0
+2203.45,-126.35,0
+2417.24,-142.1,0
+493.1,-67.18,0
+706.9,-71.47,0
+920.69,-75.18,0
+1134.48,-79.57,0
+1348.28,-90.01,0
+1562.07,-96.98,0
+1775.86,-107.64,0
+1989.66,-121.91,0
+2203.45,-136.35,0
+2417.24,-152.1,0

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Sx/Group2_ICE_fld.vfld

+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,218.50,-59.32
+1096,950,-67.77
+1700.5,950,-92.87
+2150,755.06,-122.42
+2522,0,-149.84
+