Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[*.vb]
tab_width = 4
indent_size = 4
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true

# IDE1006: Naming Styles
dotnet_diagnostic.IDE1006.severity = none
7 changes: 6 additions & 1 deletion BlueM.Opt.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.6.11806.211 stable
VisualStudioVersion = 18.6.11806.211
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlueM.Opt.Algos", "BlueM.Opt.Algos", "{44D440EE-4641-44A1-B177-2DD0FDD6FB75}"
EndProject
Expand Down Expand Up @@ -38,6 +38,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlueM.Opt.Tests", "BlueM.Op
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BlueM.Opt.Tests", "BlueM.Opt\Tests\BlueM.Opt.Tests\BlueM.Opt.Tests.vbproj", "{BBDDC177-F059-4139-9A0E-C4B7D03F2786}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A9D3221-E48E-4A26-9F13-090359144136}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down
17 changes: 17 additions & 0 deletions BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,20 @@
</None>
<Compile Include="SWMM\SWMM.vb" />
<Compile Include="SWMM\SWMMThread.vb" />
<Compile Include="TALSIM\TALSIM5.vb" />
<Compile Include="TALSIM\TALSIM.vb" />
<Compile Include="TALSIM\TALSIM5Thread.vb" />
<Compile Include="TALSIM\TALSIM5_Dialog.Designer.vb">
<DependentUpon>TALSIM5_Dialog.vb</DependentUpon>
</Compile>
<Compile Include="TALSIM\TALSIM5_Dialog.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="TALSIM\TALSIMThread.vb" />
<Compile Include="Testprobleme\Testprobleme.vb" />
<None Include="TALSIM\talsim5.run">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="My Project\Resources.resx">
Expand All @@ -128,6 +139,9 @@
<CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="TALSIM\TALSIM5_Dialog.resx">
<DependentUpon>TALSIM5_Dialog.vb</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="My Project\Application.myapp">
Expand Down Expand Up @@ -192,6 +206,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite">
<Version>10.0.8</Version>
</PackageReference>
<PackageReference Include="Steema.TeeChart.NET">
<Version>4.2023.4.18</Version>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions BlueM.Opt/Apps/Sim.vb
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ Public MustInherit Class Sim

'ModellParameter aus OptParametern errechnen
'*******************************************
Private Sub OptParameter_to_ModellParameter()
Protected Sub OptParameter_to_ModellParameter()
Dim i As Integer
Dim j As Integer

Expand All @@ -555,7 +555,7 @@ Public MustInherit Class Sim

'Die ModellParameter in die Eingabedateien des SimModells schreiben
'******************************************************************
Public Sub Write_ModellParameter()
Public Overridable Sub Write_ModellParameter()

Dim WertStr As String
Dim AnzZeichen, AnzNachkomma As Short
Expand Down
22 changes: 12 additions & 10 deletions BlueM.Opt/Apps/TALSIM/TALSIM.vb
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ Public Class Talsim

#Region "Eigenschaften"

Private exe_path As String
Private ReadOnly exe_path As String

''' <summary>
''' List of result file extensions to use (e.g. "WEL", "KTR.WEL", "CHLO.WEL", "WBL", etc.)
''' </summary>
Private resultFiles As List(Of String)
Private ReadOnly resultFiles As List(Of String)

'**** Multithreading ****
Dim MyTalsimThreads() As TalsimThread
Expand Down Expand Up @@ -264,8 +264,9 @@ Public Class Talsim

Folder = getThreadWorkDir(Thread_ID)
MyTalsimThreads(Thread_ID) = New TalsimThread(Thread_ID, Child_ID, Folder, Datensatz)
MyThreads(Thread_ID) = New Thread(AddressOf MyTalsimThreads(Thread_ID).launchSim)
MyThreads(Thread_ID).IsBackground = True
MyThreads(Thread_ID) = New Thread(AddressOf MyTalsimThreads(Thread_ID).launchSim) With {
.IsBackground = True
}
MyThreads(Thread_ID).Start()
launchSim = True

Expand Down Expand Up @@ -325,12 +326,13 @@ Public Class Talsim
Dim errfile As String = IO.Path.Combine(Me.WorkDir_Current, Me.Datensatz & ".err")
Dim simendfile As String = IO.Path.Combine(Me.WorkDir_Current, Me.Datensatz & ".SIMEND")
Dim proc As Process
Dim startInfo As New ProcessStartInfo()
startInfo.FileName = Me.exe_path
startInfo.Arguments = runfilename
startInfo.UseShellExecute = True
startInfo.WindowStyle = ProcessWindowStyle.Hidden
startInfo.WorkingDirectory = IO.Path.GetDirectoryName(Me.exe_path)
Dim startInfo As New ProcessStartInfo With {
.FileName = Me.exe_path,
.Arguments = runfilename,
.UseShellExecute = True,
.WindowStyle = ProcessWindowStyle.Hidden,
.WorkingDirectory = IO.Path.GetDirectoryName(Me.exe_path)
}
'start
proc = Process.Start(startInfo)
'DEBUG: write to log
Expand Down
Loading
Loading