adding testcase for P3 hybrid with torque limitation (vehicle level)

VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs

@@ -595,7 +595,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 				var nextGear = DataBus.VehicleInfo.VehicleStopped
 					? Controller.ShiftStrategy.NextGear
 					: !DataBus.GearboxInfo.GearEngaged(absTime)
-						? new GearshiftPosition(0)
+						? Controller.ShiftStrategy.NextGear
 						: (PreviousState.GearboxEngaged
 							? DataBus.GearboxInfo.Gear
 							: Controller.ShiftStrategy.NextGear);
@@ -605,6 +605,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					NextGear = nextGear,
 					MechanicalAssistPower = ElectricMotorsOff
 				};
+				if (ElectricMotorCanPropellDuringTractionInterruption) {
+					// for P3 or P4 let the EM compensate its own drag to get correct gearbox in torque
+					emOff.MechanicalAssistPower[emOff.MechanicalAssistPower.First().Key] =
+						Tuple.Create((PerSecond)null, 0.SI<NewtonMeter>());
+				}
 				testRequest = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, emOff);
 				var tqRequest = testRequest.Gearbox.InputTorque;
 				var maxTorque =
@@ -731,12 +736,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					// overwrite delta value...
 					var maxTorque =
 						StrategyParameters.MaxPropulsionTorque.FullLoadDriveTorque(response.Gearbox.InputSpeed);
-					dryRunResponse.DeltaFullLoad = (dryRunResponse.Gearbox.InputTorque - maxTorque) *
+					
+					var emPos = ModelData.ElectricMachinesData.First().Item1;
+
+					var gbxInTq = GetGearboxInTorqueLimitedVehiclePorpTorque(dryRunResponse, emPos);
+					dryRunResponse.DeltaFullLoad = (gbxInTq - maxTorque) *
 													dryRunResponse.Gearbox.InputSpeed;
-					dryRunResponse.DeltaFullLoadTorque = (dryRunResponse.Gearbox.InputTorque - maxTorque);
-					dryRunResponse.DeltaDragLoad = (dryRunResponse.Gearbox.InputTorque - maxTorque) *
+					dryRunResponse.DeltaFullLoadTorque = (gbxInTq - maxTorque);
+					dryRunResponse.DeltaDragLoad = (gbxInTq - maxTorque) *
 													dryRunResponse.Gearbox.InputSpeed;
-					dryRunResponse.DeltaDragLoadTorque = (dryRunResponse.Gearbox.InputTorque - maxTorque);
+					dryRunResponse.DeltaDragLoadTorque = (gbxInTq - maxTorque);
 
 				}
 			}
@@ -744,6 +753,35 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			return response;
 		}
 
+		/// <summary>
+		///  get the input torque at the gearbox to calculate overload limit. in case of P3 or P4 compensate the EM torque
+		/// to get the 'virtual' gearbox input torque
+		/// </summary>
+		/// <param name="dryRunResponse"></param>
+		/// <param name="emPos"></param>
+		/// <returns></returns>
+		private NewtonMeter GetGearboxInTorqueLimitedVehiclePorpTorque(IResponse dryRunResponse, PowertrainPosition emPos)
+		{
+			var gbxInTq = dryRunResponse.Gearbox.InputTorque;
+			if ((emPos == PowertrainPosition.HybridP3 || emPos == PowertrainPosition.HybridP4) && dryRunResponse.Gearbox.Gear.Gear != 0) {
+				//var gbxEff = dryRunResponse.Gearbox.OutputSpeed * dryRunResponse.Gearbox.OutputTorque / (
+				//	dryRunResponse.Gearbox.InputSpeed * dryRunResponse.Gearbox.InputTorque);
+				//emPower = dryRunResponse.ElectricMotor.ElectricMotorPowerMech / gbxEff;
+				var gear = dryRunResponse.Gearbox.Gear;
+				var emTq = dryRunResponse.ElectricMotor.ElectricMotorPowerMech /
+							dryRunResponse.ElectricMotor.AngularVelocity;
+				var gbxOutTqV = dryRunResponse.Gearbox.OutputTorque - emTq;
+
+				var prevGbxSpeed = (DataBus.GearboxInfo as AbstractGearbox<GearboxState>).PreviousState
+					.OutAngularVelocity;
+				var gbxLoss = ModelData.GearboxData.Gears[gear.Gear].LossMap
+					.GetTorqueLoss((dryRunResponse.Gearbox.OutputSpeed + prevGbxSpeed) / 2.0, gbxOutTqV);
+				gbxInTq = gbxOutTqV / ModelData.GearboxData.Gears[gear.Gear].Ratio + gbxLoss.Value;
+			}
+
+			return gbxInTq;
+		}
+
 		public void OperatingpointChangedDuringRequest(Second absTime, Second dt, NewtonMeter outTorque,
 			PerSecond outAngularVelocity,
 			bool dryRun, IResponse retVal)
