diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb index 4e9c4f037ea934ac95fd327be5d123af0cd4a275..dca0bc54aee30384fe9e9ed826c5d22ab35c42c5 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 ef9867a8c9f98533b8edb77d318c2cf75489ecaf..4af4a4fc920d3760d670b8d59e7285c9094a931a 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 677ec4f0125e6c8ec3edfbd5e0f532bea546def3..762eb3f7c69c02aa56e54725f7816c964ba3a486 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 9aec0bda17d2c278470780b88c1c491450b9f8c4..c480346dcbfc4b24225f559f637fb55b1c5f4f3e 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