adding input data interfaces for battery and electric motor

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

@@ -114,6 +114,12 @@ namespace TUGraz.VectoCommon.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		IAxlesEngineeringInputData AxleWheels { get; }
+
+		//IBusAuxiliariesEngineeringData BusAuxiliaries { get; }
+
+		IElectricStorageEngineeringInputData ElectricStorage { get; }
+
+		IElectricMachinesEngineeringInputData ElectricMachines { get; }
 	}
 
 	public interface IAxlesEngineeringInputData
@@ -367,6 +373,28 @@ namespace TUGraz.VectoCommon.InputData
 		string AdvancedAuxiliaryFilePath { get; }
 	}
 
+	public interface IElectricMotorEngineeringInputData : IElectricMotorDeclarationInputData
+	{
+		
+	}
+
+	public interface IElectricMachinesEngineeringInputData
+	{
+		IList<ElectricMachineEntry<IElectricMotorEngineeringInputData>> Entries { get; }
+	}
+
+	public interface IElectricStorageEngineeringInputData : IElectricStorageDeclarationInputData
+	{
+		new IBatteryPackEngineeringInputData BatteryPack { get; }
+
+		int Count { get; }
+	}
+
+	public interface IBatteryPackEngineeringInputData : IBatteryPackDeclarationInputData
+	{
+		
+	}
+
 	public interface IDriverModelData { }
 
 	public interface IDriverAccelerationData : IDriverModelData

VectoCommon/VectoCommon/Models/PowertrainPosition.cs

+namespace TUGraz.VectoCommon.InputData {
+	public enum PowertrainPosition
+	{
+		HybridP0,
+		HybridP1,
+		HybridP2,
+		HybridP3,
+		HybridP4
+	}
+}
\ No newline at end of file

VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs

@@ -228,7 +228,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return _axleWheelsDecl; }
 		}
 
+		public IElectricStorageEngineeringInputData ElectricStorage { get { return VehicleData.Components.ElectricStorage; } }
+		public IElectricMachinesEngineeringInputData ElectricMachines { get {
+			return VehicleData.Components.ElectricMachines;
+		} }
+
 		public IBusAuxiliariesDeclarationData BusAuxiliaries { get { return null; } }
+		IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage
+		{
+			get { return ElectricStorage; }
+		}
+
+		IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines
+		{
+			get { return ElectricMachines; }
+		}
 
 		public Meter DynamicTyreRadius
 		{

VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -533,11 +533,41 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return this; }
 		}
 
+		IElectricStorageEngineeringInputData IVehicleComponentsEngineering.ElectricStorage
+		{
+			get { return GetElectricStorage(); }
+		}
+
+		protected virtual IElectricStorageEngineeringInputData GetElectricStorage()
+		{
+			return null;
+		}
+
+		IElectricMachinesEngineeringInputData IVehicleComponentsEngineering.ElectricMachines
+		{
+			get { return GetElectricMachines(); }
+		}
+
+		protected virtual IElectricMachinesEngineeringInputData GetElectricMachines()
+		{
+			return null;
+		}
+
 		public virtual IBusAuxiliariesDeclarationData BusAuxiliaries
 		{
 			get { return null; }
 		}
 
+		IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage
+		{
+			get { return GetElectricStorage(); }
+		}
+
+		IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines
+		{
+			get { return GetElectricMachines(); }
+		}
+
 		IAxlesDeclarationInputData IVehicleComponentsDeclaration.AxleWheels
 		{
 			get { return this; }

VectoCore/VectoCoreTest/TestData/Hybrids/Battery/GenericBattery.vbat

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Battery",
+    "SOC_min": 20,
+    "SOC_max": 80,
+    "Capacity": 2.5,
+    "InternalResistance": 0.0068,
+    "MaxCurrentFactor": 50,
+    "SOC": [
+      [ 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/Battery/GenericBatteryLarge.vbat

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+	"Model": "Generic Battery",
+	"CellsParallel": 80,
+	"CellsSeries": 200,
+	"InternalResistanceFactor": 1.1,
+	"CellFile": "GenericCell.vcell",
+	"SOC_min": 20,
+    "SOC_max": 80,
+    "Initial_SOC": 80 
+	}
+}
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/Battery/GenericCell.vcell

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "ModelName": "175kW 6.8l Engine",
+    "Capacity": 2.5,
+    "InternalResistance": 0.0068,
+    "MaxCurrentFactor": 50,
+    "SOC": [
+      [ 0, 2.95 ],
+      [ 10, 3.07 ],
+      [ 20, 3.13 ],
+      [ 30, 3.17 ],
+      [ 40, 3.19 ],
+      [ 50, 3.2 ],
+      [ 60, 3.2 ],
+      [ 70, 3.21 ],
+      [ 80, 3.23 ],
+      [ 90, 3.25 ],
+      [ 100, 3.29 ]
+    ]
+  }
+}
\ No newline at end of file

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

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

VectoCore/VectoCoreTest/TestData/Hybrids/ElectricMotor/GenericEMotor.vemp

