From 90d18dd3375c8c87dacecea34e253d5a01d8d8a5 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 17 Jun 2017 23:34:47 -0400 Subject: [PATCH] Remove some unused, inaccessible variables --- include/cantera/base/ctexceptions.h | 4 +--- include/cantera/thermo/PDSS_HKFT.h | 6 ------ include/cantera/transport/MixTransport.h | 3 --- include/cantera/transport/SimpleTransport.h | 15 --------------- src/base/ctexceptions.cpp | 3 +-- src/thermo/MixtureFugacityTP.cpp | 1 - src/thermo/PDSS_HKFT.cpp | 2 -- src/transport/MixTransport.cpp | 3 +-- src/transport/SimpleTransport.cpp | 1 - 9 files changed, 3 insertions(+), 35 deletions(-) diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h index adce3296b..36db5d052 100644 --- a/include/cantera/base/ctexceptions.h +++ b/include/cantera/base/ctexceptions.h @@ -79,7 +79,6 @@ public: CanteraError(const std::string& procedure, const std::string& msg, const Args&... args) : procedure_(procedure) - , saved_(false) { if (sizeof...(args) == 0) { msg_ = msg; @@ -105,7 +104,7 @@ public: protected: //! Protected default constructor discourages throwing errors containing no //! information. - CanteraError() : saved_(false) {}; + CanteraError() {}; //! Constructor used by derived classes that override getMessage() explicit CanteraError(const std::string& procedure); @@ -116,7 +115,6 @@ protected: private: std::string msg_; //!< Message associated with the exception - bool saved_; //!< Exception has already been saved to Cantera's error stack }; diff --git a/include/cantera/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h index 6f8114cc6..7d03f3585 100644 --- a/include/cantera/thermo/PDSS_HKFT.h +++ b/include/cantera/thermo/PDSS_HKFT.h @@ -249,12 +249,6 @@ private: //! Pointer to the water property calculator std::unique_ptr m_waterProps; - //! Born coefficient for the current ion or species - doublereal m_born_coeff_j; - - //! Electrostatic radii - doublereal m_r_e_j; - //! Input value of deltaG of Formation at Tr and Pr (cal gmol-1) /*! * Tr = 298.15 Pr = 1 atm diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index cab1a9234..0c8e0449f 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -184,9 +184,6 @@ private: //! Update boolean for the mixture rule for the mixture thermal conductivity bool m_condmix_ok; - - //! Debug flag - turns on more printing - bool m_debug; }; } #endif diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index b299c2153..e4df1c849 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -466,21 +466,6 @@ protected: void updateDiff_T(); private: - //! Temperature dependence type - /*! - * The following coefficients are allowed to have simple temperature - * dependencies: - * - mixture viscosity - * - mixture thermal conductivity - * - diffusitivy - * - * Types of temperature dependencies: - * 0 - Independent of temperature (only one implemented so far) - * 1 - extended arrhenius form - * 2 - polynomial in temperature form - */ - int tempDepType_; - //! Composition dependence of the transport properties /*! * The following coefficients are allowed to have simple composition diff --git a/src/base/ctexceptions.cpp b/src/base/ctexceptions.cpp index 5038b95ad..b5b850730 100644 --- a/src/base/ctexceptions.cpp +++ b/src/base/ctexceptions.cpp @@ -17,8 +17,7 @@ namespace Cantera static const char* stars = "***********************************************************************\n"; CanteraError::CanteraError(const std::string& procedure) : - procedure_(procedure), - saved_(false) + procedure_(procedure) { } diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 36ca48e21..9c45700a2 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -321,7 +321,6 @@ void MixtureFugacityTP::setState_TR(doublereal T, doublereal rho) Phase::setTemperature(T); _updateReferenceStateThermo(); Phase::setDensity(rho); - doublereal mv = molarVolume(); // depends on mole fraction and temperature updateMixingExpressions(); iState_ = phaseState(true); diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index 072880649..2b48b7337 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -25,8 +25,6 @@ int PDSS_HKFT::s_InputInconsistencyErrorExit = 1; PDSS_HKFT::PDSS_HKFT() : m_waterSS(0) , m_densWaterSS(-1.0) - , m_born_coeff_j(-1.0) - , m_r_e_j(-1.0) , m_deltaG_formation_tr_pr(NAN) , m_deltaH_formation_tr_pr(NAN) , m_Mu0_tr_pr(0.0) diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index f1d1860ec..9eae08ee4 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -16,8 +16,7 @@ namespace Cantera MixTransport::MixTransport() : m_lambda(0.0), m_spcond_ok(false), - m_condmix_ok(false), - m_debug(false) + m_condmix_ok(false) { } diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index a83b5250f..de3c19a4d 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -15,7 +15,6 @@ namespace Cantera { SimpleTransport::SimpleTransport(thermo_t* thermo, int ndim) : Transport(thermo, ndim), - tempDepType_(0), compositionDepType_(LTI_MODEL_SOLVENT), useHydroRadius_(false), doMigration_(0),