v8.4.5 RC2

DWSIM.FlowsheetBase/FlowsheetBase.vb

@@ -407,6 +407,18 @@ Imports System.Text.RegularExpressions
 
  End Sub
 
+
+ Public Sub RequestCalculation3(Obj As ISimulationObject, Wait As Boolean) Implements IFlowsheet.RequestCalculation3
+
+ If Obj Is Nothing Then
+ RequestCalculation2(Wait)
+ Else
+ RequestCalculation(Obj)
+ End If
+
+ End Sub
+
+
  Public Property SelectedCompounds As Dictionary(Of String, ICompoundConstantProperties) Implements IFlowsheet.SelectedCompounds
  Get
  Select Case Options.CompoundOrderingMode

DWSIM.FlowsheetSolver/FlowsheetSolver.vb

@@ -1746,8 +1746,8 @@ Public Delegate Sub CustomEvent2(ByVal objinfo As CalculationArgs)
 
  fqueue.CalculationQueue.Enqueue(objargs)
 
- Return SolveFlowsheet(fobj, Settings.SolverMode, Nothing, False, False, Nothing, Nothing, Nothing)
- 'Return SolveFlowsheet(fobj, Settings.SolverMode, Nothing, True)
+ 'Return SolveFlowsheet(fobj, Settings.SolverMode, Nothing, False, False, Nothing, Nothing, Nothing)
+ Return SolveFlowsheet(fobj, Settings.SolverMode, Nothing, True)
 
  Else
 

DWSIM.Interfaces/IFlowsheet.vb

@@ -367,7 +367,11 @@
  Sub DisplayBrowserWindow(url As String)
 
  Sub DisplayDockableBrowserWindow(url As String)
+
  Sub RequestCalculation2(Wait As Boolean)
