diff --git a/Cantera/src/transport/LiquidTransportParams.h b/Cantera/src/transport/LiquidTransportParams.h
index faf08edb6..1dd99b5d7 100644
--- a/Cantera/src/transport/LiquidTransportParams.h
+++ b/Cantera/src/transport/LiquidTransportParams.h
@@ -21,14 +21,54 @@ namespace Cantera {
* 2 - Properties weighted linearly by mass fractions
* 3 - Properties weighted logarithmically by mole fractions (interaction energy weighting)
* 4 - Interactions given pairwise between each possible species (i.e. D_ij)
+ *
+ *
+ *
+ *
+ *
+ * LiCl(L)
+ * KCl(L)
+ * -1.0
+ * 1.0E-1
+ *
+ *
+ *
+ *
+ *
+ *
+ * Li+
+ * K+
+ * 1.5
+ *
+ *
+ * K+
+ * Cl-
+ * 1.0
+ *
+ *
+ * Li+
+ * Cl-
+ * 1.2
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*/
enum LiquidTranMixingModel {
LTR_MIXMODEL_NOTSET=-1,
+ LTR_MIXMODEL_NONE,
LTR_MIXMODEL_SOLVENT,
LTR_MIXMODEL_MOLEFRACS,
LTR_MIXMODEL_MASSFRACS,
LTR_MIXMODEL_LOG_MOLEFRACS,
- LTR_PAIRWISE_INTERACTIONS
+ LTR_PAIRWISE_INTERACTION
};
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index 180651b0e..1d1ec5ffb 100644
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -885,29 +885,29 @@ namespace Cantera {
* hydrodynamic radius
*
* format:
- * 3.0
- * 3.0
- *
+ * 3.0
+ * 3.0
+ *
* 1.0
* 2.0
* 3.0
- *
+ *
*
- *
+ *
* 0.0. 1.0, 2.0, 3.0, 4.0
- *
+ *
*
*/
- if (trNode.hasChild("hydrodynamic_radius")) {
- XML_Node& hnode = trNode.child("hydrodynamic_radius");
+ if (trNode.hasChild("hydrodynamicRadius")) {
+ XML_Node& hnode = trNode.child("hydrodynamicRadius");
std::string units = lowercase(hnode["units"]);
if ( units == "" )
- cout << "Warning::hydrodynamic_radius units not given for "
+ cout << "Warning::hydrodynamicRadius units not given for "
<< name << endl
<< " Units assumed to be meters." << endl;
std::string model = lowercase(hnode["model"]);
if (model == "" || model == "constant") {
- A_k = getFloat(trNode, "hydrodynamic_radius", "toSI");
+ A_k = getFloat(trNode, "hydrodynamicRadius", "toSI");
//A_k = hnode.fp_value();
//// Angstroms -> meters
//A_k = 1.e-10 * A_k;
@@ -916,7 +916,7 @@ namespace Cantera {
} else throw TransportDBError(linenum,
"negative or zero hydrodynamic radius");
data.model_hydroradius = LTR_MODEL_CONSTANT;
- } else if (model == "arrhenius") {
+ } else if (model == "Arrhenius") {
getArrhenius(hnode, A_k, n_k, Tact_k);
if (A_k <= 0.0) {
throw TransportDBError(linenum, "negative or zero viscosity");
@@ -935,7 +935,7 @@ namespace Cantera {
data.model_hydroradius = LTR_MODEL_POLY;
} else {
throw CanteraError(" TransportFactory::getLiquidSpeciesTransportData",
- "Unknown model for hydrodynamic_radius:" + model);
+ "Unknown model for hydrodynamicRadius:" + model);
}
}
@@ -965,7 +965,7 @@ namespace Cantera {
else throw TransportDBError(linenum,
"negative or zero viscosity");
data.model_viscosity = LTR_MODEL_CONSTANT;
- } else if (model == "arrhenius") {
+ } else if (model == "Arrhenius") {
getArrhenius(vnode, A_k, n_k, Tact_k);
if (A_k <= 0.0) {
throw TransportDBError(linenum, "negative or zero viscosity");
@@ -1011,7 +1011,7 @@ namespace Cantera {
else throw TransportDBError(linenum,
"negative or zero thermalConductivity");
data.model_thermalCond = LTR_MODEL_CONSTANT;
- } else if (model == "arrhenius") {
+ } else if (model == "Arrhenius") {
getArrhenius(tnode, A_k, n_k, Tact_k);
if (A_k <= 0.0) {
throw TransportDBError(linenum, "negative or zero thermalConductivity");
@@ -1058,7 +1058,7 @@ namespace Cantera {
else throw TransportDBError(linenum,
"negative or zero speciesDiffusivity");
data.model_speciesDiffusivity = LTR_MODEL_CONSTANT;
- } else if (model == "arrhenius") {
+ } else if (model == "Arrhenius") {
getArrhenius(dnode, A_k, n_k, Tact_k);
if (A_k <= 0.0) {
throw TransportDBError(linenum, "negative or zero speciesDiffusivity");