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

Changes due to m_speciesData changing.

Browse source
This commit is contained in:
Harry Moffat 2008-12-24 18:19:01 +00:00
parent 4d4f43e679
commit 7d5f3c0698
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -348,7 +348,7 @@ namespace Cantera {
* collision integrals.
*/
void TransportFactory::setupMM(std::ostream &flog,
const XML_Node* transport_database,
const std::vector<const XML_Node*> &transport_database,
thermo_t* thermo, int mode, int log_level, TransportParams& tr) {
// constant mixture attributes
@ -476,7 +476,7 @@ namespace Cantera {
void TransportFactory::initTransport(Transport* tran,
thermo_t* thermo, int mode, int log_level) {
const XML_Node* transport_database = thermo->speciesData();
const std::vector<const XML_Node*> & transport_database = thermo->speciesData();
TransportParams tr;
#ifdef DEBUG_MODE
@ -599,17 +599,14 @@ namespace Cantera {
* instance of TransportParams containing the transport data for
* these species read from the file.
*/
void TransportFactory::getTransportData(const XML_Node* transport_database,
XML_Node& log, const vector<string>& names, TransportParams& tr)
void TransportFactory::getTransportData(const std::vector<const XML_Node*> &xspecies,
XML_Node& log, const std::vector<std::string> &names, TransportParams& tr)
{
string name;
int geom;
map<string, GasTransportData> datatable;
std::map<std::string, GasTransportData> datatable;
doublereal welldepth, diam, dipole, polar, rot;
//XML_Node* sparray = find_XML("", &root, "", "", "speciesData");
vector<XML_Node*> xspecies;
transport_database->getChildren("species",xspecies);
int nsp = static_cast<int>(xspecies.size());
// read all entries in database into 'datatable' and check for

4
Cantera/src/transport/TransportFactory.h
View file

@ -153,7 +153,7 @@ namespace Cantera {
*/
TransportFactory();
void getTransportData(const XML_Node* db,
void getTransportData(const std::vector<const XML_Node*> &db,
XML_Node& log, const std::vector<std::string>& names,
TransportParams& tr);
@ -167,7 +167,7 @@ namespace Cantera {
void setupMM(std::ostream &flog, const XML_Node* transport_database,
void setupMM(std::ostream &flog, const std::vector<const XML_Node*> &transport_database,
thermo_t* thermo, int mode, int log_level,
TransportParams& tr);