Deprecate class MixedSolventElectrolyte

No existing tests, no known example input files, and not constructible via ThermoFactory. See #267.
Cantera · Feb 23, 2017 · 2b73fe2 · 2b73fe2
1 parent 6154e1b
commit 2b73fe2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h
@@ -214,6 +214,7 @@ namespace Cantera
  * \f$k^{-1} \f$ has units of s-1.
  *
  *  @ingroup thermoprops
+ *  @deprecated To be removed after Cantera 2.4.
  */
 class MixedSolventElectrolyte : public MolarityIonicVPSSTP
 {

diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp
@@ -20,6 +20,8 @@ MixedSolventElectrolyte::MixedSolventElectrolyte() :
     formMargules_(0),
     formTempModel_(0)
 {
+    warn_deprecated("class MixedSolventElectrolyte",
+                    "To be removed after Cantera 2.4");
 }
 
 MixedSolventElectrolyte::MixedSolventElectrolyte(const std::string& inputFile,
@@ -28,6 +30,8 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(const std::string& inputFile,
     formMargules_(0),
     formTempModel_(0)
 {
+    warn_deprecated("class MixedSolventElectrolyte",
+                    "To be removed after Cantera 2.4");
     initThermoFile(inputFile, id_);
 }
 
@@ -37,6 +41,8 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(XML_Node& phaseRoot,
     formMargules_(0),
     formTempModel_(0)
 {
+    warn_deprecated("class MixedSolventElectrolyte",
+                    "To be removed after Cantera 2.4");
     importPhase(phaseRoot, this);
 }
 

diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp
@@ -38,7 +38,6 @@
 #include "cantera/thermo/DebyeHuckel.h"
 #include "cantera/thermo/IdealMolalSoln.h"
 #include "cantera/thermo/MolarityIonicVPSSTP.h"
-#include "cantera/thermo/MixedSolventElectrolyte.h"
 #include "cantera/thermo/IdealSolnGasVPSS.h"
 #include "cantera/base/stringUtils.h"