Skip to content

Commit

Permalink
v8.2.1 RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanWBR
DanWBR committed Oct 8, 2022
1 parent b8311ca commit a636e54
Show file tree
Hide file tree
Showing 86 changed files with 881 additions and 762 deletions.
4 changes: 4 additions & 0 deletions DWSIM.Automation.Tests.CSharp/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 4 additions & 0 deletions DWSIM.Automation.Tests/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions DWSIM.Automation.Tests/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyFileVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
<Assembly: AssemblyFileVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Automation/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
4 changes: 4 additions & 0 deletions DWSIM.Automation/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
2 changes: 1 addition & 1 deletion DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>

<Assembly: NeutralResourcesLanguageAttribute("en")>
2 changes: 1 addition & 1 deletion DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
2 changes: 1 addition & 1 deletion DWSIM.DynamicsManager/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
2 changes: 1 addition & 1 deletion DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
4 changes: 2 additions & 2 deletions DWSIM.FileStorage/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyFileVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
[assembly: AssemblyFileVersion("8.2.1.0")]
2 changes: 2 additions & 0 deletions DWSIM.FlowsheetBase/FlowsheetBase.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ Imports System.Text.RegularExpressions
'OBJETO DWSIM
Dim myCOMS As Thermodynamics.Streams.MaterialStream = New Thermodynamics.Streams.MaterialStream(myMStr.Name, "CorrentedeMatria", Me, Nothing)
myCOMS.GraphicObject = myMStr
AddCompoundsToMaterialStream(myCOMS)
SimulationObjects.Add(myCOMS.Name, myCOMS)

Case ObjectType.EnergyStream
Expand Down Expand Up @@ -3386,6 +3387,7 @@ Label_00CC:

If Not GlobalSettings.Settings.PythonInitialized Then

Runtime.PythonDLL = GlobalSettings.Settings.PythonPath
PythonEngine.Initialize()
GlobalSettings.Settings.PythonInitialized = True
PythonEngine.BeginAllowThreads()
Expand Down
2 changes: 1 addition & 1 deletion DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
60 changes: 59 additions & 1 deletion DWSIM.FlowsheetSolver/FlowsheetSolver.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ Public Delegate Sub CustomEvent2(ByVal objinfo As CalculationArgs)
Dim lists As New Dictionary(Of Integer, List(Of String))
Dim filteredlist As New Dictionary(Of Integer, List(Of String))
Dim objstack As New List(Of String)
Dim recycleloops As New List(Of List(Of String))

Dim onqueue As CalculationArgs = Nothing

Expand Down Expand Up @@ -973,7 +974,64 @@ Public Delegate Sub CustomEvent2(ByVal objinfo As CalculationArgs)
Return New Object() {newstack, lists, newfilteredlist}
End If

Return New Object() {objstack, lists, filteredlist}
Dim recycles = objstack.Where(Function(o) fbag.SimulationObjects(o).GraphicObject.ObjectType = ObjectType.OT_Recycle).ToList()

'find recycle loops

Dim tmplists As New List(Of List(Of String))

For Each r In recycles

listidx = 0

tmplists.Clear()

tmplists.Add(New List(Of String))

Dim nextobj = fbag.SimulationObjects(r).GraphicObject.OutputConnectors(0).AttachedConnector.AttachedTo.Name

tmplists(0).Add(nextobj)

'now start walking through the flowsheet until it reaches its end starting from this particular object.

Do
listidx += 1
If tmplists(listidx - 1).Count > 0 Then
tmplists.Add(New List(Of String))
maxidx = listidx
For Each o As String In tmplists(listidx - 1)
obj = fbag.SimulationObjects(o)
If obj.GraphicObject.Active Then
For Each c As IConnectionPoint In obj.GraphicObject.OutputConnectors
If c.IsAttached Then
If obj.GraphicObject.ObjectType = ObjectType.OT_Recycle Or obj.GraphicObject.ObjectType = ObjectType.OT_EnergyRecycle Then
Exit For
End If
tmplists(listidx).Add(c.AttachedConnector.AttachedTo.Name)
End If
Next
If obj.GraphicObject.EnergyConnector.IsAttached AndAlso obj.GraphicObject.EnergyConnector.AttachedConnector.AttachedTo IsNot obj Then
tmplists(listidx).Add(obj.GraphicObject.EnergyConnector.AttachedConnector.AttachedTo.Name)
End If
End If
Next
Else
Exit Do
End If
Loop

