diff --git a/include/cantera/equil/vcs_internal.h b/include/cantera/equil/vcs_internal.h index c524ed426..740205049 100644 --- a/include/cantera/equil/vcs_internal.h +++ b/include/cantera/equil/vcs_internal.h @@ -208,6 +208,7 @@ typedef double(*VCS_FUNC_PTR)(double xval, double Vtarget, * return 0; * } * @endcode + * @deprecated Unused. To be removed after Cantera 2.2. */ int vcsUtil_root1d(double xmin, double xmax, size_t itmax, VCS_FUNC_PTR func, void* fptrPassthrough, @@ -246,6 +247,7 @@ size_t vcs_optMax(const double* x, const double* xSize, size_t j, size_t n); * @param length length of the integer vector * * @return returns the max integer value in the list + * @deprecated Unused. To be removed after Cantera 2.2. */ int vcs_max_int(const int* vector, int length); diff --git a/include/cantera/kinetics/ElectrodeKinetics.h b/include/cantera/kinetics/ElectrodeKinetics.h index 958e46445..5d41bd8c0 100644 --- a/include/cantera/kinetics/ElectrodeKinetics.h +++ b/include/cantera/kinetics/ElectrodeKinetics.h @@ -27,6 +27,7 @@ namespace Cantera * phases. We will also assume that there is an electron phase. * * @ingroup chemkinetics + * @deprecated Unfinished implementation to be removed after Cantera 2.2. */ class ElectrodeKinetics : public InterfaceKinetics { diff --git a/include/cantera/kinetics/ExtraGlobalRxn.h b/include/cantera/kinetics/ExtraGlobalRxn.h index 9359465a8..d737039b7 100644 --- a/include/cantera/kinetics/ExtraGlobalRxn.h +++ b/include/cantera/kinetics/ExtraGlobalRxn.h @@ -30,6 +30,7 @@ namespace Cantera * within the kinetics object that is used to identify the global reaction. Rates of progress * are defined in terms of the production rate of the special species. * + * @deprecated Unfinished implementation to be removed after Cantera 2.2. */ class ExtraGlobalRxn { diff --git a/include/cantera/kinetics/RxnMolChange.h b/include/cantera/kinetics/RxnMolChange.h index d56c7e803..073823aa9 100644 --- a/include/cantera/kinetics/RxnMolChange.h +++ b/include/cantera/kinetics/RxnMolChange.h @@ -24,6 +24,7 @@ class Kinetics; /*! * Note that all indexes refer to a specific interfacial or homogeneous kinetics object. It does not * refer to the Phase list indexes. + * @deprecated Unfinished implementation to be removed after Cantera 2.2. */ class RxnMolChange { diff --git a/include/cantera/numerics/BEulerInt.h b/include/cantera/numerics/BEulerInt.h index c52b92b6d..67665ec91 100644 --- a/include/cantera/numerics/BEulerInt.h +++ b/include/cantera/numerics/BEulerInt.h @@ -51,6 +51,7 @@ public: /*! * Wrapper class for 'beuler' integrator * We derive the class from the class Integrator + * @deprecated Unused. To be removed after Cantera 2.2. */ class BEulerInt : public Integrator { diff --git a/include/cantera/numerics/NonlinearSolver.h b/include/cantera/numerics/NonlinearSolver.h index 6a3512782..462b3f2f3 100644 --- a/include/cantera/numerics/NonlinearSolver.h +++ b/include/cantera/numerics/NonlinearSolver.h @@ -121,6 +121,7 @@ namespace Cantera * @endcode * * @ingroup numerics + * @deprecated Unused. To be removed after Cantera 2.2. */ class NonlinearSolver { diff --git a/include/cantera/numerics/solveProb.h b/include/cantera/numerics/solveProb.h index fcad9f95c..edbb442a6 100644 --- a/include/cantera/numerics/solveProb.h +++ b/include/cantera/numerics/solveProb.h @@ -134,6 +134,7 @@ namespace Cantera *---------------------------------------------------------------------------- * * @ingroup solverGroup + * @deprecated Unused. To be removed after Cantera 2.2. */ class solveProb { diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h index 2b70d1fdb..7e6d0ac19 100644 --- a/include/cantera/thermo/Phase.h +++ b/include/cantera/thermo/Phase.h @@ -915,6 +915,7 @@ public: /*! * The default is THROWON_OVERFLOW_CTRB * Which throws an error in debug mode, but silently changes the answer in non-debug mode + * @deprecated To be removed after Cantera 2.2. */ enum CT_RealNumber_Range_Behavior realNumberRangeBehavior_; diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp index 5890174ce..97f8d1d7e 100644 --- a/src/equil/vcs_root1d.cpp +++ b/src/equil/vcs_root1d.cpp @@ -38,6 +38,7 @@ int vcsUtil_root1d(double xmin, double xmax, size_t itmax, double FuncTargVal, int varID, double* xbest, int printLvl) { + warn_deprecated("vcsUtil_root1d", "To be removed after Cantera 2.2."); static int callNum = 0; const char* stre = "vcs_root1d ERROR: "; const char* strw = "vcs_root1d WARNING: "; diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index c1a0f6ba4..3cd3e487d 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -62,6 +62,7 @@ size_t vcs_optMax(const double* x, const double* xSize, size_t j, size_t n) int vcs_max_int(const int* vector, int length) { + warn_deprecated("vcs_max_int", "Unused. To be removed after Cantera 2.2."); int retn; if (vector == NULL || length <= 0) { return 0; diff --git a/src/kinetics/ElectrodeKinetics.cpp b/src/kinetics/ElectrodeKinetics.cpp index caf432720..b6beaab40 100644 --- a/src/kinetics/ElectrodeKinetics.cpp +++ b/src/kinetics/ElectrodeKinetics.cpp @@ -5,6 +5,7 @@ #include "cantera/kinetics/ElectrodeKinetics.h" #include "cantera/thermo/SurfPhase.h" #include "cantera/base/utilities.h" +#include "cantera/base/global.h" #include @@ -19,7 +20,8 @@ ElectrodeKinetics::ElectrodeKinetics(thermo_t* thermo) : solnPhaseIndex_(npos), kElectronIndex_(npos) { - + warn_deprecated("class ElectrodeKinetics", + "To be removed after Cantera 2.2."); } //============================================================================================================================ ElectrodeKinetics::~ElectrodeKinetics() diff --git a/src/kinetics/ExtraGlobalRxn.cpp b/src/kinetics/ExtraGlobalRxn.cpp index 1a6d02e12..fdb59be4a 100644 --- a/src/kinetics/ExtraGlobalRxn.cpp +++ b/src/kinetics/ExtraGlobalRxn.cpp @@ -98,6 +98,8 @@ ExtraGlobalRxn::ExtraGlobalRxn(Kinetics* k_ptr) : m_ok(false), m_reversible(true) { + warn_deprecated("class ExtraGlobalRxn", + "Unfinished implementation to be removed after Cantera 2.2."); m_InterfaceKinetics = dynamic_cast(k_ptr); if (m_InterfaceKinetics) { m_ThisIsASurfaceRxn = true; diff --git a/src/kinetics/RxnMolChange.cpp b/src/kinetics/RxnMolChange.cpp index c746ac842..e3df108bc 100644 --- a/src/kinetics/RxnMolChange.cpp +++ b/src/kinetics/RxnMolChange.cpp @@ -36,6 +36,7 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, int irxn) : m_beta(0.0), m_egr(0) { + warn_deprecated("class RxnMolChange", "To be removed after Cantera 2.2."); int nReac = kinPtr->nReactions(); int iph; AssertTrace(irxn >= 0); diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp index addba549d..5c0ab114a 100644 --- a/src/numerics/BEulerInt.cpp +++ b/src/numerics/BEulerInt.cpp @@ -11,6 +11,7 @@ #include "cantera/numerics/BEulerInt.h" #include "cantera/numerics/SquareMatrix.h" +#include "cantera/base/global.h" using namespace std; @@ -66,7 +67,7 @@ BEulerInt::BEulerInt() : m_numTotalTruncFails(0), num_failures(0) { - + warn_deprecated("class BEulerInt", "To be removed after Cantera 2.2."); } BEulerInt::~BEulerInt() diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index 559603430..d510c9bde 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -119,6 +119,7 @@ NonlinearSolver::NonlinearSolver(ResidJacEval* func) : ResidDecreaseNewtExp_(0.0), ResidDecreaseNewt_(0.0) { + warn_deprecated("class NonlinearSolver", "To be removed after Cantera 2.2."); neq_ = m_func->nEquations(); m_ewt.resize(neq_, rtol_); diff --git a/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp index a267f47a9..96decf715 100644 --- a/src/numerics/solveProb.cpp +++ b/src/numerics/solveProb.cpp @@ -12,6 +12,7 @@ #include "cantera/numerics/solveProb.h" #include "cantera/base/clockWC.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" using namespace std; namespace Cantera @@ -31,6 +32,7 @@ solveProb::solveProb(ResidEval* resid) : m_maxstep(1000), m_ioflag(0) { + warn_deprecated("class solveProb", "To be removed after Cantera 2.2."); m_neq = m_residFunc->nEquations(); // Dimension solution vector