@@ -793,6 +831,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					NextGear = nextGear,
 					MechanicalAssistPower = ElectricMotorsOff
 				};
+				if (ElectricMotorCanPropellDuringTractionInterruption) {
+					// for P3 or P4 let the EM compensate its own drag to get correct gearbox in torque
+					emOff.MechanicalAssistPower[emOff.MechanicalAssistPower.First().Key] =
+						Tuple.Create((PerSecond)null, 0.SI<NewtonMeter>());
+				}
 				var testRequest = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, emOff);
 				if (testRequest != null) {
 					var maxGbxTorque = StrategyParameters.MaxPropulsionTorque.FullLoadDriveTorque(testRequest.Gearbox.InputSpeed);
@@ -836,23 +879,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 					? ModelData.EngineData.FullLoadCurves[0].N95hSpeed :
 					VectoMath.Min(DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.Gear.Gear).MaxSpeed, ModelData.EngineData.FullLoadCurves[0].N95hSpeed);
 
+
+			var gbxInTq = GetGearboxInTorqueLimitedVehiclePorpTorque(emOffResponse, emPos);
 			if (deltaFullLoadTq.IsSmallerOrEqual(0)) {
 				// the engine is not overloaded if EM boosts, limit to max gearbox torque
 				return new HybridStrategyLimitedResponse() {
 					//Delta = outTorque * outAngularVelocity - StrategyParameters.MaxDrivetrainPower,
-					Delta = (emOffResponse.Gearbox.InputTorque - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed,
+					Delta = (gbxInTq - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed,
 					DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed, // .DeltaEngineSpeed
 					GearboxResponse = maxEmDriveResponse.Gearbox,
 				};
 			}
 
-			var deltaMaxTorque = emOffResponse.Gearbox.InputTorque - maxTorqueGbxIn;
+			var deltaMaxTorque = gbxInTq - maxTorqueGbxIn;
 			if (deltaMaxTorque.IsGreater(deltaFullLoadTq)) {
 				// gearbox in torque is much higher above limit than ice operating point above full-load curve (with em boosting)
 				// search to max torque curve
 				// i.e. when limiting to max torque the ICE operating point is below full-load curve
 				return new HybridStrategyLimitedResponse() {
-					Delta = (emOffResponse.Gearbox.InputTorque - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed,
+					Delta = (gbxInTq - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed,
 					DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed, // .DeltaEngineSpeed
 					GearboxResponse = maxEmDriveResponse.Gearbox,
 				};
@@ -880,7 +925,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 				});
 			var rqMaxTorque = RequestDryRun(absTime, dt, maxTorque, outAngularVelocity, currentGear, maxEmDriveSetting);
 			// limiting to ICE FLD with max propulsion - delta gearbox torque
-			var delta1 = ( rqMaxTorque.Gearbox.InputTorque - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed;
+			var rqMaxGbxInTq = GetGearboxInTorqueLimitedVehiclePorpTorque(rqMaxTorque, emPos);
+			var delta1 = ( rqMaxGbxInTq - maxTorqueGbxIn) * emOffResponse.Gearbox.InputSpeed;
 			var delta2 = (outTorque - maxTorque) * outAngularVelocity;
 			var delta = VectoMath.Max(delta1, delta2);
 			return new HybridStrategyLimitedResponse() {

VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs

@@ -1077,6 +1077,46 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 			graphWriter.Write(modFilename);
 		}
 
+		public const string Group5_P3_AMT = @"TestData\Hybrids\GenericVehicle_Group5_P3\P3 Group 5.vecto";
+			
+		[
+			TestCase(Group5_P3_AMT, 0, TestName = "P3 Hybrid DriveCycle LongHaul"),
+			TestCase(Group5_P3_AMT, 1, TestName = "P3 Hybrid DriveCycle Coach"),
+			TestCase(Group5_P3_AMT, 2, TestName = "P3 Hybrid DriveCycle Construction"),
+			TestCase(Group5_P3_AMT, 3, TestName = "P3 Hybrid DriveCycle HeavyUrban"),
+			TestCase(Group5_P3_AMT, 4, TestName = "P3 Hybrid DriveCycle Interurban"),
+			TestCase(Group5_P3_AMT, 5, TestName = "P3 Hybrid DriveCycle MunicipalUtility"),
+			TestCase(Group5_P3_AMT, 6, TestName = "P3 Hybrid DriveCycle RegionalDelivery"),
+			TestCase(Group5_P3_AMT, 7, TestName = "P3 Hybrid DriveCycle Suburban"),
+			TestCase(Group5_P3_AMT, 8, TestName = "P3 Hybrid DriveCycle Urban"),
+			TestCase(Group5_P3_AMT, 9, TestName = "P3 Hybrid DriveCycle UrbanDelivery"),
+
+		]
+		public void P3HybridGroup5_DriveCycle(string jobFile, int cycleIdx)
+		{
+			RunHybridJob(jobFile, cycleIdx);
+		}
+
+		public const string Group5_P3_AMT_VehiclePropLimit = @"TestData\Hybrids\GenericVehicle_Group5_P3\P3 Group 5_LimitVehiclePropTq.vecto";
+
+		[
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 0, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle LongHaul"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 1, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle Coach"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 2, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle Construction"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 3, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle HeavyUrban"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 4, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle Interurban"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 5, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle MunicipalUtility"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 6, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle RegionalDelivery"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 7, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle Suburban"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 8, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle Urban"),
+			TestCase(Group5_P3_AMT_VehiclePropLimit, 9, TestName = "P3 Hybrid Limit Vehicle Prop.Tq DriveCycle UrbanDelivery"),
+
+		]
+		public void P3HybridGroup5_VehilcePropLimit_DriveCycle(string jobFile, int cycleIdx)
+		{
+			RunHybridJob(jobFile, cycleIdx);
+		}
+
 		public const string Group5_P3_APT = @"TestData\Hybrids\GenericVehicle_Group5_P3_APT\P3 APT Group 5.vecto";
 		public const string Group5_P4_APT = @"TestData\Hybrids\GenericVehicle_Group5_P4_APT\P4 APT Group 5.vecto";
 
@@ -1105,37 +1145,13 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 			TestCase(Group5_P4_APT, 9, TestName = "P4 APT Hybrid Group 5 DriveCycle UrbanDelivery"),
 
 		]
-		public void P3APTHybridGroup5DriveCycle(string jobFile, int cycleIdx)
+		public void P4APTHybridGroup5DriveCycle(string jobFile, int cycleIdx)
 		{
-			var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
-
-			var writer = new FileOutputWriter(jobFile);
-			var factory = new SimulatorFactory(ExecutionMode.Engineering, inputProvider, writer) {
-				Validate = false,
-				WriteModalResults = true,
-			};
-
-			var sumContainer = new SummaryDataContainer(writer);
-			var jobContainer = new JobContainer(sumContainer);
-
-			factory.SumData = sumContainer;
-
-			var run = factory.SimulationRuns().ToArray()[cycleIdx];
-
-			Assert.NotNull(run);
-
-			var pt = run.GetContainer();
-
-			Assert.NotNull(pt);
+			RunHybridJob(jobFile, cycleIdx);
+		}
 
-			run.Run();
-			Assert.IsTrue(run.FinishedWithoutErrors);
 
-			//jobContainer.AddRuns(factory);
-			//jobContainer.Execute();
-			//jobContainer.WaitFinished();
-			//Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
-		}
+		
 
 		// - - - - - - - - - - - - - - - - - - - - - - - - - 
 

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/325kW.vfld

+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/325kW.vmap

+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-165.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Default.vrlm

+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+	"Model": "Generic Battery",
+	"InternalResistance": 0.04,
+	"SOC_min": 10,
+	"SOC_max": 90,
+    "MaxCurrentFactor": 5,
+    "Capacity": 324,
+    "SOC": [
+      [ 0, 673.5 ],
+      [ 10, 700.2 ],
+      [ 20, 715.4 ],
+      [ 30, 723.6 ],
+      [ 40, 727.7 ],
+      [ 50, 730.0 ],
+      [ 60, 731.6 ],
+      [ 70, 733.8 ],
+      [ 80, 737.1 ],
+      [ 90, 742.2 ],
+      [ 100, 750.2 ]
+    ]
+	}
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd

+n [rpm] , T_drag [Nm]
+0       , 6.06
+7363.77    , 30.31
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vem

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+	"Model": "Generic Electric Motor",
+    "FullLoadCurve": "GenericEMotor_125kW_485Nm.vemp",
+    "DragCurve":  "GenericDrag_125kW_485Nm.vemd", 
+    "EfficiencyMap": "GenericMap_125kW_485Nm.vemo",
+    "Inertia" :  0.225 
+
+	}
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten B4/2x125kW 485Nm/GenericEMotor_125kW_485Nm.vemp

