From c1879a15e5ee4685ac01348b0a3c41ad09d44586 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 2 Mar 2010 00:59:45 +0000 Subject: [PATCH] Fixed a warning message in LiquidTransport constructor Added a deprecated message for array_fp. --- Cantera/src/base/ct_defs.h | 3 +++ Cantera/src/transport/LiquidTransport.cpp | 32 ++++++++++++++++------- Cantera/src/transport/LiquidTransport.h | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Cantera/src/base/ct_defs.h b/Cantera/src/base/ct_defs.h index c394cadb7..85e5e8334 100644 --- a/Cantera/src/base/ct_defs.h +++ b/Cantera/src/base/ct_defs.h @@ -191,6 +191,9 @@ namespace Cantera { #define USE_STL_VECTOR #ifdef USE_STL_VECTOR //! Vector of doubles. + /*! + * @deprecated array_fp is going away, because vector_fp means the same thing + */ typedef std::vector array_fp; //! Vector of doubles. typedef std::vector vector_fp; diff --git a/Cantera/src/transport/LiquidTransport.cpp b/Cantera/src/transport/LiquidTransport.cpp index 8833140b0..d6303dc28 100644 --- a/Cantera/src/transport/LiquidTransport.cpp +++ b/Cantera/src/transport/LiquidTransport.cpp @@ -37,16 +37,22 @@ namespace Cantera { m_nBinInt(0), m_tmin(-1.0), m_tmax(100000.), + m_viscMixModel(0), + m_ionCondMixModel(0), + m_lambdaMixModel(0), + m_diffMixModel(0), + m_radiusMixModel(0), m_iStateMF(-1), + concTot_(0.0), + concTot_tran_(0.0), + dens_(0.0), m_temp(-1.0), m_press(-1.0), - m_lambda(-1.0), m_viscmix(-1.0), m_ionCondmix(-1.0), - m_mobRatMix(-1.0), - m_selfDiffMix(-1.0), - + m_mobRatMix(0), + m_selfDiffMix(0), m_visc_mix_ok(false), m_visc_temp_ok(false), m_visc_conc_ok(false), @@ -73,22 +79,28 @@ namespace Cantera { } - LiquidTransport::LiquidTransport(const LiquidTransport &right) : - Transport(), + LiquidTransport::LiquidTransport(const LiquidTransport &right) : + Transport(right.m_thermo, right.m_nDim), m_nsp(0), m_nBinInt(0), m_tmin(-1.0), m_tmax(100000.), + m_viscMixModel(0), + m_ionCondMixModel(0), + m_lambdaMixModel(0), + m_diffMixModel(0), + m_radiusMixModel(0), m_iStateMF(-1), + concTot_(0.0), + concTot_tran_(0.0), + dens_(0.0), m_temp(-1.0), m_press(-1.0), - m_lambda(-1.0), m_viscmix(-1.0), m_ionCondmix(-1.0), - m_mobRatMix(-1.0), - m_selfDiffMix(-1.0), - + m_mobRatMix(0), + m_selfDiffMix(0), m_visc_mix_ok(false), m_visc_temp_ok(false), m_visc_conc_ok(false), diff --git a/Cantera/src/transport/LiquidTransport.h b/Cantera/src/transport/LiquidTransport.h index 133624ca5..2feb83ee2 100644 --- a/Cantera/src/transport/LiquidTransport.h +++ b/Cantera/src/transport/LiquidTransport.h @@ -1060,7 +1060,7 @@ namespace Cantera { * * k is the species index * n is the dimensional index (x, y, or z). It has a length - * equal to m_nDimm_ + * equal to m_nDim * * m_Grad_X[n*m_nsp + k] *