diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp index 0f263babb..342875e5b 100755 --- a/Cantera/src/transport/TransportFactory.cpp +++ b/Cantera/src/transport/TransportFactory.cpp @@ -348,7 +348,7 @@ namespace Cantera { * collision integrals. */ void TransportFactory::setupMM(std::ostream &flog, - const XML_Node* transport_database, + const std::vector &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 & 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& names, TransportParams& tr) + void TransportFactory::getTransportData(const std::vector &xspecies, + XML_Node& log, const std::vector &names, TransportParams& tr) { string name; int geom; - map datatable; + std::map datatable; doublereal welldepth, diam, dipole, polar, rot; - //XML_Node* sparray = find_XML("", &root, "", "", "speciesData"); - vector xspecies; - transport_database->getChildren("species",xspecies); int nsp = static_cast(xspecies.size()); // read all entries in database into 'datatable' and check for diff --git a/Cantera/src/transport/TransportFactory.h b/Cantera/src/transport/TransportFactory.h index 17f8ad5e4..a4c673ced 100755 --- a/Cantera/src/transport/TransportFactory.h +++ b/Cantera/src/transport/TransportFactory.h @@ -153,7 +153,7 @@ namespace Cantera { */ TransportFactory(); - void getTransportData(const XML_Node* db, + void getTransportData(const std::vector &db, XML_Node& log, const std::vector& 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 &transport_database, thermo_t* thermo, int mode, int log_level, TransportParams& tr);