From c0249fa3d21d43814bfa55bc20404f022d8211eb Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Wed, 2 Dec 2009 02:07:02 +0000
Subject: [PATCH] Modified TransportParams to eliminate a warning message due
 to the constructor initialization list being out of order.

---
 Cantera/src/transport/TransportFactory.cpp |   6 -
 Cantera/src/transport/TransportParams.h    | 156 +++++++++++++--------
 2 files changed, 100 insertions(+), 62 deletions(-)

diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index e9c40e42d..72902ec87 100644
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -90,12 +90,6 @@ namespace Cantera {
   const doublereal FiveThirds      = 5.0/3.0;
 
 
-  TransportParams::~TransportParams(){
-#ifdef DEBUG_MODE
-    delete xml;
-#endif
-  };
-
 
   //////////////////// class TransportFactory methods //////////////
 
diff --git a/Cantera/src/transport/TransportParams.h b/Cantera/src/transport/TransportParams.h
index 63c4b9f0b..119f6a7d6 100755
--- a/Cantera/src/transport/TransportParams.h
+++ b/Cantera/src/transport/TransportParams.h
@@ -11,77 +11,121 @@
 
 namespace Cantera {
 
-    /** 
-     * Base class to hold transport model parameters.  
-     * Used by TransportFactory.
-     */
-    class TransportParams {
+  /** 
+   * Base class to hold transport model parameters.  
+   * Used by TransportFactory.
+   */
+  class TransportParams {
 
-    public:
+  public:
 
-        TransportParams() : thermo(0), xml(0), velocityBasis(VB_MASSAVG) {}
-        virtual ~TransportParams();
-        int nsp_;
+    TransportParams() : 
+      nsp_(0),
+      thermo(0),
+      mw(0),
+      velocityBasis(VB_MASSAVG),
+      tmax(1000000.),
+      tmin(10.),
+      mode_(0),
+      xml(0),
+      log_level(-1)
+    {
+    }
 
-        //        phase_t* mix;
-        thermo_t* thermo;
-        vector_fp        mw;
+    virtual ~TransportParams() 
+    {
+#ifdef DEBUG_MODE
+      delete xml;
+#endif
+    }
 
-	//! A basis for the average velocity can be specified. 
-	//! Valid bases include "mole" "mass" and species names.
-	int velocityBasis;
+    int nsp_;
 
-	//minimum and maximum temperatures for parameter fits
-        doublereal tmax, tmin;
-        int mode_;
-        XML_Writer* xml;
-        int log_level;
+    //        phase_t* mix;
+    thermo_t* thermo;
+    vector_fp        mw;
 
-    };
+    //! A basis for the average velocity can be specified. 
+    //! Valid bases include "mole" "mass" and species names.
+    int velocityBasis;
+
+    //minimum and maximum temperatures for parameter fits
+    doublereal tmax;
+    doublereal tmin;
+    int mode_;
+    XML_Writer* xml;
+    int log_level;
+
+  };
 
 
-    /**
-     * Holds transport model parameters relevant to transport in ideal 
-     * gases with a kinetic theory of gases derived transport model. 
-     * Used by TransportFactory.
-     */
-    class GasTransportParams : public TransportParams {
+  /**
+   * Holds transport model parameters relevant to transport in ideal 
+   * gases with a kinetic theory of gases derived transport model. 
+   * Used by TransportFactory.
+   */
+  class GasTransportParams : public TransportParams {
 
-    public:
+  public:
 
-        GasTransportParams() {}
-        ~GasTransportParams() {}
+    GasTransportParams() :
+      TransportParams(),
+      visccoeffs(0),
+      condcoeffs(0),
+      diffcoeffs(0),
+      polytempvec(0),
+      poly(0),
+      omega22_poly(0),
+      astar_poly(0),
+      bstar_poly(0),
+      cstar_poly(0),
+      zrot(0),
+      crot(0),
+      polar(0),
+      alpha(0),
+      fitlist(0),
+      eps(0),
+      sigma(0),
+      reducedMass(0, 0),
+      diam(0, 0),
+      epsilon(0, 0),
+      dipole(0, 0),
+      delta(0, 0)
+    {
+    }
 
-        // polynomial fits
-	//temperature-fit viscosity 
-        std::vector<vector_fp>            visccoeffs; 
-	//temperature-fit heat conduction 
-        std::vector<vector_fp>            condcoeffs; 
-	//temperature-fit diffusivity 
-	std::vector<vector_fp>            diffcoeffs; 
-        vector_fp                         polytempvec;
+    virtual ~GasTransportParams() {}
 
-        std::vector<std::vector<int> > poly;
-        std::vector<vector_fp >   omega22_poly;
-        std::vector<vector_fp >   astar_poly;
-        std::vector<vector_fp >   bstar_poly;
-        std::vector<vector_fp >   cstar_poly;
+    // polynomial fits
+    //temperature-fit viscosity 
+    std::vector<vector_fp>            visccoeffs; 
+    //temperature-fit heat conduction 
+    std::vector<vector_fp>            condcoeffs; 
+    //temperature-fit diffusivity 
+    std::vector<vector_fp>            diffcoeffs; 
+    vector_fp                         polytempvec;
 
-        vector_fp   zrot;
-        vector_fp   crot;
+    std::vector<std::vector<int> > poly;
+    std::vector<vector_fp >   omega22_poly;
+    std::vector<vector_fp >   astar_poly;
+    std::vector<vector_fp >   bstar_poly;
+    std::vector<vector_fp >   cstar_poly;
 
-        std::vector<bool> polar;
-        vector_fp    alpha;
-        vector_fp    fitlist;
-        vector_fp    eps;
-        vector_fp    sigma;
-        DenseMatrix  reducedMass;    
-        DenseMatrix  diam;           
-        DenseMatrix  epsilon;        
-        DenseMatrix  dipole;         
-        DenseMatrix  delta;          
+    vector_fp   zrot;
+    vector_fp   crot;
 
-    };
+    std::vector<bool> polar;
+    vector_fp    alpha;
+    vector_fp    fitlist;
+    vector_fp    eps;
+    vector_fp    sigma;
+    DenseMatrix  reducedMass;    
+    DenseMatrix  diam;           
+    DenseMatrix  epsilon;        
+    DenseMatrix  dipole;         
+    DenseMatrix  delta;          
+
+  };
 
 }