Dim rloop As New List(Of String)
For Each l In tmplists
For Each item In l
rloop.Add(item)
Next
Next

recycleloops.Add(rloop)

Next

Return New Object() {objstack, lists, filteredlist, recycleloops}

End Function

Expand Down
2 changes: 1 addition & 1 deletion DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.GlobalSettings/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
58 changes: 42 additions & 16 deletions DWSIM.GlobalSettings/Settings.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,25 +181,51 @@ Public Class Settings

If Not Settings.PythonInitialized Then

If pythonpath = "" Then
pythonpath = Settings.PythonPath
End If
If Settings.RunningPlatform() = Platform.Windows Then

If pythonpath = "" Then
pythonpath = Settings.PythonPath
End If

If Not Directory.Exists(pythonpath) Then
Throw New Exception("Python binaries Path is not defined correctly.")
End If

Try
SetPythonPath(pythonpath)
PythonEngine.PythonHome = pythonpath
PythonEngine.Initialize()
PythonEngine.BeginAllowThreads()
PythonInitialized = True
DWSIM.Logging.Logger.LogInfo("Python Path set to " + pythonpath)
Catch ex As Exception
DWSIM.Logging.Logger.LogError("Python Initialization Error", ex)
Throw ex
End Try

Else

If pythonpath = "" Then
pythonpath = Settings.PythonPath
End If

If Not File.Exists(pythonpath) Then
Throw New Exception("Python Library File is not defined correctly.")
End If

Try
Runtime.PythonDLL = pythonpath
PythonEngine.Initialize()
PythonEngine.BeginAllowThreads()
PythonInitialized = True
DWSIM.Logging.Logger.LogInfo("Python Library Path set to " + pythonpath)
Catch ex As Exception
DWSIM.Logging.Logger.LogError("Python Initialization Error", ex)
Throw ex
End Try

If Not Directory.Exists(pythonpath) Then
Throw New Exception("Python binaries Path is not defined correctly.")
End If

Try
SetPythonPath(pythonpath)
PythonEngine.PythonHome = pythonpath
PythonEngine.Initialize()
PythonEngine.BeginAllowThreads()
PythonInitialized = True
DWSIM.Logging.Logger.LogInfo("Python Path set to " + pythonpath)
Catch ex As Exception
DWSIM.Logging.Logger.LogError("Python Initialization Error", ex)
Throw ex
End Try

End If

Expand Down
4 changes: 2 additions & 2 deletions DWSIM.Inspector/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyFileVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
<Assembly: AssemblyFileVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Interfaces/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Libraries.OctaveSharp/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
2 changes: 1 addition & 1 deletion DWSIM.Libraries.PythonLink/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
4 changes: 2 additions & 2 deletions DWSIM.Logging/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyFileVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
[assembly: AssemblyFileVersion("8.2.1.0")]
2 changes: 1 addition & 1 deletion DWSIM.Math/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
4 changes: 2 additions & 2 deletions DWSIM.ProFeatures/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyFileVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
<Assembly: AssemblyFileVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Serializers.XML/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.SharedClasses/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.SharedClasses/My Project/Settings.Designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions DWSIM.SharedClasses/Patrons/activepatrons.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Andras Nady
Anders Andreasen
Andrew Dickson
Bruce Rising
Bryan Evans
Carlos G. C. Reetz
Casey Houston
Chris Verbert
Expand Down
4 changes: 4 additions & 0 deletions DWSIM.Tests/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyVersion("8.2.1.0")]
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.2.0.0")>
<Assembly: AssemblyVersion("8.2.1.0")>

<Assembly: NeutralResourcesLanguageAttribute("en")>
Loading

0 comments on commit a636e54

Please sign in to comment.