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

Minor edits

Browse source
This commit is contained in:
John Hewson 2009-12-16 00:29:32 +00:00
parent 8e8c7ec38f
commit 9782ac76e8
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -350,10 +350,12 @@ namespace Cantera {
void LTI_Pairwise_Interaction::setParameters( LiquidTransportParams& trParam ) {
int nsp = m_thermo->nSpecies();
m_diagonals.resize(nsp);
for (int k = 0; k < nsp; k++) {
Cantera::LiquidTransportData &ltd = trParam.LTData[k];
m_diagonals[k] = ltd.speciesDiffusivity;
if ( ltd.speciesDiffusivity )
m_diagonals[k] = ltd.speciesDiffusivity;
}
}
@ -398,7 +400,7 @@ namespace Cantera {
tmp(i,j) = tmp(j,i) = m_Dij(i,j) * exp( - m_Eij(i,j) / temp );
for ( int i = 0; i < nsp; i++ )
if ( tmp(i,i) == 0.0 && !(m_diagonals[i]) )
if ( tmp(i,i) == 0.0 && m_diagonals[i] )
tmp(i,i) = m_diagonals[i]->getSpeciesTransProp() ;
return tmp;

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

@ -25,6 +25,14 @@
namespace Cantera {
class NotImplemented : public CanteraError {
public:
NotImplemented(std::string method) : CanteraError("Transport",
"\n\n**** Method "+method+" not implemented. ****\n"
"(Did you forget to specify a transport model?)\n\n") {}
};
//! Composition dependence type for liquid mixture transport properties
/*!
* Types of temperature dependencies:
@ -116,9 +124,18 @@ namespace Cantera {
//! Return the mixture transport property value.
//! (Must be implemented in subclasses.)
virtual doublereal getMixTransProp( doublereal* speciesValues, doublereal *weightSpecies = 0 ) { return 0.0; }
virtual doublereal getMixTransProp( std::vector<LTPspecies*> LTPptrs ) { return 0.0; }
virtual DenseMatrix getMatrixTransProp( doublereal* speciesValues = 0 ) { return m_Dij; }
virtual doublereal getMixTransProp( doublereal* speciesValues, doublereal *weightSpecies = 0 ) {
throw NotImplemented("LiquidTranInteraction::getMixTransProp");
}
virtual doublereal getMixTransProp( std::vector<LTPspecies*> LTPptrs ) {
throw NotImplemented("LiquidTranInteraction::getMixTransProp");
}
virtual DenseMatrix getMatrixTransProp( doublereal* speciesValues = 0 ) {
//return m_Dij;
throw NotImplemented("LiquidTranInteraction::getMixTransProp");
}
protected:
//! Model for species interaction effects

10
Cantera/src/transport/TransportFactory.cpp
View file

@ -75,14 +75,6 @@ namespace Cantera {
};
class NotImplemented : public CanteraError {
public:
NotImplemented(std::string method) : CanteraError("Transport",
"\n\n\n**** Method "+method+" not implemented. ****\n"
"(Did you forget to specify a transport model?)\n\n\n") {}
};
/////////////////////////// constants //////////////////////////
const doublereal ThreeSixteenths = 3.0/16.0;
@ -373,7 +365,7 @@ namespace Cantera {
lti->setParameters( trParam );
break;
default:
throw CanteraError("newLTI","unknown transport model: " + model );
// throw CanteraError("newLTI","unknown transport model: " + model );
lti = new LiquidTranInteraction( tp_ind );
lti->init( trNode, thermo );
}

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

@ -40,7 +40,6 @@ namespace Cantera {
}
int nsp_;
// phase_t* mix;
thermo_t* thermo;
vector_fp mw;