diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index 18d1f8aa1..644aa4f3f 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -373,15 +373,7 @@ public: //! Solve the stefan_maxell equations for the diffusive fluxes. void stefan_maxwell_solve(); - - private: - - - - //! Number of species in the mixture - size_t m_nsp; - //! Minimum temperature applicable to the transport property eval doublereal m_tmin; diff --git a/include/cantera/transport/DustyGasTransport.h b/include/cantera/transport/DustyGasTransport.h index 488db1bfd..1f9128331 100644 --- a/include/cantera/transport/DustyGasTransport.h +++ b/include/cantera/transport/DustyGasTransport.h @@ -285,10 +285,6 @@ private: */ void eval_H_matrix(); - - //! Number of species in the gas phase - size_t m_nsp; - //! Local copy of the species molecular weights /*! * units kg /kmol diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h index 774a93481..0f531be51 100644 --- a/include/cantera/transport/LiquidTransport.h +++ b/include/cantera/transport/LiquidTransport.h @@ -880,10 +880,6 @@ protected: private: - - //! Number of species in the phase - size_t m_nsp; - //! Number of species squared size_t m_nsp2; diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index 61d09dfa2..be43a808d 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -346,10 +346,6 @@ private: // --------- Member Data ------------- private: - - //! Number of species in the phase - size_t m_nsp; - //! Minimum value of the temperature that this transport parameterization is valid doublereal m_tmin; diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index 61640d3f5..d726364b5 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -266,8 +266,6 @@ private: doublereal m_visc_tlast; doublereal m_thermal_tlast; - //! Number of species in the phase - size_t m_nsp; doublereal m_tmin; doublereal m_tmax; vector_fp m_mw; diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index b7cc663d7..9aa0b14d6 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -594,10 +594,6 @@ protected: private: - - //! Number of species in the mixture - size_t m_nsp; - //! Temperature dependence type /*! * The following coefficients are allowed to have simple diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index 8c5e2cd43..7cbd1b5cd 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -841,7 +841,7 @@ protected: bool m_ready; //! Number of species - size_t m_nmin; + size_t m_nsp; //! Number of dimensions used in flux expresions size_t m_nDim; diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index 37c58bf0a..534d94f62 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -30,7 +30,6 @@ namespace Cantera //==================================================================================================================== AqueousTransport::AqueousTransport() : - m_nsp(0), m_tmin(-1.0), m_tmax(100000.), m_iStateMF(-1), diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index 508b4214b..f892bc364 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -28,7 +28,6 @@ namespace Cantera //==================================================================================================================== DustyGasTransport::DustyGasTransport(thermo_t* thermo) : Transport(thermo), - m_nsp(0), m_mw(0), m_dk(0), m_temp(-1.0), @@ -49,7 +48,6 @@ DustyGasTransport::DustyGasTransport(thermo_t* thermo) : //==================================================================================================================== DustyGasTransport::DustyGasTransport(const DustyGasTransport& right) : Transport(), - m_nsp(0), m_mw(0), m_dk(0), m_temp(-1.0), @@ -83,7 +81,6 @@ DustyGasTransport& DustyGasTransport::operator=(const DustyGasTransport& right) } Transport::operator=(right); - m_nsp = right.m_nsp; m_mw = right.m_mw; m_d = right.m_d; m_x = right.m_x; @@ -182,7 +179,7 @@ void DustyGasTransport::initialize(ThermoPhase* phase, Transport* gastr) // constant mixture attributes m_thermo = phase; - m_nsp = m_thermo->nSpecies(); + m_nsp = m_thermo->nSpecies(); if (m_gastran != gastr) { if (m_gastran) { delete m_gastran; diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index a599b8b93..14ca91e33 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -29,7 +29,6 @@ namespace Cantera LiquidTransport::LiquidTransport(thermo_t* thermo, int ndim) : Transport(thermo, ndim), - m_nsp(0), m_nsp2(0), m_tmin(-1.0), m_tmax(100000.), @@ -77,7 +76,6 @@ LiquidTransport::LiquidTransport(thermo_t* thermo, int ndim) : LiquidTransport::LiquidTransport(const LiquidTransport& right) : Transport(right.m_thermo, right.m_nDim), - m_nsp(0), m_nsp2(0), m_tmin(-1.0), m_tmax(100000.), @@ -133,8 +131,7 @@ LiquidTransport& LiquidTransport::operator=(const LiquidTransport& right) return *this; } Transport::operator=(right); - m_nsp = right.m_nsp; - m_nsp2 = right.m_nsp2; + m_nsp2 = right.m_nsp2; m_tmin = right.m_tmin; m_tmax = right.m_tmax; m_mw = right.m_mw; diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index dc8be3f29..d114b242b 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -29,7 +29,6 @@ namespace Cantera //==================================================================================================================== MixTransport::MixTransport() : - m_nsp(0), m_tmin(-1.0), m_tmax(100000.), m_mw(0), @@ -73,7 +72,6 @@ MixTransport::MixTransport() : } //==================================================================================================================== MixTransport::MixTransport(const MixTransport& right) : - m_nsp(0), m_tmin(-1.0), m_tmax(100000.), m_mw(0), @@ -131,7 +129,6 @@ MixTransport& MixTransport::operator=(const MixTransport& right) } Transport::operator=(right); - m_nsp = right.m_nsp; m_tmin = right.m_tmin; m_tmax = right.m_tmax; m_mw =right.m_mw; diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 77f169cc9..ddfc4cade 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -32,7 +32,6 @@ namespace Cantera //================================================================================================ SimpleTransport::SimpleTransport(thermo_t* thermo, int ndim) : Transport(thermo, ndim), - m_nsp(0), tempDepType_(0), compositionDepType_(0), useHydroRadius_(false), @@ -57,7 +56,6 @@ SimpleTransport::SimpleTransport(thermo_t* thermo, int ndim) : //================================================================================================ SimpleTransport::SimpleTransport(const SimpleTransport& right) : Transport(), - m_nsp(0), tempDepType_(0), compositionDepType_(0), useHydroRadius_(false), @@ -91,7 +89,6 @@ SimpleTransport& SimpleTransport::operator=(const SimpleTransport& right) } Transport::operator=(right); - m_nsp = right.m_nsp; tempDepType_ = right.tempDepType_; compositionDepType_ = right.compositionDepType_; useHydroRadius_ = right.useHydroRadius_; diff --git a/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp index 783bf4a4c..3683a59d2 100644 --- a/src/transport/TransportBase.cpp +++ b/src/transport/TransportBase.cpp @@ -32,7 +32,7 @@ namespace Cantera Transport::Transport(thermo_t* thermo, size_t ndim) : m_thermo(thermo), m_ready(false), - m_nmin(0), + m_nsp(0), m_nDim(ndim), m_velocityBasis(VB_MASSAVG) { @@ -42,7 +42,7 @@ Transport::Transport(const Transport& right) { m_thermo = right.m_thermo; m_ready = right.m_ready; - m_nmin = right.m_nmin; + m_nsp = right.m_nsp; m_nDim = right.m_nDim; m_velocityBasis = right.m_velocityBasis; } @@ -55,7 +55,7 @@ Transport& Transport::operator=(const Transport& right) } m_thermo = right.m_thermo; m_ready = right.m_ready; - m_nmin = right.m_nmin; + m_nsp = right.m_nsp; m_nDim = right.m_nDim; m_velocityBasis = right.m_velocityBasis; return *this; @@ -99,7 +99,7 @@ void Transport::setThermo(thermo_t& thermo) { if (!ready()) { m_thermo = &thermo; - m_nmin = m_thermo->nSpecies(); + m_nsp = m_thermo->nSpecies(); } else throw CanteraError("Transport::setThermo", "the phase object cannot be changed after "