+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0,485,-485
+2461.158914,485,-485
+2452.135493,485,-485
+2466.863034,483.8845,-483.8845
+2481.590574,481.010875,-481.010875
+2496.318115,478.173625,-478.173625
+2503.681885,476.767125,-476.767125
+2577.319588,463.138625,-463.138625
+2650.95729,450.274,-450.274
+2724.594993,438.1005,-438.1005
+2798.232695,426.58175,-426.58175
+2871.870398,415.645,-415.645
+2945.5081,405.253875,-405.253875
+3019.145803,395.359875,-395.359875
+3092.783505,385.950875,-385.950875
+3166.421208,376.978375,-376.978375
+3240.05891,368.406,-368.406
+3313.696613,360.221625,-360.221625
+3387.334315,352.388875,-352.388875
+3460.972018,344.895625,-344.895625
+3534.60972,337.7055,-337.7055
+3608.247423,330.8185,-330.8185
+3681.885125,324.19825,-324.19825
+3755.522828,317.84475,-317.84475
+3829.16053,311.73375,-311.73375
+3902.798233,305.853125,-305.853125
+3976.435935,300.178625,-300.178625
+4050.073638,294.722375,-294.722375
+4123.71134,289.460125,-289.460125
+4197.349043,284.37975,-284.37975
+4270.986745,279.48125,-279.48125
+4344.624448,274.740375,-274.740375
+4418.26215,270.16925,-270.16925
+4491.899853,265.7315,-265.7315
+4565.537555,261.451375,-261.451375
+4639.175258,257.304625,-257.304625
+4712.81296,253.279125,-253.279125
+4786.450663,249.387,-249.387
+4860.088365,245.604,-245.604
+4933.726068,241.94225,-241.94225
+5007.36377,238.3775,-238.3775
+5081.001473,234.921875,-234.921875
+5154.639175,231.575375,-231.575375
+5228.276878,228.31375,-228.31375
+5301.91458,225.137,-225.137
+5375.552283,222.05725,-222.05725
+5449.189985,219.05025,-219.05025
+5522.827688,216.128125,-216.128125
+5596.46539,213.290875,-213.290875
+5670.103093,210.51425,-210.51425
+5743.740795,207.8225,-207.8225
+5817.378498,205.191375,-205.191375
+5891.0162,202.620875,-202.620875
+5964.653903,200.123125,-200.123125
+6038.291605,197.686,-197.686
+6111.929308,195.297375,-195.297375
+6185.56701,192.969375,-192.969375
+6259.204713,190.702,-190.702
+6332.842415,188.483125,-188.483125
+6406.480118,186.324875,-186.324875
+6480.11782,184.203,-184.203
+6553.755523,182.129625,-182.129625
+6627.393225,180.10475,-180.10475
+6701.030928,178.128375,-178.128375
+6774.66863,176.2005,-176.2005
+6848.306333,174.296875,-174.296875
+6921.944035,172.44175,-172.44175
+6995.581738,170.635125,-170.635125
+7069.21944,168.85275,-168.85275
+7142.857143,167.10675,-167.10675
+7216.494845,165.40925,-165.40925
+7290.132548,163.736,-163.736
+7363.77025,162.099125,-162.099125

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbat

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-08-24T13:47:26.1945484Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Battery",
+    "Capacity": 14.0,
+    "SOC_min": 20.0,
+    "SOC_max": 80.0,
+    "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
+    "MaxCurrentMap": "MaxCurrent.vimax",
+    "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatr

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

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericBattery_10kWh_658V.vbatv