+
+ Sub RequestCalculation3(obj As ISimulationObject, Wait As Boolean)
+
 End Interface
 
 ''' <summary>

DWSIM.Thermodynamics/EditingForms/MaterialStream/MaterialStreamEditor.vb

@@ -1370,7 +1370,7 @@ Public Class MaterialStreamEditor
  SaveViewState()
 
  If Not IsAccumulationStream Then
- MatStream.FlowSheet.RequestCalculation2(False)
+ MatStream.FlowSheet.RequestCalculation3(MatStream, False)
  End If
 
  End Sub

DWSIM.Thermodynamics/PropertyPackages/ActivityCoefficientBase.vb

@@ -127,57 +127,57 @@ Namespace PropertyPackages
 
  For j As Integer = 1 To 7
 
-  If j <> 2 Then
+ If j <> 2 Then
 
-  Dim Vx = RET_VMOL(RET_PHASECODE(j))
-  Dim n As Integer = Vx.Length - 1
+ Dim Vx = RET_VMOL(RET_PHASECODE(j))
+ Dim n As Integer = Vx.Length - 1
 
-  Dim constprop = DW_GetConstantProperties()
+ Dim constprop = DW_GetConstantProperties()
 
-  Dim ativ(n), poy1(n), poy2(n), vex(n) As Double
+ Dim ativ(n), poy1(n), poy2(n), vex(n) As Double
 
-  ativ = m_act.CalcActivityCoefficients(T, Vx, Me.GetArguments())
+ ativ = m_act.CalcActivityCoefficients(T, Vx, Me.GetArguments())
 
-  Dim P2 As Double = P + 1
+ Dim P2 As Double = P + 1
 
- Dim Psati, vli As Double
- For i = 0 To n
- vli = 1 / AUX_LIQDENSi(constprop(i), T) * constprop(i).Molar_Weight
- If Double.IsNaN(vli) Then
- vli = 1 / AUX_LIQDENSi(constprop(i), constprop(i).Normal_Boiling_Point) * constprop(i).Molar_Weight
- End If
- Psati = AUX_PVAPi(i, T)
- poy1(i) = Math.Exp(vli * Abs(P - Psati) / (8314.47 * T))
- poy2(i) = Math.Exp(vli * Abs(P2 - Psati) / (8314.47 * T))
- vex(i) = (Log(poy2(i)) - Log(poy1(i))) * 8.314 * T * 1000 'm3/kmol
- Next
+ Dim Psati, vli As Double
+ For i = 0 To n
+ vli = 1 / AUX_LIQDENSi(constprop(i), T) * constprop(i).Molar_Weight
+ If Double.IsNaN(vli) Then
+ vli = 1 / AUX_LIQDENSi(constprop(i), constprop(i).Normal_Boiling_Point) * constprop(i).Molar_Weight
+ End If
+ Psati = AUX_PVAPi(i, T)
+ poy1(i) = Math.Exp(vli * Abs(P - Psati) / (8314.47 * T))
+ poy2(i) = Math.Exp(vli * Abs(P2 - Psati) / (8314.47 * T))
+ vex(i) = (Log(poy2(i)) - Log(poy1(i))) * 8.314 * T * 1000 'm3/kmol
+ Next
+
+ i = 0
+ For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(j).Compounds.Values
+ subst.PartialVolume = vex(i)
+ i += 1
+ Next
+
+ Else
 
+ If VaporPhaseFugacityCalculationMode = VaporPhaseFugacityCalcMode.Ideal Then
+ Dim vapdens = AUX_VAPDENS(T, P)
+ For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(2).Compounds.Values
+ subst.PartialVolume = subst.ConstantProperties.Molar_Weight / vapdens
+ Next
+ Else
+ Dim partvol As New Object
+ partvol = Me.m_pr.CalcPartialVolume(T, P, RET_VMOL(2), RET_VKij(), RET_VTC(), RET_VPC(), RET_VW(), RET_VTB(), "V", 0.0001)
  i = 0
- For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(j).Compounds.Values
- subst.PartialVolume = vex(i)
+ For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(2).Compounds.Values
+ subst.PartialVolume = partvol(i)
  i += 1
  Next
-
- Else
-
- If VaporPhaseFugacityCalculationMode = VaporPhaseFugacityCalcMode.Ideal Then
- Dim vapdens = AUX_VAPDENS(T, P)
- For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(2).Compounds.Values
- subst.PartialVolume = subst.ConstantProperties.Molar_Weight / vapdens
- Next
- Else
- Dim partvol As New Object
- partvol = Me.m_pr.CalcPartialVolume(T, P, RET_VMOL(2), RET_VKij(), RET_VTC(), RET_VPC(), RET_VW(), RET_VTB(), "V", 0.0001)
- i = 0
- For Each subst As Interfaces.ICompound In Me.CurrentMaterialStream.Phases(2).Compounds.Values
- subst.PartialVolume = partvol(i)
- i += 1
- Next
- End If
-
  End If
 
- Next
+ End If
+
+ Next
 
  End Sub
 
@@ -621,20 +621,19 @@ Namespace PropertyPackages
  If Tr >= 1.02 Then
  IObj?.SetCurrent()
  IObj?.Paragraphs.Add("<m>f_i = H_i/P</m>")
- lnfug(i) = Log(AUX_KHenry(Me.RET_VNAMES(i), T) / P)
- IObj?.Paragraphs.Add(String.Format("Henry's Constant (H) @ {0} K: {1} Pa", T, Exp(lnfug(i)) * P))
- ElseIf Tr < 0.98 Then
- IObj?.Paragraphs.Add("<m>f_i = \gamma_i Poy_i P_{sat_i}/P</m>")
- IObj?.Paragraphs.Add(String.Format("Activity Coefficient: {0}", ativ(i)))
- IObj?.Paragraphs.Add(String.Format("Vapor Pressure (Psat) @ {0} K: {1} Pa", T, Me.AUX_PVAPi(i, T)))
- IObj?.Paragraphs.Add(String.Format("Poynting Correction Factor: {0}", poy(i)))
  If UseHenryConstants And HasHenryConstants(constprop(i).Name) Then
  Dim hc = AUX_KHenry(constprop(i).Name, T)
  IObj?.Paragraphs.Add(String.Format("Henry's Constant (H) @ {0} K: {1} Pa", T, hc))
- lnfug(i) = Log(ativ(i) * hc / P) + Log(poy(i))
+ lnfug(i) = Log(hc / P)
  Else
- lnfug(i) = Log(ativ(i) * Me.AUX_PVAPi(i, T) / (P)) + Log(poy(i))
+ lnfug(i) = Log(AUX_PVAPi(i, T) / (P))
  End If
+ ElseIf Tr < 0.98 Then
+ IObj?.Paragraphs.Add("<m>f_i = \gamma_i Poy_i P_{sat_i}/P</m>")
+ IObj?.Paragraphs.Add(String.Format("Activity Coefficient: {0}", ativ(i)))
+ IObj?.Paragraphs.Add(String.Format("Vapor Pressure (Psat) @ {0} K: {1} Pa", T, Me.AUX_PVAPi(i, T)))
+ IObj?.Paragraphs.Add(String.Format("Poynting Correction Factor: {0}", poy(i)))
+ lnfug(i) = Log(ativ(i) * Me.AUX_PVAPi(i, T) / (P)) + Log(poy(i))
  IObj?.Paragraphs.Add(String.Format("Fugacity Coefficient: {0}", Exp(lnfug(i))))
  Else 'do interpolation at proximity of critical point
  IObj?.SetCurrent()

DWSIM.Thermodynamics/PropertyPackages/CoolProp.vb

@@ -1643,9 +1643,6 @@ Namespace PropertyPackages
  Dim Tc As Double() = Me.RET_VTC()
  For i = 0 To n
  If T / Tc(i) >= 1 Then
- IObj?.SetCurrent()
- fugcoeff(i) = AUX_KHenry(Me.RET_VNAMES(i), T) / P
- Else
  IObj?.SetCurrent()
  If UseHenryConstants And HasHenryConstants(RET_VNAMES(i)) Then
  Dim hc = AUX_KHenry(RET_VNAMES(i), T)
@@ -1654,6 +1651,9 @@ Namespace PropertyPackages
  Else
  fugcoeff(i) = Me.AUX_PVAPi(i, T) / P
  End If
+ Else
+ IObj?.SetCurrent()
+ fugcoeff(i) = Me.AUX_PVAPi(i, T) / P
  End If
  Next
  Else

DWSIM.Thermodynamics/PropertyPackages/Ideal.vb

@@ -772,9 +772,6 @@ Namespace PropertyPackages
  Dim Tc As Double() = Me.RET_VTC()
  For i = 0 To n
  If T / Tc(i) >= 1.0 Then
- IObj?.SetCurrent()
- fugcoeff(i) = AUX_KHenry(Me.RET_VNAMES(i), T) / P
- Else
  IObj?.SetCurrent()
  If UseHenryConstants And HasHenryConstants(RET_VNAMES(i)) Then
  Dim hc = AUX_KHenry(RET_VNAMES(i), T)
@@ -783,6 +780,9 @@ Namespace PropertyPackages
  Else
  fugcoeff(i) = Me.AUX_PVAPi(i, T) / P
  End If
+ Else
+ IObj?.SetCurrent()
+ fugcoeff(i) = Me.AUX_PVAPi(i, T) / P
  End If
  Next
  Else

DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb

@@ -5327,8 +5327,11 @@ redirect2: IObj?.SetCurrent()
  Public Function HasHenryConstants(compname As String) As Boolean
 
  Dim CAS = Me.CurrentMaterialStream.Phases(0).Compounds(compname).ConstantProperties.CAS_Number
-
- Return m_Henry.ContainsKey(CAS)
+ If CAS <> "" Then
+ Return m_Henry.ContainsKey(CAS)
+ Else
+ Return False
+ End If
 
  End Function
 

DWSIM.UnitOperations/EditingForms/EditingForm_AirCooler.vb

@@ -416,7 +416,7 @@ Public Class EditingForm_AirCooler
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Column.vb

@@ -364,7 +364,7 @@ Public Class EditingForm_Column
 
  Sub RequestCalc()
 
- 'SimObject.FlowSheet.RequestCalculation2(False)
+ 'SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_ComprExpndr.vb

@@ -503,7 +503,7 @@ Public Class EditingForm_ComprExpndr
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_EnergyStream.vb

@@ -148,7 +148,7 @@ Public Class EditingForm_EnergyStream
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Flowsheet.vb

@@ -193,7 +193,7 @@ Public Class EditingForm_FlowsheetUO
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_HeaterCooler.vb

@@ -378,7 +378,7 @@ Public Class EditingForm_HeaterCooler
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_PIDController.vb

@@ -146,7 +146,7 @@ Public Class EditingForm_PIDController
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Pipe.vb

@@ -211,7 +211,7 @@ Public Class EditingForm_Pipe
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Pump.vb

@@ -293,7 +293,7 @@ Public Class EditingForm_Pump
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_ReactorCSTR.vb

@@ -246,7 +246,7 @@ Public Class EditingForm_ReactorCSTR
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_ReactorPFR.vb

@@ -319,7 +319,7 @@ Public Class EditingForm_ReactorPFR
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Splitter.vb

@@ -335,7 +335,7 @@ Public Class EditingForm_Splitter
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Spreadsheet.vb

@@ -192,7 +192,7 @@ Public Class EditingForm_SpreadsheetUO
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM.UnitOperations/EditingForms/EditingForm_Valve.vb

@@ -358,7 +358,7 @@ Public Class EditingForm_Valve
 
  Sub RequestCalc()
 
- SimObject.FlowSheet.RequestCalculation2(False)
+ SimObject.FlowSheet.RequestCalculation3(SimObject, False)
 
  End Sub
 

DWSIM/Forms/Flowsheet/FormFlowsheet.vb

@@ -3295,6 +3295,12 @@ Public Class FormFlowsheet
 
  End Sub
 
+ Public Sub RequestCalculation3(obj As ISimulationObject, Wait As Boolean) Implements IFlowsheet.RequestCalculation3
+
+ RequestFlowsheetCalculation(obj, Wait)
+
+ End Sub
+
  Public Function GetUtility(uttype As Enums.FlowsheetUtility) As IAttachedUtility Implements IFlowsheet.GetUtility
  Select Case uttype
  Case FlowsheetUtility.NaturalGasHydrates