From 9782ac76e8b582497fbd424e2cbd7329fd18d07b Mon Sep 17 00:00:00 2001
From: John Hewson <jchewso@sandia.gov>
Date: Wed, 16 Dec 2009 00:29:32 +0000
Subject: [PATCH] Minor edits

---
 .../src/transport/LiquidTransportParams.cpp   |  6 +++--
 Cantera/src/transport/LiquidTransportParams.h | 23 ++++++++++++++++---
 Cantera/src/transport/TransportFactory.cpp    | 10 +-------
 Cantera/src/transport/TransportParams.h       |  1 -
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Cantera/src/transport/LiquidTransportParams.cpp b/Cantera/src/transport/LiquidTransportParams.cpp
index b811eefa4..7aafc4859 100644
--- a/Cantera/src/transport/LiquidTransportParams.cpp
+++ b/Cantera/src/transport/LiquidTransportParams.cpp
@@ -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;
diff --git a/Cantera/src/transport/LiquidTransportParams.h b/Cantera/src/transport/LiquidTransportParams.h
index b4ab26a22..4e0656ac9 100644
--- a/Cantera/src/transport/LiquidTransportParams.h
+++ b/Cantera/src/transport/LiquidTransportParams.h
@@ -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 
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index 72902ec87..921ee4236 100644
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -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 );
     }
diff --git a/Cantera/src/transport/TransportParams.h b/Cantera/src/transport/TransportParams.h
index 119f6a7d6..563c6d9ca 100644
--- a/Cantera/src/transport/TransportParams.h
+++ b/Cantera/src/transport/TransportParams.h
@@ -40,7 +40,6 @@ namespace Cantera {
     }
 
     int nsp_;
-
     //        phase_t* mix;
     thermo_t* thermo;
     vector_fp        mw;