From 19bcdbf84a8789251d5fc7ccc3a230eeac19fff7 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 31 Aug 2020 17:38:22 +0200
Subject: [PATCH] add new model parameters to testdata vehicles

---
 .../Class2_RigidTruck.vveh                    | 25 ++++++++++---------
 .../Vehicle/Group5_HEV.vveh                   |  1 +
 .../Hyb_P2_Group2/Class2_RigidTruck.vveh      |  1 +
 .../Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh  |  1 +
 .../Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh    |  1 +
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
index 3f9f31e198..64c7eb1d99 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group2_P2/Class2_RigidTruck.vveh
@@ -9,7 +9,7 @@
     "SavedInDeclMode": false,
     "VehCat": "RigidTruck",
     "LegislativeClass": "Unknown",
-	"PowertrainConfiguration": "ParallelHybrid",
+    "PowertrainConfiguration": "ParallelHybrid",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
@@ -32,19 +32,20 @@
       "LossMap": "",
       "Cycle": ""
     },
-	"ElectricMotors": [
-        {
-          "Count": 1,
-          "Ratio": 1,
-          "MechanicalEfficiency":  1, 
-          "Position": "P2",
-          "MotorFile": "GenericEMotor240kW.vem"
-        }
+    "ElectricMotors": [
+      {
+        "Count": 1,
+        "Ratio": 1,
+        "MechanicalEfficiency": 1,
+        "Position": "P2",
+        "MotorFile": "GenericEMotor240kW.vem"
+      }
     ],
-    "Battery": { 
-        "NumPacks": 2,
-        "BatteryFile": "GenericBattery.vbat"
+    "Battery": {
+      "NumPacks": 2,
+      "BatteryFile": "GenericBattery.vbat"
     },
+    "MaxDrivetrainPower": 180.0,
     "InitialSoC": 80,
     "TorqueLimits": {},
     "IdlingSpeed": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
index c57a24d521..34fa21cb6c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/Vehicle/Group5_HEV.vveh
@@ -91,6 +91,7 @@
     "TorqueLimits": {},
     "InitialSoC": 80.0,
     "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 325.0,
     "ElectricMotors": [
       {
         "Count": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
index 5b029af853..10d6e3ef09 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group2/Class2_RigidTruck.vveh
@@ -82,6 +82,7 @@
     "TorqueLimits": {},
     "InitialSoC": 50.0,
     "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 180.0,
     "ElectricMotors": [
       {
         "Count": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
index 51f5e37aca..51e29c5cfd 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5.vveh
@@ -91,6 +91,7 @@
     "TorqueLimits": {},
     "InitialSoC": 80.0,
     "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 325.0,
     "ElectricMotors": [
       {
         "Count": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
index c076acdcb3..2a2a908a29 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vveh
@@ -91,6 +91,7 @@
     "TorqueLimits": {},
     "InitialSoC": 80.0,
     "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 325.0,
     "ElectricMotors": [
       {
         "Count": 1,
-- 
GitLab