Merge branch 'DanWBR:windows' into windows

msiahaan · May 25, 2024 · bfe78d0 · bfe78d0
2 parents e48d330 + db34e64
commit bfe78d0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/DWSIM.SharedClasses/Patrons/activepatrons.txt b/DWSIM.SharedClasses/Patrons/activepatrons.txt
@@ -8,24 +8,25 @@
 🌟 Alberto Marzi
 🌟 Bernhard Seyfang
 🌟 Bryan Evans
-🌟 Cameron Paul Ward
+🌟 Cameron Ward
 🌟 Casey Houston
 🌟 Christian Hornhofer
 🌟 Domenico Marchese
 🌟 Fernando Lino
+🌟 Gawayne Escalona
 🌟 George Brindle
 🌟 Gerry Agnew
 🌟 Gregory Marks
 🌟 Helena Thogersen
 🌟 Henk Fikkert
 🌟 H-Tec Systems GmbH
-🌟 Izabela Mendes Alves
+🌟 Izabela Alves
 🌟 Javier Fontalvo
 🌟 Jens Greimeier
 🌟 José Marques
 🌟 Justin Parrot
 🌟 Leonard Seed
-🌟 Lorenzo Giuseppe Montani
+🌟 Lorenzo Montani
 🌟 Marcos Guimarães
 🌟 Martin Heiser
 🌟 Michael Papantoniou
@@ -52,7 +53,7 @@ Andrew Dickson
 Antony Loane
 Bednarz Marc
 Bruce Bishkin
-Carlos Eduardo Pantoja
+Carlos Pantoja
 Christian Jordan
 Christian Pedersen
 CollectiveObjective
@@ -86,12 +87,13 @@ Peter Nordquist
 Petroconsulting LLC
 Protherm Systems
 Rainer Scheuring
-Renato Corrêa Arrieche
+Rashad Ahmadov
+Renato Arrieche
 Robert Gerard
 Robert Gulotty
 Rupert Easter
 Ryszard Sadowski
-Satinder Singh Virdi
+Satinder Virdi
 Shubham Wankhede
 SP&POS Engenharia
 Tetsuo Fuchino

diff --git a/DWSIM.Thermodynamics/FlashAlgorithms/NestedLoops.vb b/DWSIM.Thermodynamics/FlashAlgorithms/NestedLoops.vb
@@ -786,7 +786,7 @@ out:        WriteDebugInfo("PT Flash [NL]: Converged in " & ecount & " iteration
 
                             Else
 
-                                    Return Flash_PH_2(Vz, P, H, x1, PP, ReuseKI, PrevKi)
+                                Return Flash_PH_2(Vz, P, H, x1, PP, ReuseKI, PrevKi)
 
                             End If
 
@@ -3034,24 +3034,26 @@ out:        WriteDebugInfo("PT Flash [NL]: Converged in " & ecount & " iteration
             Dim T0 As Double = Tref
             Dim xaz As Double = Vz(0)
 
-            For i = 0 To 100 Step 10
+            For i = 0 To 100 Step 5
                 dx.Add(i / 100)
             Next
 
             CalculatingAzeotrope = True
 
             For Each item In dx
-                Try
-                    T.Add(Flash_PV(New Double() {item, 1 - item}, P, V, T0, PP, ReuseKI, PrevKi)(4))
-                    T0 = T.Last
-                    validdx.Add(item)
-                Catch ex As Exception
-                End Try
+                If Math.Abs(item - xaz) > 0.01 Then
+                    Try
+                        T.Add(Flash_PV(New Double() {item, 1 - item}, P, V, T0, PP, ReuseKI, PrevKi)(4))
+                        T0 = T.Last
+                        validdx.Add(item)
+                    Catch ex As Exception
+                    End Try
+                End If
             Next
 
             CalculatingAzeotrope = False
 
-            Dim Taz = polinterpolation.nevilleinterpolation(validdx.ToArray, T.ToArray, T.Count - 1, xaz)
+            Dim Taz = Interpolate.RationalWithPoles(validdx, T).Interpolate(xaz)
 
             Return Taz