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

Starting to rough in aqueous transport.

Browse source
This commit is contained in:
Harry Moffat 2009-09-16 19:57:45 +00:00
parent 2bd7816b65
commit ce79948739
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cantera/src/transport/LiquidTransport.cpp
View file

@ -100,7 +100,6 @@ namespace Cantera {
m_tmin = right.m_tmin;
m_tmax = right.m_tmax;
m_mw = right.m_mw;
m_poly = right.m_poly;
viscCoeffsVector_ = right.viscCoeffsVector_;
m_condcoeffs = right.m_condcoeffs;
m_diffcoeffs = right.m_diffcoeffs;
@ -125,7 +124,6 @@ namespace Cantera {
m_B = right.m_B;
m_A = right.m_A;
m_eps = right.m_eps;
m_alpha = right.m_alpha;
m_temp = right.m_temp;
m_logt = right.m_logt;
m_sqrt_t = right.m_sqrt_t;
@ -176,15 +174,13 @@ namespace Cantera {
m_thermo->molecularWeights().end(), m_mw.begin());
// copy polynomials and parameters into local storage
m_poly = tr.poly;
viscCoeffsVector_ = tr.viscCoeffsVector_;
m_condcoeffs = tr.condcoeffs;
m_diffcoeffs = tr.diffcoeffs;
//m_diffcoeffs = tr.diffcoeffs;
m_mode = tr.mode;
m_diam = tr.diam;
m_eps = tr.eps;
m_alpha = tr.alpha;
m_phi.resize(m_nsp, m_nsp, 0.0);

7
Cantera/src/transport/LiquidTransport.h
View file

@ -368,9 +368,6 @@ namespace Cantera {
*/
vector_fp m_mw;
// polynomial fits
vector<vector<int> > m_poly;
//! Polynomial coefficients of the viscosity
/*!
* These express the temperature dependendence of the pures
@ -619,10 +616,6 @@ namespace Cantera {
//! Internal storage for the species LJ well depth
vector_fp m_eps;
//! Internal storage for species polarizability
vector_fp m_alpha;
//! Current Temperature -> locally storred
/*!

41
Cantera/src/transport/LiquidTransportParams.h
View file

@ -27,27 +27,38 @@ namespace Cantera {
thermo_t* thermo;
vector_fp mw;
// polynomial fits
std::vector<vector_fp> viscCoeffsVector_;
std::vector<vector_fp> condcoeffs;
std::vector<vector_fp> diffcoeffs;
vector_fp polytempvec;
std::vector<std::vector<int> > poly;
std::vector<vector_fp > omega22_poly;
std::vector<vector_fp > astar_poly;
std::vector<vector_fp > bstar_poly;
std::vector<vector_fp > cstar_poly;
//! Coefficients for the limiting conductivity of ions
//! in solution: A_k
/*!
* This is used in the following formula for the
* limiting conductivity of the kth ion.
*
* ln (lambda^o_k nu_solv) = A_k + B_k / T
*
* nu_solv is the pure component solvent viscosity
*
* Note the limiting conductivities of ions will also
* be used to input the diffusion coefficients.
*/
vector_fp A_k_cond;
//! Coefficients for the limiting conductivity of ions
//! in solution: B_k
vector_fp B_k_cond;
// polynomial fits
std::vector<vector_fp> viscCoeffsVector_;
std::vector<vector_fp> condcoeffs;
std::vector<vector_fp> diffcoeffs ;
vector_fp zrot;
vector_fp crot;
std::vector<bool> polar;
vector_fp alpha;
//vector_fp alpha;
vector_fp fitlist;
vector_fp eps;
vector_fp sigma;
DenseMatrix reducedMass;
DenseMatrix reducedMass;
DenseMatrix diam;
DenseMatrix epsilon;
DenseMatrix dipole;