research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved m_nsp up to Transport from derived classes

Browse source
This commit is contained in:
Ray Speth 2012-03-15 19:51:25 +00:00
parent 1e8870191d
commit b145ee407d
13 changed files with 7 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/cantera/transport/AqueousTransport.h
View file

@ -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;

4
include/cantera/transport/DustyGasTransport.h
View file

@ -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

4
include/cantera/transport/LiquidTransport.h
View file

@ -880,10 +880,6 @@ protected:
private:
//! Number of species in the phase
size_t m_nsp;
//! Number of species squared
size_t m_nsp2;

4
include/cantera/transport/MixTransport.h
View file

@ -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;

2
include/cantera/transport/MultiTransport.h
View file

@ -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;

4
include/cantera/transport/SimpleTransport.h
View file

@ -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

2
include/cantera/transport/TransportBase.h
View file

@ -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;

1
src/transport/AqueousTransport.cpp
View file

@ -30,7 +30,6 @@ namespace Cantera
//====================================================================================================================
AqueousTransport::AqueousTransport() :
m_nsp(0),
m_tmin(-1.0),
m_tmax(100000.),
m_iStateMF(-1),

5
src/transport/DustyGasTransport.cpp
View file

@ -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;

5
src/transport/LiquidTransport.cpp
View file

@ -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;

3
src/transport/MixTransport.cpp
View file

@ -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;

3
src/transport/SimpleTransport.cpp
View file

@ -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_;

8
src/transport/TransportBase.cpp
View file

@ -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 "