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

Doxygen updates

Browse source 
eliminated m_poly from MixTransport. It wasn't being used
This commit is contained in:
Harry Moffat 2010-08-11 21:09:04 +00:00
parent d92b781711
commit e3c4a82dc9
3 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cantera/src/transport/MixTransport.cpp
View file

@ -53,7 +53,6 @@ namespace Cantera {
m_sqvisc(0), m_sqvisc(0),
m_cond(0), m_cond(0),
m_molefracs(0), m_molefracs(0),
m_poly(0),
m_phi(0,0), m_phi(0,0),
m_wratjk(0,0), m_wratjk(0,0),
m_wratkj1(0,0), m_wratkj1(0,0),
@ -98,7 +97,6 @@ namespace Cantera {
m_sqvisc(0), m_sqvisc(0),
m_cond(0), m_cond(0),
m_molefracs(0), m_molefracs(0),
m_poly(0),
m_phi(0,0), m_phi(0,0),
m_wratjk(0,0), m_wratjk(0,0),
m_wratkj1(0,0), m_wratkj1(0,0),
@ -156,7 +154,6 @@ namespace Cantera {
m_sqvisc = right.m_sqvisc; m_sqvisc = right.m_sqvisc;
m_cond = right.m_cond; m_cond = right.m_cond;
m_molefracs = right.m_molefracs; m_molefracs = right.m_molefracs;
m_poly = right.m_poly;
m_phi = right.m_phi; m_phi = right.m_phi;
m_wratjk = right.m_wratjk; m_wratjk = right.m_wratjk;
m_wratkj1 = right.m_wratkj1; m_wratkj1 = right.m_wratkj1;
@ -220,7 +217,6 @@ namespace Cantera {
m_thermo->molecularWeights().end(), m_mw.begin()); m_thermo->molecularWeights().end(), m_mw.begin());
// copy polynomials and parameters into local storage // copy polynomials and parameters into local storage
m_poly = tr.poly;
m_visccoeffs = tr.visccoeffs; m_visccoeffs = tr.visccoeffs;
m_condcoeffs = tr.condcoeffs; m_condcoeffs = tr.condcoeffs;
m_diffcoeffs = tr.diffcoeffs; m_diffcoeffs = tr.diffcoeffs;
@ -619,11 +615,19 @@ namespace Cantera {
m_spvisc_ok = true; m_spvisc_ok = true;
} }
//==================================================================================================================== //====================================================================================================================
// Update the temperature-dependent viscosity terms.
/* /*
* Update the temperature-dependent viscosity terms. * Updates the array of pure species viscosities, and the weighting functions in the viscosity mixture rule.
* Updates the array of pure species viscosities, and the
* weighting functions in the viscosity mixture rule.
* The flag m_visc_ok is set to true. * The flag m_visc_ok is set to true.
*
* The formula for the weighting function is from Poling and Prausnitz.
* See Eq. (9-5.14) of Poling, Prausnitz, and O'Connell. The equation for the weighting function
* \f$ \phi_{ij} \f$ is reproduced below.
*
* \f[
* \phi_{ij} = \frac{ \left[ 1 + \left( \mu_i / \mu_j \right)^{1/2} \left( M_j / M_i \right)^{1/4} \right]^2 }
* {\left[ 8 \left( 1 + M_i / M_j \right) \right]^{1/2}}
* \f]
*/ */
void MixTransport::updateViscosity_T() { void MixTransport::updateViscosity_T() {
doublereal vratiokj, wratiojk, factor1; doublereal vratiokj, wratiojk, factor1;
@ -640,8 +644,7 @@ namespace Cantera {
// Note that m_wratjk(k,j) holds the square root of // Note that m_wratjk(k,j) holds the square root of
// m_wratjk(j,k)! // m_wratjk(j,k)!
factor1 = 1.0 + (m_sqvisc[k]/m_sqvisc[j]) * m_wratjk(k,j); factor1 = 1.0 + (m_sqvisc[k]/m_sqvisc[j]) * m_wratjk(k,j);
m_phi(k,j) = factor1*factor1 / m_phi(k,j) = factor1*factor1 / (SqrtEight * m_wratkj1(j,k));
(SqrtEight * m_wratkj1(j,k));
m_phi(j,k) = m_phi(k,j)/(vratiokj * wratiojk); m_phi(j,k) = m_phi(k,j)/(vratiokj * wratiojk);
} }
} }

40
Cantera/src/transport/MixTransport.h
View file

@ -275,6 +275,22 @@ namespace Cantera {
m_thermo->temperature()); m_thermo->temperature());
} }
void updateThermal_T(); void updateThermal_T();
//! Update the temperature-dependent viscosity terms.
/*!
* Updates the array of pure species viscosities, and the weighting functions in the viscosity mixture rule.
* The flag m_visc_ok is set to true.
*
* The formula for the weighting function is from Poling and Prausnitz.
* See Eq. (9-5.14) of Poling, Prausnitz, and O'Connell. The equation for the weighting function
* \f$ \phi_{ij} \f$ is reproduced below.
*
* \f[
* \phi_{ij} = \frac{ \left[ 1 + \left( \mu_i / \mu_j \right)^{1/2} \left( M_j / M_i \right)^{1/4} \right]^2 }
* {\left[ 8 \left( 1 + M_i / M_j \right) \right]^{1/2}}
* \f]
*/
void updateViscosity_T(); void updateViscosity_T();
//! Update the temperature dependent parts of the species thermal conductivities //! Update the temperature dependent parts of the species thermal conductivities
@ -356,16 +372,26 @@ namespace Cantera {
*/ */
vector_fp m_molefracs; vector_fp m_molefracs;
std::vector<std::vector<int> > m_poly; //! m_phi is a Viscosity Weighting Function
/*!
//! Viscosity Weighting Functions * size = m_nsp * n_nsp
DenseMatrix m_phi; */
DenseMatrix m_phi;
//! Holds square roots or molecular weight ratios
/*!
* m_wratjk(j,k) = sqrt(mw[j]/mw[k]) j < k
* m_wratjk(k,j) = sqrt(sqrt(mw[j]/mw[k])) j < k
*/
DenseMatrix m_wratjk; DenseMatrix m_wratjk;
//! Holds square roots of molecular weight ratios
/*!
* m_wratjk1(j,k) = sqrt(1.0 + mw[k]/mw[j]) j < k
*/
DenseMatrix m_wratkj1; DenseMatrix m_wratkj1;

2
Cantera/src/transport/TransportParams.h
View file

@ -126,7 +126,7 @@ namespace Cantera {
*/ */
std::vector<vector_fp> diffcoeffs; std::vector<vector_fp> diffcoeffs;
//! This is vector of vectors containing the integer ookup value for the (i,j) interaction //! This is vector of vectors containing the integer lookup value for the (i,j) interaction
/*! /*!
* The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value.
* Unique values of delta get their own spot in the array. The values of delta are storred in * Unique values of delta get their own spot in the array. The values of delta are storred in