From 0b6280f75903dc2997d74e02824e0e57e68735ef Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Fri, 20 Feb 2015 14:09:56 +0100
Subject: [PATCH] Torque converter test version with rpm limit * DEV Tab
permanently enabled! * TClimit in DEV tab * Removed unused DEV parameters
---
VECTO/GUI/F_MAINForm.vb | 2 +-
VECTO/Input Files/cGBX.vb | 2 +-
VECTO/VECTO_Global.vb | 2 +-
VECTO/cDEV.vb | 21 ++++++++-------------
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 4e9c4f037e..dca0bc54ae 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -495,7 +495,7 @@ Public Class F_MAINForm
If Lic.TimeWarn Then GUImsg(tMsgID.Warn, "License expiring date (y/m/d): " & Lic.ExpTime)
End If
- DEV.Enabled = Lic.LicFeature(9)
+ DEV.Enabled = True ' Lic.LicFeature(9)
If DEV.Enabled Then
DEV.LoadFromFile()
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index ef9867a8c9..4af4a4fc92 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -467,7 +467,7 @@ Public Class cGBX
nuMax = Math.Min(TCnu(TCdim), nUout / ENG.Nidle)
Else
- nuMin = Math.Max(nUout / FLD(Gear).N95h, TCnu(0))
+ nuMin = Math.Max(nUout / DEV.TClimit, TCnu(0))
nuMax = Math.Min(TCnuMax, nUout / ENG.Nidle)
End If
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 677ec4f012..762eb3f7c6 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -12,7 +12,7 @@ Imports System.Collections.Generic
Module VECTO_Global
- Public Const VECTOvers As String = "2.0.4-beta4 test1"
+ Public Const VECTOvers As String = "2.0.4-beta4 Test"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index 9aec0bda17..c480346dcb 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -18,8 +18,7 @@ Public Class cDEV
Private iOptionsDim As Integer
Public TCiterPrec As Single
- Public TCnUstep As Single
- Public TCnUstepMin As Single
+ Public TClimit As Single
Public AdvFormat As Boolean
@@ -124,18 +123,15 @@ Public Class cDEV
Conf0.SingleVal = 0.001
MyOptions.Add("TCiterPrec", Conf0)
- Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: start value for nU-step [1/min]")
- Conf0.SingleVal = 100
- MyOptions.Add("TCnUstep", Conf0)
-
- Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: lowest value for nU-step [1/min]")
- Conf0.SingleVal = 0.01
- MyOptions.Add("TCnUstepMin", Conf0)
-
- Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Better output files format")
+ Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Detailed output files format")
Conf0.BoolVal = False
MyOptions.Add("AdvFormat", Conf0)
+
+ Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Max. engine speed for torque converter operation")
+ Conf0.SingleVal = 1600
+ MyOptions.Add("TClimit", Conf0)
+
'**************************** END: Parameters Configuration '*****************************
'*****************************************************************************************
'*****************************************************************************************
@@ -147,9 +143,8 @@ Public Class cDEV
'Initialize the actual Config-Parameters from MyConfigs list
Public Sub SetOptions()
TCiterPrec = MyOptions("TCiterPrec").SingleVal
- TCnUstep = MyOptions("TCnUstep").SingleVal
- TCnUstepMin = MyOptions("TCnUstepMin").SingleVal
AdvFormat = MyOptions("AdvFormat").BoolVal
+ TClimit = MyOptions("TClimit").SingleVal
End Sub
'Demo for Delegate Function
--
GitLab