+n [rpm], T_drive [Nm], T_drag [Nm]
+0, 401.07, -401.07
+1600, 401.07, -401.07
+1665, 401.07, -401.07
+1675, 399.08, -399.08
+1685, 396.71, -396.71
+1695, 394.37, -394.37
+1700, 393.21, -393.21
+1750, 381.97, -381.97
+1800, 371.36, -371.36
+1850, 361.32, -361.32
+1900, 351.82, -351.82
+1950, 342.8, -342.8
+2000, 334.23, -334.23
+2050, 326.07, -326.07
+2100, 318.31, -318.31
+2150, 310.91, -310.91
+2200, 303.84, -303.84
+2250, 297.09, -297.09
+2300, 290.63, -290.63
+2350, 284.45, -284.45
+2400, 278.52, -278.52
+2450, 272.84, -272.84
+2500, 267.38, -267.38
+2550, 262.14, -262.14
+2600, 257.1, -257.1
+2650, 252.25, -252.25
+2700, 247.57, -247.57
+2750, 243.07, -243.07
+2800, 238.73, -238.73
+2850, 234.54, -234.54
+2900, 230.5, -230.5
+2950, 226.59, -226.59
+3000, 222.82, -222.82
+3050, 219.16, -219.16
+3100, 215.63, -215.63
+3150, 212.21, -212.21
+3200, 208.89, -208.89
+3250, 205.68, -205.68
+3300, 202.56, -202.56
+3350, 199.54, -199.54
+3400, 196.6, -196.6
+3450, 193.75, -193.75
+3500, 190.99, -190.99
+3550, 188.3, -188.3
+3600, 185.68, -185.68
+3650, 183.14, -183.14
+3700, 180.66, -180.66
+3750, 178.25, -178.25
+3800, 175.91, -175.91
+3850, 173.62, -173.62
+3900, 171.4, -171.4
+3950, 169.23, -169.23
+4000, 167.11, -167.11
+4050, 165.05, -165.05
+4100, 163.04, -163.04
+4150, 161.07, -161.07
+4200, 159.15, -159.15
+4250, 157.28, -157.28
+4300, 155.45, -155.45
+4350, 153.67, -153.67
+4400, 151.92, -151.92
+4450, 150.21, -150.21
+4500, 148.54, -148.54
+4550, 146.91, -146.91
+4600, 145.32, -145.32
+4650, 143.75, -143.75
+4700, 142.22, -142.22
+4750, 140.73, -140.73
+4800, 139.26, -139.26
+4850, 137.82, -137.82
+4900, 136.42, -136.42
+4950, 135.04, -135.04
+5000, 133.69, -133.69
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Hybrids/ElectricMotor/GenericEMotor240kW.vem

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

VectoCore/VectoCoreTest/TestData/Hybrids/ElectricMotor/GenericEMotor240kW.vemp

+n [rpm], T_drive [Nm], T_drag [Nm]
+0, 802.14, -802.14
+1600, 802.14, -802.14
+1665, 802.14, -802.14
+1675, 798.16, -798.16
+1685, 793.42, -793.42
+1695, 788.74, -788.74
+1700, 786.42, -786.42
+1750, 763.94, -763.94
+1800, 742.72, -742.72
+1850, 722.64, -722.64
+1900, 703.64, -703.64
+1950, 685.6, -685.6
+2000, 668.46, -668.46
+2050, 652.14, -652.14
+2100, 636.62, -636.62
+2150, 621.82, -621.82
+2200, 607.68, -607.68
+2250, 594.18, -594.18
+2300, 581.26, -581.26
+2350, 568.9, -568.9
+2400, 557.04, -557.04
+2450, 545.68, -545.68
+2500, 534.76, -534.76
+2550, 524.28, -524.28
+2600, 514.2, -514.2
+2650, 504.5, -504.5
+2700, 495.14, -495.14
+2750, 486.14, -486.14
+2800, 477.46, -477.46
+2850, 469.08, -469.08
+2900, 461, -461
+2950, 453.18, -453.18
+3000, 445.64, -445.64
+3050, 438.32, -438.32
+3100, 431.26, -431.26
+3150, 424.42, -424.42
+3200, 417.78, -417.78
+3250, 411.36, -411.36
+3300, 405.12, -405.12
+3350, 399.08, -399.08
+3400, 393.2, -393.2
+3450, 387.5, -387.5
+3500, 381.98, -381.98
+3550, 376.6, -376.6
+3600, 371.36, -371.36
+3650, 366.28, -366.28
+3700, 361.32, -361.32
+3750, 356.5, -356.5
+3800, 351.82, -351.82
+3850, 347.24, -347.24
+3900, 342.8, -342.8
+3950, 338.46, -338.46
+4000, 334.22, -334.22
+4050, 330.1, -330.1
+4100, 326.08, -326.08
+4150, 322.14, -322.14
+4200, 318.3, -318.3
+4250, 314.56, -314.56
+4300, 310.9, -310.9
+4350, 307.34, -307.34
+4400, 303.84, -303.84
+4450, 300.42, -300.42
+4500, 297.08, -297.08
+4550, 293.82, -293.82
+4600, 290.64, -290.64
+4650, 287.5, -287.5
+4700, 284.44, -284.44
+4750, 281.46, -281.46
+4800, 278.52, -278.52
+4850, 275.64, -275.64
+4900, 272.84, -272.84
+4950, 270.08, -270.08
+5000, 267.38, -267.38