+SOC, V
+0, 590 
+10, 614 
+20, 626 
+30, 632 
+40, 638 
+50, 640 
+60, 640 
+70, 642 
+80, 646 
+90, 650 
+100, 658
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericDrag_140kW_936Nm.vemd

+n [rpm] , T_drag [Nm]
+0       , -11.70
+4268.63    , -58.50
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vem

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Electric Motor",
+    "FullLoadCurve": "GenericEMotor_140kW_936Nm.vemp",
+    "DragCurve": "GenericDrag_140kW_936Nm.vemd",
+    "EfficiencyMap": "GenericMap_140kW_936Nm.vemo",
+    "Inertia": 0.5,
+    "ContinuousPower": 5000000,
+    "ContinuousPowerSpeed": 2000,
+    "OverloadTime": 30,
+    "ThermalOverloadRecoveryFactor": 0.9
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/GenericEMotor_140kW_936Nm.vemp

+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0,936,-936
+1428.313592,936,-936
+1423.076923,936,-936
+1431.623932,933.8472,-933.8472
+1440.17094,928.3014,-928.3014
+1448.717949,922.8258,-922.8258
+1452.991453,920.1114,-920.1114
+1495.726496,893.8098,-893.8098
+1538.461538,868.9824,-868.9824
+1581.196581,845.4888,-845.4888
+1623.931624,823.2588,-823.2588
+1666.666667,802.152,-802.152
+1709.401709,782.0982,-782.0982
+1752.136752,763.0038,-763.0038
+1794.871795,744.8454,-744.8454
+1837.606838,727.5294,-727.5294
+1880.34188,710.9856,-710.9856
+1923.076923,695.1906,-695.1906
+1965.811966,680.0742,-680.0742
+2008.547009,665.613,-665.613
+2051.282051,651.7368,-651.7368
+2094.017094,638.4456,-638.4456
+2136.752137,625.6692,-625.6692
+2179.487179,613.4076,-613.4076
+2222.222222,601.614,-601.614
+2264.957265,590.265,-590.265
+2307.692308,579.3138,-579.3138
+2350.42735,568.7838,-568.7838
+2393.162393,558.6282,-558.6282
+2435.897436,548.8236,-548.8236
+2478.632479,539.37,-539.37
+2521.367521,530.2206,-530.2206
+2564.102564,521.3988,-521.3988
+2606.837607,512.8344,-512.8344
+2649.57265,504.5742,-504.5742
+2692.307692,496.5714,-496.5714
+2735.042735,488.8026,-488.8026
+2777.777778,481.2912,-481.2912
+2820.512821,473.9904,-473.9904
+2863.247863,466.9236,-466.9236
+2905.982906,460.044,-460.044
+2948.717949,453.375,-453.375
+2991.452991,446.9166,-446.9166
+3034.188034,440.622,-440.622
+3076.923077,434.4912,-434.4912
+3119.65812,428.5476,-428.5476
+3162.393162,422.7444,-422.7444
+3205.128205,417.105,-417.105
+3247.863248,411.6294,-411.6294
+3290.598291,406.2708,-406.2708
+3333.333333,401.076,-401.076
+3376.068376,395.9982,-395.9982
+3418.803419,391.0374,-391.0374
+3461.538462,386.217,-386.217
+3504.273504,381.5136,-381.5136
+3547.008547,376.9038,-376.9038
+3589.74359,372.411,-372.411
+3632.478632,368.0352,-368.0352
+3675.213675,363.753,-363.753
+3717.948718,359.5878,-359.5878
+3760.683761,355.4928,-355.4928
+3803.418803,351.4914,-351.4914
+3846.153846,347.5836,-347.5836
+3888.888889,343.7694,-343.7694
+3931.623932,340.0488,-340.0488
+3974.358974,336.375,-336.375
+4017.094017,332.7948,-332.7948
+4059.82906,329.3082,-329.3082
+4102.564103,325.8684,-325.8684
+4145.299145,322.4988,-322.4988
+4188.034188,319.2228,-319.2228
+4230.769231,315.9936,-315.9936
+4273.504274,312.8346,-312.8346

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/Hybrid_Parameters.vhctl

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-08-24T08:08:59.2231036Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "EquivalenceFactor": 2.5,
+    "MinSoC": 20.0,
+    "MaxSoC": 80.0,
+    "TargetSoC": 50.0,
+    "AuxBufferTime": 5.0,
+    "AuxBufferChgTime": 5.0,
+    "MinICEOnTime": 10.0
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/ElectricMotor/Inputdaten P3 Group 5/Electric components/MaxCurrent.vimax

+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P3/Engine_325kW_12.7l.veng

+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-08-21T09:24:04.0725494Z",
+    "AppVersion": "3",
+    "FileVersion": 5
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "ModelName": "325kW 12.7l Engine",
+    "Displacement": "12740",
+    "IdlingSpeed": 600.0,
+    "Inertia": 5.1498,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "325kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
+    "FullLoadCurve": "325kW.vfld",
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
+  }
+}
\ No newline at end of file