bug fixes

DanWBR · Jun 24, 2022 · f15d585 · f15d585
1 parent 68233e6
commit f15d585
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/DWSIM.Automation/Automation.cs b/DWSIM.Automation/Automation.cs
@@ -329,6 +329,17 @@ public void CalculateFlowsheet3(IFlowsheet flowsheet, int timeout_seconds)
  ((Flowsheet2)flowsheet).SolveFlowsheet2();
  }
 
+ public List<Exception> CalculateFlowsheet4(IFlowsheet flowsheet)
+ {
+ Settings.CalculatorActivated = true;
+ Settings.SolverBreakOnException = true;
+ Settings.SolverMode = 1;
+ Settings.SolverTimeoutSeconds = 3600;
+ Settings.EnableGPUProcessing = false;
+ Settings.EnableParallelProcessing = false;
+ return ((Flowsheet2)flowsheet).SolveFlowsheet2();
+ }
+
  public void SaveFlowsheet2(IFlowsheet flowsheet, string filepath)
  {
  SaveFlowsheet(flowsheet, filepath, true);

diff --git a/DWSIM.Automation/Flowsheet2.cs b/DWSIM.Automation/Flowsheet2.cs
@@ -113,27 +113,27 @@ public void SolveFlowsheet()
 
  }
 
- public void SolveFlowsheet2( )
+ public List<Exception> SolveFlowsheet2( )
  { 
  if (PropertyPackages.Count == 0)
  {
  ShowMessage("Please select a Property Package before solving the flowsheet.", IFlowsheet.MessageType.GeneralError);
- return;
+ return new List<Exception>();
  }
 
  if (SelectedCompounds.Count == 0)
  {
  ShowMessage("Please select a Compound before solving the flowsheet.", IFlowsheet.MessageType.GeneralError);
- return;
+ return new List<Exception>();
  }
 
  Settings.CalculatorActivated = true;
 
- Task st = new Task(() =>
+ Task<List<Exception>> st = new Task<List<Exception>>(() =>
  {
- RequestCalculation(null, false);
+ return FlowsheetSolver.FlowsheetSolver.SolveFlowsheet(this, GlobalSettings.Settings.SolverMode);
  });
-
+ 
  st.ContinueWith((t) =>
  {
  Settings.CalculatorStopRequested = false;
@@ -145,6 +145,7 @@ public void SolveFlowsheet2( )
  {
  st.Start(TaskScheduler.Default);
  st.Wait();
+ return st.Result;
  }
  catch (AggregateException aex)
  {
@@ -154,12 +155,14 @@ public void SolveFlowsheet2( )
  }
  Settings.CalculatorBusy = false;
  Settings.TaskCancellationTokenSource = new System.Threading.CancellationTokenSource();
+ return new List<Exception>(aex.InnerExceptions);
  }
  catch (Exception ex)
  {
  ShowMessage(ex.ToString(), IFlowsheet.MessageType.GeneralError);
  Settings.CalculatorBusy = false;
  Settings.TaskCancellationTokenSource = new System.Threading.CancellationTokenSource();
+ return new List<Exception> { ex }; 
  }
 
  }

diff --git a/DWSIM.SharedClasses/Patrons/activepatrons.txt b/DWSIM.SharedClasses/Patrons/activepatrons.txt
@@ -34,7 +34,7 @@ H-Tec Systems GmbH
 Hugo Burbach
 Hurudza 
 Jan Boshoff
-Javier Alzate
+Javier Fontalvo
 Jens Greimeier
 Jeremiah McAfoose
 Joe Rhodes

diff --git a/DWSIM.Tests/Program.cs b/DWSIM.Tests/Program.cs
@@ -13,7 +13,7 @@ class Program
  static void Main(string[] args)
  {
 
- DWSIM.Automation.Automation interf = new DWSIM.Automation.Automation();
+ var interf = new DWSIM.Automation.Automation3();
 
  var samples = Directory.EnumerateFiles("samples", "*.dwxm*", SearchOption.TopDirectoryOnly).OrderBy(x => x).ToList();
  var fossee = Directory.EnumerateFiles("tests", "*.dwxm*", SearchOption.TopDirectoryOnly).OrderBy(x => x).ToList();
@@ -43,7 +43,7 @@ static void Main(string[] args)
  Console.ReadKey();
  }
 
- static void RunTests(List<string> filelist, DWSIM.Automation.Automation interf)
+ static void RunTests(List<string> filelist, DWSIM.Automation.Automation3 interf)
  {
 
  TimeSpan totaltime;
@@ -84,7 +84,7 @@ static void RunTests(List<string> filelist, DWSIM.Automation.Automation interf)
  Console.WriteLine("[" + i + "/" + totaltests + "] " + "Running '" + Path.GetFileNameWithoutExtension(s) + "'...");
  Console.WriteLine();
 
- errors = interf.CalculateFlowsheet2(sim);
+ errors = interf.CalculateFlowsheet4(sim);
 
  if (errors.Count > 0)
  {
@@ -136,8 +136,8 @@ static void RunTests(List<string> filelist, DWSIM.Automation.Automation interf)
  Console.WriteLine();
  }
 
- //Console.WriteLine("Press Any Key to Continue...");
- //Console.ReadKey();
+ Console.WriteLine("Press Any Key to Continue...");
+ Console.ReadKey();
 
  }