Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 09afe040 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #230 in VECTO/vecto-sim from master to develop

* commit '263ebfb8':
  do not read default.vtcc in vecto 2.2 (drag part, nu >= 1)
parents 4134bbe2 263ebfb8
No related branches found
No related tags found
No related merge requests found
......@@ -391,12 +391,12 @@ Public Class cGBX
Do While Not file.EndOfFile
line = file.ReadLine
TCnuMax = CSng(line(0))
If CSng(line(0)) < 1 Then
TCnu.Add(TCnuMax)
TCmu.Add(CSng(line(1)))
TCtorque.Add(CSng(line(2)))
TCdim += 1
End If
'If CSng(line(0)) < 1 Then '@@@quam: read the complete file!
TCnu.Add(TCnuMax)
TCmu.Add(CSng(line(1)))
TCtorque.Add(CSng(line(2)))
TCdim += 1
'End If
Loop
Catch ex As Exception
WorkerMsg(tMsgID.Err, "Error while reading Torque Converter file! (" & ex.Message & ")", MsgSrc)
......@@ -413,29 +413,31 @@ Public Class cGBX
If TCnuMax > 1 Then TCnuMax = 1
'Add default values for nu>1
If Not file.OpenRead(MyDeclPath & "DefaultTC.vtcc") Then
WorkerMsg(tMsgID.Err, "Default Torque Converter file not found!", MsgSrc)
Return False
End If
If False Then ' @@@quam: don'r read default tcc file
'Add default values for nu>1
If Not file.OpenRead(MyDeclPath & "DefaultTC.vtcc") Then
WorkerMsg(tMsgID.Err, "Default Torque Converter file not found!", MsgSrc)
Return False
End If
'Skip Header
file.ReadLine()
'Skip Header
file.ReadLine()
Try
Do While Not file.EndOfFile
line = file.ReadLine
TCnu.Add(CSng(line(0)))
TCmu.Add(CSng(line(1)))
TCtorque.Add(CSng(line(2)))
TCdim += 1
Loop
Catch ex As Exception
WorkerMsg(tMsgID.Err, "Error while reading Default Torque Converter file! (" & ex.Message & ")", MsgSrc)
Return False
End Try
Try
Do While Not file.EndOfFile
line = file.ReadLine
TCnu.Add(CSng(line(0)))
TCmu.Add(CSng(line(1)))
TCtorque.Add(CSng(line(2)))
TCdim += 1
Loop
Catch ex As Exception
WorkerMsg(tMsgID.Err, "Error while reading Default Torque Converter file! (" & ex.Message & ")", MsgSrc)
Return False
End Try
file.Close()
file.Close()
End If
Return True
End Function
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment