Merge branch 'DanWBR:windows' into windows

.gitignore

@@ -110,3 +110,11 @@ TCPServer/bin/Debug/*
 /DWSIM.Inspector/.vs
 /DWSIM.SharedClasses/.vs
 /DWSIM.Thermodynamics.ReaktoroPropertyPackage/.vs
+/DWSIM.DrawingTools.Point/.vs
+/DWSIM.DrawingTools.SkiaSharp.Tests/.vs
+/DWSIM.ExtensionMethods/.vs
+/DWSIM.FlowsheetBase/.vs
+/DWSIM.Math.SwarmOps/.vs
+/DWSIM.Plugins.HeatOfCombustion/.vs
+/DWSIM.ProFeatures/.vs
+/DWSIM.Thermodynamics/.vs

DWSIM.DynamicsManager/Manager.vb

@@ -23,6 +23,7 @@ Imports OxyPlot.Axes
 Imports DWSIM.SharedClasses.SystemsOfUnits
 Imports interp = DWSIM.MathOps.MathEx.Interpolation
 Imports cv = DWSIM.SharedClasses.SystemsOfUnits.Converter
+Imports OxyPlot.Series
 
 Public Class Manager
 
@@ -124,15 +125,6 @@ Public Class Manager
             .Title = String.Format("Time ({0})", su.time)
         })
 
-        model.Axes.Add(New LinearAxis() With {
-            .MajorGridlineStyle = LineStyle.Dash,
-            .MinorGridlineStyle = LineStyle.Dot,
-            .Position = AxisPosition.Left,
-            .FontSize = 10,
-            .Title = "",
-            .Key = "0"
-        })
-
         model.LegendFontSize = 10
         model.LegendPlacement = LegendPlacement.Outside
         model.LegendOrientation = LegendOrientation.Horizontal
@@ -143,6 +135,21 @@ Public Class Manager
             Return model
         End If
 
+        i = 0
+        For Each item In integrator.MonitoredVariables
+            model.Axes.Add(New LinearAxis() With {
+                .MajorGridlineStyle = LineStyle.Dash,
+                .MinorGridlineStyle = LineStyle.Dot,
+                .Position = AxisPosition.Left,
+                .FontSize = 10,
+                .Key = item.ID,
+                .Title = integrator.MonitoredVariables(i).Description + If(item.PropertyUnits <> "", " (" + item.PropertyUnits + ")", ""),
+                .PositionTier = i,
+                .AxislineStyle = LineStyle.Solid
+            })
+            i += 1
+        Next
+
         Dim values As New List(Of List(Of Double))
         Dim names As New List(Of String)
         For Each var In integrator.MonitoredVariables
@@ -165,6 +172,8 @@ Public Class Manager
         i = 0
         For Each l In values
             model.AddLineSeries(xavals, l, names(i))
+            DirectCast(model.Series(model.Series.Count - 1), LineSeries).Tag = integrator.MonitoredVariables(i).ID
+            DirectCast(model.Series(model.Series.Count - 1), LineSeries).YAxisKey = integrator.MonitoredVariables(i).ID
             i += 1
         Next
 

DWSIM.ExtensionMethods/General.vb

@@ -39,6 +39,20 @@ Public Module General
 
     End Function
 
+    <System.Runtime.CompilerServices.Extension()>
+    Public Function Chunk(Of T)(ByVal locations As List(Of T), ByVal Optional nSize As Integer = 30) As List(Of List(Of T))
+
+        Dim list = New List(Of List(Of T))()
+        Dim i As Integer = 0
+        While i < locations.Count
+            list.Add(locations.GetRange(i, Math.Min(nSize, locations.Count - i)))
+            i += nSize
+        End While
+
+        Return list
+
+    End Function
+
 
     <System.Runtime.CompilerServices.Extension()>
     Public Sub RemoveVariable(exobj As System.Dynamic.ExpandoObject, varname As String)

DWSIM.FlowsheetSolver/FlowsheetSolver.vb

@@ -1079,6 +1079,22 @@ Public Delegate Sub CustomEvent2(ByVal objinfo As CalculationArgs)
                 listidx -= 1
             Loop
 
+            'special loop for batch unit ops in dynamic mode
+
+            If fbag.DynamicMode Then
+                For Each baseobj In fbag.SimulationObjects.Values
+                    If TypeOf baseobj Is IUnitOperation AndAlso baseobj.SupportsDynamicMode Then
+                        Dim inletconnected = baseobj.GraphicObject.InputConnectors.Where(Function(c) c.IsAttached).Count
+                        Dim outletconnected = baseobj.GraphicObject.OutputConnectors.Where(Function(c) c.IsAttached).Count
+                        Dim n_inlets = baseobj.GraphicObject.InputConnectors.Count
+                        Dim n_outlets = baseobj.GraphicObject.OutputConnectors.Count
+                        If inletconnected = 0 And outletconnected = 0 And (n_inlets + n_outlets) > 0 Then
+                            objstack.Add(baseobj.Name)
+                        End If
+                    End If
+                Next
+            End If
+
         End If
 
         Return New Object() {objstack, lists, filteredlist}
@@ -1186,11 +1202,25 @@ Public Delegate Sub CustomEvent2(ByVal objinfo As CalculationArgs)
 
             Dim objl As Object()
             Try
+
                 objl = GetSolvingList(fobj, frompgrid)
+
             Catch ex As Exception
+
                 FinishAny?.Invoke()
-                GlobalSettings.Settings.CalculatorBusy = False
+                FinishWithErrors?.Invoke()
+
+                Settings.CalculatorBusy = False
+
+                Dim euid As String = Guid.NewGuid().ToString()
+                ExceptionProcessing.ExceptionList.Exceptions.Add(euid, ex)
+
+                fgui.ShowMessage(ex.Message, IFlowsheet.MessageType.GeneralError, euid)
+                IObj?.Paragraphs.Add(ex.Message)
+
+                RaiseEvent FlowsheetCalculationFinished(fobj, New System.EventArgs(), New List(Of Exception)({ex}))
                 Return New List(Of Exception)({ex})
+
             End Try
 
             'assign the list of objects, the filtered list (which contains no duplicate elements) and the object stack

DWSIM.Interfaces/IFlowsheetOptions.vb

@@ -146,4 +146,6 @@ Imports DWSIM.Interfaces.Enums.GraphicObjects
 
     Property EnabledUndoRedo As Boolean
 
+    Property EnableGHGEmissionsSubsystem As Boolean
+
 End Interface

DWSIM.SharedClasses/BaseClass/SimulationObjectBaseClasses.vb

@@ -1,5 +1,5 @@
 '    Flowsheet Object Base Classes 
-'    Copyright 2008-2020 Daniel Wagner O. de Medeiros
+'    Copyright 2008-2024 Daniel Wagner O. de Medeiros
 '
 '    This file is part of DWSIM.
 '
@@ -719,13 +719,17 @@ Namespace UnitOperations
                 proplist.Add(item.Key)
             Next
 
-            If proptype <> PropertyType.WR Then
-                proplist.Add("GHG Emission Factor")
-                proplist.Add("GHG Mass Emission")
-                proplist.Add("GHG Molar Emission")
-                proplist.Add("CO2eq GHG Mass Emission")
-                proplist.Add("CO2eq GHG Molar Emission")
-                proplist.Add("GHG Emission Reference Power Value")
+            If FlowSheet IsNot Nothing Then
+                If FlowSheet.FlowsheetOptions.EnableGHGEmissionsSubsystem Then
+                    If proptype <> PropertyType.WR Then
+                        proplist.Add("GHG Emission Factor")
+                        proplist.Add("GHG Mass Emission")
+                        proplist.Add("GHG Molar Emission")
+                        proplist.Add("CO2eq GHG Mass Emission")
+                        proplist.Add("CO2eq GHG Molar Emission")
+                        proplist.Add("GHG Emission Reference Power Value")
+                    End If
+                End If
             End If
 
             For Each item In AttachedUtilities

DWSIM.SharedClasses/Flowsheet/FlowsheetClasses.vb

@@ -289,6 +289,8 @@ Namespace DWSIM.Flowsheet
 
         Public Property EnabledUndoRedo As Boolean = False Implements IFlowsheetOptions.EnabledUndoRedo
 
+        Public Property EnableGHGEmissionsSubsystem As Boolean = False Implements IFlowsheetOptions.EnableGHGEmissionsSubsystem
+
     End Class
 
     <System.Serializable()> Public Class FlowsheetResults

DWSIM.SharedClasses/Patrons/activepatrons.txt

@@ -37,6 +37,7 @@
 🌟 Roland Berger
 🌟 Ronald J. Dunbar
 🌟 Ronald Visness
+🌟 Simone Vidille
 🌟 Tech-Rudra
 Alberto Baumeister
 Alex Michinel