Merge branch 'develop' of...

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

VECTO/GUI/VehicleForm.vb

@@ -122,7 +122,8 @@ Public Class VehicleForm
 		_changed = False
 
 		cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel(),
-																				Function(x) x <> PowertrainPosition.GEN)
+																				Function(x) x <> PowertrainPosition.GEN _
+																					AndAlso x <> PowertrainPosition.HybridP0)
 
 		NewVehicle()
 	End Sub

VectoCommon/VectoCommon/Models/PowertrainPosition.cs

@@ -72,14 +72,20 @@ namespace TUGraz.VectoCommon.InputData
 
 		public static bool IsBatteryElectric(this PowertrainPosition pos)
 		{
-			return pos == PowertrainPosition.BatteryElectricE2 || pos == PowertrainPosition.BatteryElectricE3 ||
-					pos == PowertrainPosition.BatteryElectricE4;
+			switch (pos) {
+				case PowertrainPosition.BatteryElectricE2:
+				case PowertrainPosition.BatteryElectricE3:
+				case PowertrainPosition.BatteryElectricE4:
+					return true;
+				default:
+					return false;
+			}
 		}
 
 		public static bool IsParallelHybrid(this PowertrainPosition pos)
 		{
 			switch (pos) {
-				case PowertrainPosition.HybridP0:
+				//case PowertrainPosition.HybridP0: // special case currently modelled in BusAuxiliary as SmartAlternator.
 				case PowertrainPosition.HybridP1:
 				case PowertrainPosition.HybridP2:
 				case PowertrainPosition.HybridP2_5:

VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs

@@ -235,6 +235,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 				}
 			}
 
+			if (runData.ElectricMachinesData?.Any(e => e.Item1 == PowertrainPosition.HybridP0) ?? false){
+				return new ValidationResult("P0 Hybrids are modeled as SmartAlternator in the BusAuxiliary model.");
+			}
+
 			return ValidationResult.Success;
 		}
 

VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs

@@ -412,6 +412,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			if (data.ElectricMachinesData.Count != 1) {
 				throw new VectoException("ParallelHybrid needs exactly one electric motor.");
 			}
+			if (data.ElectricMachinesData.Any(e => e.Item1 == PowertrainPosition.HybridP0)) {
+				throw new VectoException("P0 Hybrids are modeled as SmartAlternator in the BusAuxiliary model.");
+			}
 
 			var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
 			var es = ConnectREESS(data, container);

VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs

@@ -82,8 +82,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			if (operatingPointList.Count > 0) {
 				operatingPoint = SelectOperatingPoint(operatingPointList);
 			} else {
-				Log.Warn(
-					"TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+				if (outTorque.IsEqual(0) && outAngularVelocity.IsEqual(0)) {
+					Log.Info("TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+				}
+				else {
+					Log.Warn("TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+				}
 				var inAngularVelocity = outAngularVelocity.LimitTo(DataBus.EngineInfo.EngineIdleSpeed, DataBus.EngineInfo.EngineN95hSpeed);
 				operatingPoint = new TorqueConverterOperatingPoint {
 					OutAngularVelocity = outAngularVelocity,

VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs

@@ -260,7 +260,7 @@ public class JSONFileWriter : IOutputFileWriter
 		body.Add(JsonKeys.Gearbox_GearboxType, gbx.Type.ToString());
 
 		var torqueConverterDict = new Dictionary<string, object> { { "Enabled", torqueConverter != null && gbx.Type.AutomaticTransmission() } };
-		if (gbx.Type.AutomaticTransmission() && torqueConverter != null) {
+		if (gbx.Type.AutomaticTransmission() && gbx.Type != GearboxType.APTN) {
 			torqueConverterDict.Add("File", GetRelativePath(torqueConverter.TCData.Source, Path.GetDirectoryName(filename)));
 			torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_ReferenceRPM, Math.Round(torqueConverter.ReferenceRPM.AsRPM, 4));
 			torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_Inertia, torqueConverter.Inertia.Value());