research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed more compiler warnings (MSVC 9.0)

Browse source
This commit is contained in:
Ray Speth 2012-02-17 20:30:03 +00:00
parent f74abb48f0
commit 36c5d0ff96
13 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/numerics/ResidJacEval.h
View file

@ -122,7 +122,7 @@ public:
const doublereal* const ydot,
doublereal* const resid,
const ResidEval_Type_Enum evalType = Base_ResidEval,
const int id_x = -1,
const size_t id_x = npos,
const doublereal delta_x = 0.0);

4
include/cantera/numerics/solveProb.h
View file

@ -164,7 +164,7 @@ public:
solveProb(ResidEval* resid);
//! Destructor. Deletes the integrator.
~solveProb();
virtual ~solveProb();
private:
@ -244,7 +244,7 @@ private:
/*!
*
*/
virtual void printFinal(int ioflag, doublereal damp, int label_d, size_t label_t,
virtual void printFinal(int ioflag, doublereal damp, size_t label_d, size_t label_t,
doublereal inv_t, doublereal t_real, int iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRateKinSpecies[], const doublereal CSolnSP[],

6
include/cantera/transport/MixTransport.h
View file

@ -271,9 +271,9 @@ public:
* Flat vector with the m_nsp in the inner loop.
* length = ldx * ndim
*/
virtual void getSpeciesFluxes(size_t ndim, const doublereal* grad_T,
int ldx, const doublereal* grad_X,
int ldf, doublereal* fluxes);
virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T,
int ldx, const doublereal* const grad_X,
int ldf, doublereal* const fluxes);
//! Initialize the transport object
/*!

4
include/cantera/transport/TransportBase.h
View file

@ -281,7 +281,7 @@ public:
/*!
* @return Returns the number of dimensions
*/
int nDim() const {
size_t nDim() const {
return m_nDim;
}
@ -873,7 +873,7 @@ protected:
size_t m_index;
//! Number of dimensions used in flux expresions
int m_nDim;
size_t m_nDim;
//! Velocity basis from which diffusion velocities are computed.
//! Defaults to the mass averaged basis = -2

3
src/numerics/NonlinearSolver.cpp
View file

@ -34,7 +34,6 @@
#include <cmath>
//@{
extern void print_line(const char*, int);
#ifndef MAX
#define MAX(x,y) (( (x) > (y) ) ? (x) : (y))
@ -2040,7 +2039,7 @@ double
NonlinearSolver::deltaBoundStep(const doublereal* const y_n_curr, const doublereal* const step_1)
{
int i_fbounds = 0;
size_t i_fbounds = 0;
int ifbd = 0;
int i_fbd = 0;
doublereal UPFAC = 2.0;

2
src/numerics/ResidJacEval.cpp
View file

@ -312,7 +312,7 @@ matrixConditioning(doublereal* const matrix, const int nrows, doublereal* const
int ResidJacEval::
evalResidNJ(const doublereal t, const doublereal deltaT, const doublereal* y,
const doublereal* ydot, doublereal* const resid, const ResidEval_Type_Enum evalType,
const int id_x, const doublereal delta_x)
const size_t id_x, const doublereal delta_x)
{
throw CanteraError("ResidJacEval::evalResidNJ()", "Not implemented\n");
return 1;

2
src/numerics/solveProb.cpp
View file

@ -907,7 +907,7 @@ void solveProb::printIteration(int ioflag, doublereal damp, size_t label_d,
} /* printIteration */
//================================================================================================
void solveProb::printFinal(int ioflag, doublereal damp, int label_d, size_t label_t,
void solveProb::printFinal(int ioflag, doublereal damp, size_t label_d, size_t label_t,
doublereal inv_t, doublereal t_real, int iter,
doublereal update_norm, doublereal resid_norm,
doublereal netProdRateKinSpecies[], const doublereal CSolnSP[],

25
src/thermo/RedlichKisterVPSSTP.cpp
View file

@ -725,7 +725,7 @@ void RedlichKisterVPSSTP::s_update_lnActCoeff() const
XA = moleFractions_[iA];
XB = moleFractions_[iB];
doublereal deltaX = XA - XB;
int N = m_N_ij[i];
size_t N = m_N_ij[i];
vector_fp& he_vec = m_HE_m_ij[i];
vector_fp& se_vec = m_SE_m_ij[i];
doublereal poly = 1.0;
@ -733,7 +733,7 @@ void RedlichKisterVPSSTP::s_update_lnActCoeff() const
doublereal sum = 0.0;
doublereal sumMm1 = 0.0;
doublereal sum2 = 0.0;
for (int m = 0; m < N; m++) {
for (size_t m = 0; m < N; m++) {
doublereal A_ge = (he_vec[m] - T * se_vec[m]) / RT;
sum += A_ge * poly;
sum2 += A_ge * (m + 1) * poly;
@ -797,7 +797,7 @@ void RedlichKisterVPSSTP::s_update_dlnActCoeff_dT() const
XA = moleFractions_[iA];
XB = moleFractions_[iB];
doublereal deltaX = XA - XB;
int N = m_N_ij[i];
size_t N = m_N_ij[i];
doublereal poly = 1.0;
doublereal sum = 0.0;
@ -805,7 +805,7 @@ void RedlichKisterVPSSTP::s_update_dlnActCoeff_dT() const
doublereal sumMm1 = 0.0;
doublereal polyMm1 = 1.0;
doublereal sum2 = 0.0;
for (int m = 0; m < N; m++) {
for (size_t m = 0; m < N; m++) {
doublereal A_ge = - se_vec[m];
sum += A_ge * poly;
sum2 += A_ge * (m + 1) * poly;
@ -858,7 +858,7 @@ void RedlichKisterVPSSTP::s_update_dlnActCoeff_dX_() const
XA = moleFractions_[iA];
XB = moleFractions_[iB];
doublereal deltaX = XA - XB;
int N = m_N_ij[i];
size_t N = m_N_ij[i];
doublereal poly = 1.0;
doublereal sum = 0.0;
vector_fp& he_vec = m_HE_m_ij[i];
@ -869,7 +869,7 @@ void RedlichKisterVPSSTP::s_update_dlnActCoeff_dX_() const
doublereal sum2 = 0.0;
doublereal sum2Mm1 = 0.0;
doublereal sumMm2 = 0.0;
for (int m = 0; m < N; m++) {
for (size_t m = 0; m < N; m++) {
doublereal A_ge = he_vec[m] - T * se_vec[m];
sum += A_ge * poly;
sum2 += A_ge * (m + 1) * poly;
@ -974,9 +974,9 @@ void RedlichKisterVPSSTP::getdlnActCoeffdlnN(const size_t ld, doublereal* dlnAct
void RedlichKisterVPSSTP::resizeNumInteractions(const size_t num)
{
numBinaryInteractions_ = num;
m_pSpecies_A_ij.resize(num, -1);
m_pSpecies_B_ij.resize(num, -1);
m_N_ij.resize(num, -1);
m_pSpecies_A_ij.resize(num, npos);
m_pSpecies_B_ij.resize(num, npos);
m_N_ij.resize(num, npos);
m_HE_m_ij.resize(num);
m_SE_m_ij.resize(num);
dlnActCoeff_dX_.resize(num, num, 0.0);
@ -997,8 +997,7 @@ void RedlichKisterVPSSTP::readXMLBinarySpecies(XML_Node& xmLBinarySpecies)
}
double* charge = DATA_PTR(m_speciesCharge);
std::string stemp;
int nParamsFound = 0;
int Npoly = 0;
size_t Npoly = 0;
vector_fp hParams, sParams, vParams;
std::string iName = xmLBinarySpecies.attrib("speciesA");
if (iName == "") {
@ -1052,7 +1051,7 @@ void RedlichKisterVPSSTP::readXMLBinarySpecies(XML_Node& xmLBinarySpecies)
* Get the string containing all of the values
*/
ctml::getFloatArray(xmlChild, hParams, true, "toSI", "excessEnthalpy");
nParamsFound = hParams.size();
size_t nParamsFound = hParams.size();
if (nParamsFound > Npoly) {
Npoly = nParamsFound;
}
@ -1064,7 +1063,7 @@ void RedlichKisterVPSSTP::readXMLBinarySpecies(XML_Node& xmLBinarySpecies)
* Get the string containing all of the values
*/
ctml::getFloatArray(xmlChild, sParams, true, "toSI", "excessEntropy");
nParamsFound = sParams.size();
size_t nParamsFound = sParams.size();
if (nParamsFound > Npoly) {
Npoly = nParamsFound;
}

2
src/thermo/RedlichKisterVPSSTP.h
View file

@ -896,7 +896,7 @@ protected:
//! Vector of the length of the polynomial for the interaction.
vector_int m_N_ij;
std::vector<size_t> m_N_ij;
//! Enthalpy term for the binary mole fraction interaction of the

6
src/transport/LiquidTransport.cpp
View file

@ -1098,9 +1098,9 @@ void LiquidTransport::getSpeciesVdiffES(size_t ndim,
* length = ldx * ndim
*/
void LiquidTransport::getSpeciesFluxes(size_t ndim,
const doublereal* grad_T,
int ldx, const doublereal* grad_X,
int ldf, doublereal* fluxes)
const doublereal* const grad_T,
int ldx, const doublereal* const grad_X,
int ldf, doublereal* const fluxes)
{
set_Grad_T(grad_T);
set_Grad_X(grad_X);

4
src/transport/MixTransport.cpp
View file

@ -412,8 +412,8 @@ void MixTransport::getThermalDiffCoeffs(doublereal* const dt)
* length = ldx * ndim
*/
void MixTransport::getSpeciesFluxes(size_t ndim,
const doublereal* grad_T, int ldx, const doublereal* grad_X,
int ldf, doublereal* fluxes)
const doublereal* const grad_T, int ldx, const doublereal* const grad_X,
int ldf, doublereal* const fluxes)
{
update_T();
update_C();

2
src/transport/TransportBase.cpp
View file

@ -33,7 +33,7 @@ Transport::Transport(thermo_t* thermo, size_t ndim) :
m_thermo(thermo),
m_ready(false),
m_nmin(0),
m_index(-1),
m_index(npos),
m_nDim(ndim),
m_velocityBasis(VB_MASSAVG)
{

2
src/transport/TransportFactory.cpp
View file

@ -1152,7 +1152,7 @@ void TransportFactory::getLiquidInteractionsTransportData(const XML_Node& transp
size_t loc = specName.find(":");
string firstSpec = specName.substr(0,loc);
string secondSpec = specName.substr(loc+1);
int index = temp_thermo->speciesIndex(firstSpec.c_str())+nsp*temp_thermo->speciesIndex(secondSpec.c_str());
size_t index = temp_thermo->speciesIndex(firstSpec.c_str())+nsp*temp_thermo->speciesIndex(secondSpec.c_str());
trParam.mobilityRatio[index] = newLTI(propSpecNode,
m_tranPropMap[nodeName],
trParam);