From 9fb8318d37b9aa8f976953e7dc316800ca25a58a Mon Sep 17 00:00:00 2001 From: DanWBR Date: Fri, 3 Dec 2021 10:27:56 -0300 Subject: [PATCH] v7.1.0 RC1 --- .../FlashAlgorithmConfig.en.resx | 69 ++-- .../FlashAlgorithms/FlashAlgorithmConfig.resx | 308 +++++++++--------- PlatformFiles/Common/readme.txt | 14 +- PlatformFiles/Common/whatsnew.txt | 10 + 4 files changed, 225 insertions(+), 176 deletions(-) diff --git a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.en.resx b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.en.resx index 84dd6e3d1..7d9404956 100644 --- a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.en.resx +++ b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.en.resx @@ -117,15 +117,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Left + - 340, 73 + 344, 73 204, 73 - 130, 21 + 134, 21 14, 77 @@ -136,7 +140,6 @@ External Solver - Top, Right @@ -168,7 +171,7 @@ Enable Fast Mode for PH/PS Flash - 367, 12 + 371, 12 226, 90 @@ -183,7 +186,7 @@ 204, 46 - 156, 21 + 160, 21 14, 50 @@ -234,7 +237,7 @@ 204, 19 - 156, 21 + 160, 21 14, 23 @@ -249,7 +252,7 @@ Top, Right - 491, 325 + 495, 325 98, 20 @@ -267,7 +270,7 @@ Top, Right - 492, 299 + 496, 299 97, 20 @@ -294,7 +297,7 @@ Top, Right - 492, 221 + 496, 221 98, 20 @@ -303,7 +306,7 @@ Top, Right - 492, 273 + 496, 273 98, 20 @@ -330,7 +333,7 @@ Top, Right - 492, 247 + 496, 247 98, 20 @@ -344,59 +347,71 @@ PV Flash - Fixed Damping Factor Value (0.0 - 2.0) + + Fill + + + 6, 6 + - 605, 377 + 609, 379 General + + 6, 6, 6, 6 + 621, 391 General + + Top, Left + 421, 219 - 168, 20 + 172, 20 421, 193 - 168, 20 + 172, 20 421, 167 - 168, 20 + 172, 20 421, 141 - 168, 20 + 172, 20 421, 115 - 168, 20 + 172, 20 421, 89 - 168, 20 + 172, 20 421, 63 - 168, 20 + 172, 20 13, 196 @@ -465,7 +480,7 @@ 421, 37 - 168, 20 + 172, 20 13, 40 @@ -476,12 +491,21 @@ Flash PT/PV - internal loop convergence tolerance (absolute) + + Fill + + + 6, 6 + - 605, 377 + 609, 379 Convergence Parameters + + 6, 6, 6, 6 + 621, 391 @@ -494,6 +518,9 @@ 629, 417 + + Inherit + CenterScreen diff --git a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx index d19924a06..7c91cfac4 100644 --- a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx +++ b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx @@ -131,8 +131,8 @@ 115, 20 - - Right + + 292, 13 btnConfigExtSolver @@ -152,6 +152,9 @@ GroupBox4 + + 414, 270 + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -171,6 +174,9 @@ 11 + + 13, 208 + 13, 130 @@ -195,6 +201,9 @@ 46 + + Flash PH/PS - número máximo de iterações no loop interno + GroupBox4 @@ -219,8 +228,8 @@ 0 - - 0 + + 113, 17 GroupBox4 @@ -264,9 +273,6 @@ Usar algoritmo rápido para Flash PH/PS - - True - GroupBox1 @@ -282,8 +288,8 @@ gpNL - - NoControl + + Label2 System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -309,6 +315,9 @@ 115, 20 + + 10, 325 + GroupBox4 @@ -327,11 +336,8 @@ NoControl - - 0 - - - 391, 13 + + chkValidateEqCalc True @@ -345,9 +351,6 @@ Tipo do Cálculo de Equilíbrio - - 413, 348 - GroupBox4 @@ -360,11 +363,14 @@ 13 + + 96, 17 + Calcular Pontos de Bolha e Orvalho - - Top, Bottom, Left, Right + + 502, 49 207, 20 @@ -372,11 +378,14 @@ Right + + GroupBox1 + 4 - - 414, 270 + + Label8 Label30 @@ -390,11 +399,14 @@ NoControl - - 113, 17 + + 4, 22 - - 10, 325 + + 288, 13 + + + Right Label4 @@ -423,9 +435,6 @@ NoControl - - NoControl - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -435,9 +444,6 @@ 214, 17 - - tbPV_DampingFactor - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -447,9 +453,6 @@ Right - - 6 - Padrão (ESLLV) @@ -519,6 +522,9 @@ Right + + 649, 419 + 0 @@ -546,9 +552,6 @@ 638, 405 - - 6 - Label6 @@ -558,12 +561,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 11, 273 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - gpNL @@ -579,9 +576,6 @@ False - - tbPHintMaxTol - 180, 13 @@ -600,14 +594,17 @@ GroupBox1 - - 13, 104 + + 391, 13 + + + Inside-Out GroupBox1 - - chkValidateEqCalc + + 13, 104 6, 72 @@ -630,17 +627,14 @@ 1 - - 6 - 45 NoControl - - 13, 208 + + 2 TabPageGeneral @@ -657,8 +651,8 @@ GroupBox4 - - Label8 + + True System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -672,8 +666,8 @@ Considerar Sólidos - - 502, 101 + + True 4 @@ -690,6 +684,9 @@ Right + + 0 + TabPageConvPars @@ -699,9 +696,6 @@ NoControl - - Inside-Out - True @@ -720,9 +714,6 @@ 10, 351 - - 12 - 37 @@ -747,15 +738,9 @@ Geral - - Flash PH/PS - tolerância para convergência do loop interno - 91, 13 - - Top, Left, Right - tbPHIntMaxIt @@ -768,9 +753,6 @@ NoControl - - GroupBox4 - NoControl @@ -795,9 +777,6 @@ 2 - - Right - 357, 78 @@ -807,8 +786,8 @@ 291, 13 - - 8, 6 + + 284, 13 True @@ -819,6 +798,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -828,15 +810,24 @@ 7 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 6, 22 0 + + 13, 182 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Left, Right + GroupBox4 @@ -855,9 +846,6 @@ Stretch - - 8, 6 - 13 @@ -867,14 +855,14 @@ 230, 17 - - 2 + + 115, 20 chkFastModeNL - - 284, 13 + + Top, Left, Right Loops de convergência @@ -915,15 +903,15 @@ Top, Left, Right + + True + 635, 336 15 - - 292, 13 - 5 @@ -936,8 +924,8 @@ 0, 0 - - Label24 + + NoControl tbPT_DampingFactor @@ -948,6 +936,9 @@ FlashAlgorithmConfig + + 180, 13 + Flash PH/PS - tolerância para convergência do loop externo @@ -960,14 +951,8 @@ Label9 - - Top, Left, Right - - - 288, 13 - - - NoControl + + 6 GroupBox4 @@ -978,6 +963,9 @@ GroupBox1 + + 502, 205 + 14, 21 @@ -987,6 +975,9 @@ Geral + + 0 + chkHandleSolids @@ -1008,9 +999,6 @@ gpNL - - Fill - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1032,12 +1020,15 @@ NoControl - - 15, 140 + + 12 Flash PT/PV - tolerância para convergência do loop interno + + Label24 + GroupBox4 @@ -1047,8 +1038,11 @@ 207, 20 - - 13, 182 + + 285, 13 + + + 15, 140 Top, Left, Right @@ -1059,6 +1053,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label1 + NoControl @@ -1122,11 +1119,8 @@ 7 - - 10 - - - Top, Left, Right + + NoControl 6, 47 @@ -1134,12 +1128,18 @@ Convergência - - True + + 10 + + + 502, 23 Right + + True + 163, 47 @@ -1149,14 +1149,11 @@ 33 - - tbPH_MaxDT - 3 - - 502, 23 + + tbPH_MaxDT 96, 96 @@ -1167,20 +1164,20 @@ 8 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill Flash PT/PV - tolerância para convergência do loop externo - - Label2 + + 502, 101 - - 180, 13 + + Right - - 0 + + Top, Bottom, Left, Right 8 @@ -1212,8 +1209,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 115, 20 + + Flash PH/PS - tolerância para convergência do loop interno GroupBox1 @@ -1233,8 +1230,8 @@ 14 - - Label1 + + 413, 348 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1260,8 +1257,8 @@ 2 - - GroupBox1 + + tbPV_DampingFactor GroupBox4 @@ -1272,23 +1269,26 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 96, 17 + + gpNL 115, 20 - - 285, 13 + + 11, 273 15, 113 - - 649, 419 + + GroupBox4 - - 4, 22 + + 6 + + + 8, 6 502, 153 @@ -1317,8 +1317,8 @@ 14 - - True + + NoControl GroupBox4 @@ -1356,8 +1356,8 @@ 10 - - 502, 49 + + Top, Left, Right False @@ -1365,8 +1365,8 @@ 43 - - 502, 205 + + 6 5 @@ -1380,8 +1380,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Flash PH/PS - número máximo de iterações no loop interno + + tbPHintMaxTol 188, 21 @@ -1392,14 +1392,14 @@ 14 - - gpNL + + 0 - - True + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 8, 6 GroupBox1 diff --git a/PlatformFiles/Common/readme.txt b/PlatformFiles/Common/readme.txt index a7bc32418..99ce463d8 100644 --- a/PlatformFiles/Common/readme.txt +++ b/PlatformFiles/Common/readme.txt @@ -60,7 +60,19 @@ Disk space: VERSION HISTORY / CHANGELOG ================================================== -The full changelog including souce code changes can be viewed at https://github.com/DanWBR/dwsim6/commits/windows +The full changelog including souce code changes can be viewed at https://github.com/DanWBR/dwsim/commits/windows + +Version 7.1.0 + +- Using mixing rule for rackett liquid density (#232) +- Implemented COSTALD method for liquid density calculations (#231) +- Implemented Total Condenser subcooling in Rigorous Column model +- Fixed Newton-Raphson Rigorous Column solver +- Define global stage efficiency in Rigorous Column model +- Black-and-white flowsheet color theme +- New splash screen +- Globally set size of flowsheet object labels +- Splitter editor fixes (#233) Version 7.0.1 diff --git a/PlatformFiles/Common/whatsnew.txt b/PlatformFiles/Common/whatsnew.txt index 18c8d8338..ea8935951 100644 --- a/PlatformFiles/Common/whatsnew.txt +++ b/PlatformFiles/Common/whatsnew.txt @@ -1 +1,11 @@ Version 7.1.0 + +- Using mixing rule for rackett liquid density (#232) +- Implemented COSTALD method for liquid density calculations (#231) +- Implemented Total Condenser subcooling in Rigorous Column model +- Fixed Newton-Raphson Rigorous Column solver +- Define global stage efficiency in Rigorous Column model +- Black-and-white flowsheet color theme +- New splash screen +- Globally set size of flowsheet object labels +- Splitter editor fixes (#233) \ No newline at end of file