From 9b2d97f41eb42bf1f5af7442ab58cfe3337e0f11 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 25 May 2012 23:13:18 +0000 Subject: [PATCH] Fixed some compiler warnings --- include/cantera/transport/AqueousTransport.h | 4 ++-- include/cantera/transport/LiquidTransport.h | 4 ++-- include/cantera/transport/MixTransport.h | 4 ++-- include/cantera/transport/MultiTransport.h | 4 ++-- include/cantera/transport/SimpleTransport.h | 4 ++-- include/cantera/transport/TransportBase.h | 8 ++++---- src/equil/equilibrate.cpp | 3 --- src/equil/vcs_solve_TP.cpp | 10 +++++----- src/numerics/BandMatrix.cpp | 20 +++++++++---------- src/numerics/NonlinearSolver.cpp | 21 +++++++++++--------- src/transport/AqueousTransport.cpp | 4 ++-- src/transport/LiquidTransport.cpp | 4 ++-- src/transport/MixTransport.cpp | 6 +++--- src/transport/MultiTransport.cpp | 6 +++--- src/transport/SimpleTransport.cpp | 4 ++-- src/transport/TransportBase.cpp | 4 ++-- 16 files changed, 55 insertions(+), 55 deletions(-) diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index 864360d58..fc1c8d49d 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -315,8 +315,8 @@ public: * length = ldx * ndim */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Return the species diffusive mass fluxes wrt to the specified averaged velocity, /*! diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h index 6743f2d9b..4604c46e0 100644 --- a/include/cantera/transport/LiquidTransport.h +++ b/include/cantera/transport/LiquidTransport.h @@ -587,8 +587,8 @@ public: * length = ldx * ndim */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Return the species diffusive mass fluxes wrt to //! the averaged velocity in [kmol/m^2/s]. diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index 0ab04e373..11ed9150c 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -201,8 +201,8 @@ public: * length = ldx * ndim */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Initialize the transport object /*! diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index e18a65e54..cef714555 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -138,8 +138,8 @@ public: * length = ldx * ndim */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Get the molar diffusional fluxes [kmol/m^2/s] of the species, given the thermodynamic //! state at two nearby points. diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index 9aa0b14d6..971782541 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -501,8 +501,8 @@ public: * @param fluxes Output fluxes of species. */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Return the species diffusive mass fluxes wrt to //! the mass averaged velocity, diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index 1b83d7feb..d42548b93 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -531,8 +531,8 @@ public: * length = ldx * ndim */ virtual void getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes); + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes); //! Get the species diffusive mass fluxes wrt to //! the mass averaged velocity, @@ -559,9 +559,9 @@ public: */ virtual void getSpeciesFluxesES(size_t ndim, const doublereal* grad_T, - int ldx, + size_t ldx, const doublereal* grad_X, - int ldf, + size_t ldf, const doublereal* grad_Phi, doublereal* fluxes) { getSpeciesFluxes(ndim, grad_T, ldx, grad_X, ldf, fluxes); diff --git a/src/equil/equilibrate.cpp b/src/equil/equilibrate.cpp index 95578f430..5a636359c 100644 --- a/src/equil/equilibrate.cpp +++ b/src/equil/equilibrate.cpp @@ -100,14 +100,11 @@ doublereal equilibrate(MultiPhase& s, const char* XY, int equilibrate(thermo_t& s, const char* XY, int solver, doublereal rtol, int maxsteps, int maxiter, int loglevel) { - MultiPhase* m = 0; - ChemEquil* e = 0; bool redo = true; int retn = -1; int nAttempts = 0; int retnSub = 0; - if (loglevel > 0) { beginLogGroup("equilibrate", loglevel); addLogEntry("Single-phase equilibrate function"); diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index 3a280a995..3f7ee4b50 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -125,8 +125,8 @@ int VCS_SOLVE::vcs_solve_TP(int print_lvl, int printDetails, int maxit) int forceComponentCalc = 1; size_t iphaseDelete; /* integer that determines which phase is being deleted */ std::vector phasePopPhaseIDs(0); - int doPhaseDeleteIph = -1; - int doPhaseDeleteKspec = -1; + size_t doPhaseDeleteIph = npos; + size_t doPhaseDeleteKspec = npos; #ifdef DEBUG_MODE char ANOTE[128]; @@ -463,8 +463,8 @@ L_MAINLOOP_ALL_SPECIES: } #endif lec = false; - doPhaseDeleteIph = -1; - doPhaseDeleteKspec = -1; + doPhaseDeleteIph = npos; + doPhaseDeleteKspec = npos; /* * Zero out the net change in moles of multispecies phases */ @@ -1027,7 +1027,7 @@ L_MAIN_LOOP_END: L_MAIN_LOOP_END_NO_PRINT: ; #endif - if (doPhaseDeleteIph != -1) { + if (doPhaseDeleteIph != npos) { #ifdef DEBUG_MODE if (m_debug_print_lvl >= 2) { plogf(" --- "); diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index 096d4872c..1e2bd18ed 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -160,8 +160,8 @@ doublereal BandMatrix::value(size_t i, size_t j) const //==================================================================================================================== size_t BandMatrix::index(size_t i, size_t j) const { - int jj = j; - int ii = i; + int jj = static_cast(j); + int ii = static_cast(i); size_t rw = (int) m_kl + (int) m_ku + (int) ii - jj; return (2*m_kl + m_ku + 1)*j + rw; } @@ -220,9 +220,9 @@ vector_int& BandMatrix::ipiv() */ void BandMatrix::mult(const doublereal* b, doublereal* prod) const { - int kl = m_kl; - int ku = m_ku; - int nr = nRows(); + int kl = static_cast(m_kl); + int ku = static_cast(m_ku); + int nr = static_cast(nRows()); doublereal sum = 0.0; for (int m = 0; m < nr; m++) { sum = 0.0; @@ -240,9 +240,9 @@ void BandMatrix::mult(const doublereal* b, doublereal* prod) const */ void BandMatrix::leftMult(const doublereal* const b, doublereal* const prod) const { - int kl = m_kl; - int ku = m_ku; - int nc = nColumns(); + int kl = static_cast(m_kl); + int ku = static_cast(m_ku); + int nc = static_cast(nColumns()); doublereal sum = 0.0; for (int n = 0; n < nc; n++) { sum = 0.0; @@ -428,8 +428,8 @@ int BandMatrix::factorAlgorithm() const // Returns the one norm of the matrix doublereal BandMatrix::oneNorm() const { - int ku = m_ku; - int kl = m_kl; + int ku = static_cast(m_ku); + int kl = static_cast(m_kl); doublereal value = 0.0; for (int j = 0; j < (int) m_n; j++) { doublereal sum = 0.0; diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index ab41a1b02..e858f226a 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -774,8 +774,8 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, } } } else if (jac.matrixType_ == 1) { - int kl = ivec[0]; - int ku = ivec[1]; + int kl = static_cast(ivec[0]); + int ku = static_cast(ivec[1]); for (int jcol = 0; jcol < (int) neq_; jcol++) { colP_j = (doublereal*) jac.ptrColumn(jcol); for (int irow = jcol - ku; irow <= jcol + kl; irow++) { @@ -819,8 +819,8 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, } } } else if (jac.matrixType_ == 1) { - int kl = ivec[0]; - int ku = ivec[1]; + int kl = static_cast(ivec[0]); + int ku = static_cast(ivec[1]); for (int jcol = 0; jcol < (int) neq_; jcol++) { colP_j = (doublereal*) jac.ptrColumn(jcol); for (int irow = jcol - ku; irow <= jcol + kl; irow++) { @@ -862,8 +862,8 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, } } } else if (jac.matrixType_ == 1) { - int kl = ivec[0]; - int ku = ivec[1]; + int kl = static_cast(ivec[0]); + int ku = static_cast(ivec[1]); for (int jcol = 0; jcol < (int) neq_; jcol++) { colP_j = (doublereal*) jac.ptrColumn(jcol); for (int irow = jcol - ku; irow <= jcol + kl; irow++) { @@ -3787,7 +3787,8 @@ int NonlinearSolver::beuler_jac(GeneralMatrix& J, doublereal* const f, info = m_func->evalResidNJ(time_curr, delta_t_n, y, ydot, DATA_PTR(m_wksp), - JacDelta_ResidEval, j, dy); + JacDelta_ResidEval, + static_cast(j), dy); m_nfe++; if (info != 1) { mdp::mdp_safe_free((void**) &dyVector); @@ -3863,7 +3864,9 @@ int NonlinearSolver::beuler_jac(GeneralMatrix& J, doublereal* const f, ydot[j] += dy * CJ; } - info = m_func->evalResidNJ(time_curr, delta_t_n, y, ydot, DATA_PTR(m_wksp), JacDelta_ResidEval, j, dy); + info = m_func->evalResidNJ(time_curr, delta_t_n, y, ydot, + DATA_PTR(m_wksp), JacDelta_ResidEval, + static_cast(j), dy); m_nfe++; if (info != 1) { mdp::mdp_safe_free((void**) &dyVector); @@ -3873,7 +3876,7 @@ int NonlinearSolver::beuler_jac(GeneralMatrix& J, doublereal* const f, doublereal diff; int ileft = (int) j - (int) ku; - int iright= j + kl; + int iright = static_cast(j + kl); for (int i = ileft; i <= iright; i++) { if (i >= 0 && i < (int) neq_) { size_t ii = i; diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index d224c7bb9..3e3309ddb 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -325,8 +325,8 @@ void AqueousTransport::getThermalDiffCoeffs(doublereal* const dt) * length = ldx * ndim */ void AqueousTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes) + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { set_Grad_T(grad_T); set_Grad_X(grad_X); diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 6d5b0f761..9d3948c08 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -1098,8 +1098,8 @@ void LiquidTransport::getSpeciesVdiffES(size_t ndim, */ void LiquidTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes) + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { set_Grad_T(grad_T); set_Grad_X(grad_X); diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index effe353d7..e649d5afd 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -222,9 +222,9 @@ void MixTransport::getThermalDiffCoeffs(doublereal* const dt) * Flat vector with the m_nsp in the inner loop. * length = ldx * ndim */ -void MixTransport::getSpeciesFluxes(size_t ndim, - const doublereal* const grad_T, int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes) +void MixTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { update_T(); update_C(); diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index 6e5987dbc..73a35e41b 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -302,9 +302,9 @@ void MultiTransport::solveLMatrixEquation() * Flat vector with the m_nsp in the inner loop. * length = ldx * ndim */ -void MultiTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, int ldx, - const doublereal* const grad_X, - int ldf, doublereal* const fluxes) +void MultiTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { // update the binary diffusion coefficients if necessary updateDiff_T(); diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 76de7055f..368dca81d 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -738,8 +738,8 @@ void SimpleTransport::getSpeciesVdiffES(size_t ndim, const doublereal* grad_T, * @param fluxes Output fluxes of species. */ void SimpleTransport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes) + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { set_Grad_T(grad_T); set_Grad_X(grad_X); diff --git a/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp index caef3bfc1..18c6a856e 100644 --- a/src/transport/TransportBase.cpp +++ b/src/transport/TransportBase.cpp @@ -144,8 +144,8 @@ void Transport::finalize() //==================================================================================================================== void Transport::getSpeciesFluxes(size_t ndim, const doublereal* const grad_T, - int ldx, const doublereal* const grad_X, - int ldf, doublereal* const fluxes) + size_t ldx, const doublereal* const grad_X, + size_t ldf, doublereal* const fluxes) { err("getSpeciesFluxes"); }