From 5017f36a57c71f7e9936d4f7ac5a21aa0b64ef30 Mon Sep 17 00:00:00 2001 From: Ingmar Schoegl Date: Sun, 11 Aug 2024 09:55:45 -0500 Subject: [PATCH] [.NET] Update Equilibrate --- .../dotnet/Cantera.Tests/src/EnumsTest.cs | 4 --- interfaces/dotnet/Cantera/src/Enums.cs | 26 ------------------- interfaces/dotnet/Cantera/src/ThermoPhase.cs | 5 ++-- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/interfaces/dotnet/Cantera.Tests/src/EnumsTest.cs b/interfaces/dotnet/Cantera.Tests/src/EnumsTest.cs index a2be7a4c8c4..04995dcc9c9 100644 --- a/interfaces/dotnet/Cantera.Tests/src/EnumsTest.cs +++ b/interfaces/dotnet/Cantera.Tests/src/EnumsTest.cs @@ -37,10 +37,6 @@ public void ThermoPair_ToStringsCorrectly() } } - [Fact] - public void EquilibriumSolver_MapsCorrectly() => - TestInteropEnumInvariants(true, -1, 2); - [Fact] public void LogLevel_MapsCorrectly() => TestInteropEnumInvariants(true, 0, 2); diff --git a/interfaces/dotnet/Cantera/src/Enums.cs b/interfaces/dotnet/Cantera/src/Enums.cs index 4399d107bf0..a171edbef8e 100644 --- a/interfaces/dotnet/Cantera/src/Enums.cs +++ b/interfaces/dotnet/Cantera/src/Enums.cs @@ -103,32 +103,6 @@ public static string ToInteropString(this ThermoPair thermoPair) // the constants MUST match what CLIB is expecting -/// -/// Determines which algorithm is used to find equilibrium. -/// -public enum EquilibriumSolver -{ - /// - /// Allow Cantera to determine the optimum algorithm. - /// - Auto = -1, - - /// - /// Solve by using the element potential algorithm. - /// - ElementPotential, - - /// - /// Solve by using the general algorithm to minimize Gibbs free energy. - /// - Gibbs, - - /// - /// Solved by using the VCS algorithm to minimize Gibbs free energy. - /// - Vcs -} - /// /// The /// diff --git a/interfaces/dotnet/Cantera/src/ThermoPhase.cs b/interfaces/dotnet/Cantera/src/ThermoPhase.cs index fb9f5ddab7a..3b280c4f23a 100644 --- a/interfaces/dotnet/Cantera/src/ThermoPhase.cs +++ b/interfaces/dotnet/Cantera/src/ThermoPhase.cs @@ -61,11 +61,10 @@ internal ThermoPhase(string filename, string? phaseName) /// /// Simulates bringing the phase to thermodynamic equilibrium by holding the - /// specified constant and using the algorithm - /// identified by the given . + /// specified constant and using the identified algorithm. /// public void Equilibrate(ThermoPair thermoPair, - EquilibriumSolver solver = EquilibriumSolver.Auto, + string algorithm = "auto", double tolerance = 1e-9, int maxSteps = 1000, int maxIterations = 100, int logVerbosity = 0) {