From c865e0e4d776c7b32e642381e0d33735a448f0a5 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 21 Dec 2009 18:15:15 +0000 Subject: [PATCH] Changes to allow the program to compile! visc_Eij and visc_Sij seem to have been taken out. And, the code no longer needs to resize them. Also took out some warning messages --- Cantera/src/transport/LiquidTransportData.cpp | 2 +- Cantera/src/transport/SolidTransport.cpp | 4 ++-- Cantera/src/transport/TransportFactory.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cantera/src/transport/LiquidTransportData.cpp b/Cantera/src/transport/LiquidTransportData.cpp index 531763b51..17ba9f1e0 100644 --- a/Cantera/src/transport/LiquidTransportData.cpp +++ b/Cantera/src/transport/LiquidTransportData.cpp @@ -295,7 +295,7 @@ namespace Cantera { doublereal t = m_thermo->temperature(); if (t != m_temp) { double tempN = 1.0; - for ( int i = 0; i < m_coeffs.size() ; i++ ) { + for (int i = 0; i < (int) m_coeffs.size() ; i++) { m_prop += m_coeffs[i] * tempN; tempN *= m_temp; } diff --git a/Cantera/src/transport/SolidTransport.cpp b/Cantera/src/transport/SolidTransport.cpp index 0e723aad6..35d12d54e 100644 --- a/Cantera/src/transport/SolidTransport.cpp +++ b/Cantera/src/transport/SolidTransport.cpp @@ -31,7 +31,7 @@ namespace Cantera { //==================================================================================================================== SolidTransport::SolidTransport() : Transport() , - m_nmobile(0.0), + m_nmobile(0), m_Adiff(0), m_Ndiff(0), m_Ediff(0), @@ -48,7 +48,7 @@ namespace Cantera { //==================================================================================================================== SolidTransport::SolidTransport(const SolidTransport &right) : Transport(), - m_nmobile(0.0), + m_nmobile(0), m_Adiff(0), m_Ndiff(0), m_Ediff(0), diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp index 5b56670dd..7ae020cda 100644 --- a/Cantera/src/transport/TransportFactory.cpp +++ b/Cantera/src/transport/TransportFactory.cpp @@ -626,8 +626,8 @@ namespace Cantera { // Need to identify a method to obtain interaction matrices. // This will fill LiquidTransportParams members visc_Eij, visc_Sij - trParam.visc_Eij.resize(nsp,nsp); - trParam.visc_Sij.resize(nsp,nsp); + // trParam.visc_Eij.resize(nsp,nsp); + // trParam.visc_Sij.resize(nsp,nsp); trParam.thermalCond_Aij.resize(nsp,nsp); trParam.diff_Dij.resize(nsp,nsp); trParam.radius_Aij.resize(nsp,nsp);