From 68730232be60668c93c83ab6d646db19b834d6bf Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 10 Jun 2021 13:14:11 +0200
Subject: [PATCH] bugfix testcase PEV E2 Limited ContPwr
(cherry picked from commit 1814059b7018b7d5fdd896ac2c5b87cfa918af1f)
---
.../VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs | 8 ++++----
.../GenericEMotor_125kW_485Nm_Cont30kW.vem | 8 +++++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
index 276238786a..91d04d5381 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
@@ -12,19 +12,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON {
public JSONElectricMotorV2(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
public override NewtonMeter ContinuousTorque {
- get { return Body.GetValueOrDefault<double>("ContinuousTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+ get { return Body.GetEx<double>("ContinuousTorque").SI<NewtonMeter>(); }
}
public override PerSecond ContinuousTorqueSpeed {
- get { return Body.GetValueOrDefault<double>("ContinuousTorqueSpeed")?.RPMtoRad(); }
+ get { return Body.GetEx<double>("ContinuousTorqueSpeed").RPMtoRad(); }
}
public override NewtonMeter OverloadTorque {
- get { return Body.GetValueOrDefault<double>("OverloadTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+ get { return Body.GetEx<double>("OverloadTorque").SI<NewtonMeter>(); }
}
public override PerSecond OverloadTestSpeed {
- get { return Body.GetValueOrDefault<double>("OverloadTorqueSpeed")?.RPMtoRad(); }
+ get { return Body.GetEx<double>("OverloadTorqueSpeed").RPMtoRad(); }
}
}
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem
index ad3eeb3dfa..c173c5fc54 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem
@@ -3,7 +3,7 @@
"CreatedBy": " ()",
"Date": "2016-10-13T08:54:28.7387223Z",
"AppVersion": "3",
- "FileVersion": 1
+ "FileVersion": 2
},
"Body": {
"SavedInDeclMode": false,
@@ -12,8 +12,10 @@
"DragCurve": "GenericDrag_125kW_485Nm.vemd",
"EfficiencyMap": "GenericMap_125kW_485Nm.vemo",
"Inertia": 0.225,
- "ContinuousPower": 30000,
- "ContinuousPowerSpeed": 2000,
+ "ContinuousTorque": 145,
+ "ContinuousTorqueSpeed": 2000,
+ "OverloadTorque": 485,
+ "OverloadTorqueSpeed": 2000,
"OverloadTime": 30,
"ThermalOverloadRecoveryFactor": 0.9
}
--
GitLab