Conversion Reactor bug fixes

DanWBR · Jan 3, 2018 · 853865d · 853865d
1 parent ef59564
commit 853865d
Show file tree

Hide file tree

Showing 8 changed files with 191 additions and 128 deletions.
diff --git a/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("DWSIM.UI")]
-[assembly: AssemblyDescription("Cross-Platform User Interface for DWSIM Simulator")]
+[assembly: AssemblyDescription("DWSIM Simulator (Cross Platform GUI Launcher)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("DWSIM Project")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright © 2017 Daniel Medeiros")]
+[assembly: AssemblyCopyright("Copyright © 2017-2018 Daniel Medeiros")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("DWSIM.UI.Desktop")]
-[assembly: AssemblyDescription("Cross-Platform User Interface for DWSIM Simulator")]
+[assembly: AssemblyDescription("DWSIM Simulator (Cross-Platform GUI Launcher)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("DWSIM Project")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright © 2017 Daniel Medeiros")]
+[assembly: AssemblyCopyright("Copyright © 2017-2018 Daniel Medeiros")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/DWSIM.UnitOperations/Reactors/BaseReactor.vb b/DWSIM.UnitOperations/Reactors/BaseReactor.vb
@@ -35,7 +35,7 @@ Namespace Reactors
 
         Inherits UnitOperations.UnitOpBaseClass
 
-        Protected m_reactionSequence As SortedList(Of Integer, ArrayList)
+        Protected m_reactionSequence As List(Of List(Of String))
         Protected m_reactions As List(Of String)
         Protected m_conversions As Dictionary(Of String, Double)
         Protected m_componentconversions As Dictionary(Of String, Double)
@@ -51,14 +51,6 @@ Namespace Reactors
             MyBase.LoadData(data)
             Dim ci As Globalization.CultureInfo = Globalization.CultureInfo.InvariantCulture
 
-            For Each xel2 As XElement In (From xel As XElement In data Select xel Where xel.Name = "ReactionSequence").Elements
-                m_reactionSequence.Add(xel2.@Index, XMLSerializer.XMLSerializer.StringToArray(xel2.Value, ci))
-            Next
-
-            For Each xel2 As XElement In (From xel As XElement In data Select xel Where xel.Name = "Reaction").Elements
-                m_reactions.Add(xel2.@ID)
-            Next
-
             For Each xel2 As XElement In (From xel As XElement In data Select xel Where xel.Name = "ReactionConversions").Elements
                 m_conversions.Add(xel2.@ID, Double.Parse(xel2.Value, ci))
             Next
@@ -75,14 +67,6 @@ Namespace Reactors
             Dim ci As Globalization.CultureInfo = Globalization.CultureInfo.InvariantCulture
 
             With elements
-                .Add(New XElement("ReactionSequence"))
-                For Each kvp As KeyValuePair(Of Integer, ArrayList) In m_reactionSequence
-                    .Item(.Count - 1).Add(New XElement("Item", New XAttribute("Index", kvp.Key), XMLSerializer.XMLSerializer.ArrayToString(kvp.Value, ci)))
-                Next
-                .Add(New XElement("Reactions"))
-                For Each s As String In m_reactions
-                    .Item(.Count - 1).Add(New XElement("Reaction", New XAttribute("ID", s)))
-                Next
                 .Add(New XElement("ReactionConversions"))
                 For Each kvp As KeyValuePair(Of String, Double) In m_conversions
                     .Item(.Count - 1).Add(New XElement("Reaction", New XAttribute("ID", kvp.Key), kvp.Value.ToString(ci)))
@@ -187,19 +171,19 @@ Namespace Reactors
 
         Sub New()
             MyBase.CreateNew()
-            Me.m_reactionSequence = New SortedList(Of Integer, ArrayList)
+            Me.m_reactionSequence = New List(Of List(Of String))
             Me.m_reactions = New List(Of String)
             Me.m_conversions = New Dictionary(Of String, Double)
             Me.m_componentconversions = New Dictionary(Of String, Double)
         End Sub
 
         Public Property OutletTemperature As Double = 298.15#
 
-        <Xml.Serialization.XmlIgnore()> Public Property ReactionsSequence() As SortedList(Of Integer, ArrayList)
+        <Xml.Serialization.XmlIgnore()> Public Property ReactionsSequence() As List(Of List(Of String))
             Get
                 Return m_reactionSequence
             End Get
-            Set(ByVal value As SortedList(Of Integer, ArrayList))
+            Set(ByVal value As List(Of List(Of String)))
                 m_reactionSequence = value
             End Set
         End Property

diff --git a/DWSIM.UnitOperations/Reactors/CSTR.vb b/DWSIM.UnitOperations/Reactors/CSTR.vb
@@ -146,7 +146,7 @@ Namespace Reactors
 
             'loop through reactions
             Dim rxn As Reaction
-            Dim ar As ArrayList = Me.ReactionsSequence(activeAL)
+            Dim ar = Me.ReactionsSequence(activeAL)
 
             i = 0
             Do
@@ -871,13 +871,13 @@ out:        Dim ms1, ms2 As MaterialStream
 
                 'ordering of parallel reactions
                 i = 0
-                Dim arr As New ArrayList
+                Dim arr As New List(Of String)
                 Do
-                    arr = New ArrayList
+                    arr = New List(Of String)
                     For Each rxnsb As ReactionSetBase In FlowSheet.ReactionSets(Me.ReactionSetID).Reactions.Values
                         If rxnsb.Rank = i And Me.Reactions.Contains(rxnsb.ReactionID) Then arr.Add(rxnsb.ReactionID)
                     Next
-                    If arr.Count > 0 Then Me.ReactionsSequence.Add(i, arr)
+                    If arr.Count > 0 Then Me.ReactionsSequence.Add(arr)
                     i = i + 1
                 Loop Until i = maxrank + 1
 
@@ -911,7 +911,7 @@ out:        Dim ms1, ms2 As MaterialStream
                 Hr = ims.Phases(0).Properties.enthalpy.GetValueOrDefault * W
 
                 'loop through reactions
-                For Each ar As ArrayList In Me.ReactionsSequence.Values
+                For Each ar In Me.ReactionsSequence
 
                     DHr = 0
 
@@ -970,7 +970,7 @@ out:        Dim ms1, ms2 As MaterialStream
                     Ri.Clear()
                     Rxi.Clear()
 
-                    Me.activeAL = Me.ReactionsSequence.IndexOfValue(ar)
+                    Me.activeAL = Me.ReactionsSequence.IndexOf(ar)
 
                     'solve ODEs
 
@@ -1147,7 +1147,7 @@ out:        Dim ms1, ms2 As MaterialStream
             RxiT.Clear()
             DHRi.Clear()
 
-            For Each ar As ArrayList In Me.ReactionsSequence.Values
+            For Each ar In Me.ReactionsSequence
 
                 i = 0
                 Do