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

Fix some compiler warnings

Browse source
This commit is contained in:
Ray Speth 2014-07-30 16:59:45 +00:00
parent 56ccc667df
commit a22a767be1
5 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/cantera/numerics/ctlapack.h
View file

@ -252,7 +252,7 @@ inline void ct_dgbsv(int n, int kl, int ku, int nrhs,
int& info)
{
integer f_n = n, f_kl = kl, f_ku = ku, f_nrhs = nrhs, f_lda = lda,
f_ldb = ldb, f_info = info;
f_ldb = ldb, f_info = 0;
_DGBSV_(&f_n, &f_kl, &f_ku, &f_nrhs, a, &f_lda, ipiv,
b, &f_ldb, &f_info);
info = f_info;
@ -287,7 +287,7 @@ inline void ct_dgbtrf(size_t m, size_t n, size_t kl, size_t ku,
integer f_kl = (int) kl;
integer f_ku = (int) ku;
integer f_lda = (int) lda;
integer f_info = info;
integer f_info = 0;
_DGBTRF_(&f_m, &f_n, &f_kl, &f_ku, a, &f_lda, ipiv, &f_info);
info = f_info;
}
@ -302,7 +302,7 @@ inline void ct_dgbtrs(ctlapack::transpose_t trans, size_t n,
integer f_nrhs = (int) nrhs;
integer f_lda = (int) lda;
integer f_ldb = (int) ldb;
integer f_info = info;
integer f_info = 0;
char tr = no_yes[trans];
#ifdef NO_FTN_STRING_LEN_AT_END
_DGBTRS_(&tr, &f_n, &f_kl, &f_ku, &f_nrhs, a, &f_lda, ipiv,
@ -326,7 +326,7 @@ inline void ct_dgetrf(size_t m, size_t n,
integer mm = (int) m;
integer nn = (int) n;
integer ldaa = (int) lda;
integer infoo = info;
integer infoo = 0;
_DGETRF_(&mm, &nn, a, &ldaa, ipiv, &infoo);
info = infoo;
}
@ -339,7 +339,7 @@ inline void ct_dgetrs(ctlapack::transpose_t trans, size_t n,
integer f_lda = (int) lda;
integer f_nrhs = (int) nrhs;
integer f_ldb = (int) ldb;
integer f_info = info;
integer f_info = 0;
char tr = no_yes[trans];
#ifdef NO_FTN_STRING_LEN_AT_END
@ -359,7 +359,7 @@ inline void ct_dgetrs(ctlapack::transpose_t trans, size_t n,
inline void ct_dgetri(int n, doublereal* a, int lda, integer* ipiv,
doublereal* work, int lwork, int& info)
{
integer f_n = n, f_lda = lda, f_lwork = lwork, f_info = info;
integer f_n = n, f_lda = lda, f_lwork = lwork, f_info = 0;
_DGETRI_(&f_n, a, &f_lda, ipiv, work, &f_lwork, &f_info);
}
@ -376,7 +376,7 @@ inline void ct_dgeqrf(size_t m, size_t n, doublereal* a, size_t lda, doublereal*
integer f_n = static_cast<integer>(n);
integer f_lda = static_cast<integer>(lda);
integer f_lwork = static_cast<integer>(lwork);
integer f_info = info;
integer f_info = 0;
_DGEQRF_(&f_m, &f_n, a, &f_lda, tau, work, &f_lwork, &f_info);
info = f_info;
}
@ -393,7 +393,7 @@ inline void ct_dormqr(ctlapack::side_t rlside, ctlapack::transpose_t trans, size
integer f_lwork = static_cast<integer>(lwork);
integer f_lda = static_cast<integer>(lda);
integer f_ldc = static_cast<integer>(ldc);
integer f_info = info;
integer f_info = 0;
#ifdef NO_FTN_STRING_LEN_AT_END
_DORMQR_(&side, &tr, &f_m, &f_n, &f_k, a, &f_lda, tau, c, &f_ldc, work, &f_lwork, &f_info);
#else
@ -420,7 +420,7 @@ inline void ct_dtrtrs(ctlapack::upperlower_t uplot, ctlapack::transpose_t trans,
integer f_nrhs = static_cast<integer>(nrhs);
integer f_lda = static_cast<integer>(lda);
integer f_ldb = static_cast<integer>(ldb);
integer f_info = info;
integer f_info = 0;
#ifdef NO_FTN_STRING_LEN_AT_END
_DTRTRS_(&uplo, &tr, &dd, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);
#else
@ -453,7 +453,7 @@ inline doublereal ct_dtrcon(const char* norm, ctlapack::upperlower_t uplot, con
}
integer f_n = static_cast<integer>(n);
integer f_lda = static_cast<integer>(lda);
integer f_info = info;
integer f_info = 0;
doublereal rcond;
#ifdef NO_FTN_STRING_LEN_AT_END
_DTRCON_(&nn, &uplo, &dd, &f_n, a, &f_lda, &rcond, work, iwork, &f_info);
@ -475,7 +475,7 @@ inline void ct_dpotrf(ctlapack::upperlower_t uplot, size_t n, doublereal* a, siz
char uplo = upper_lower[uplot];
integer f_n = static_cast<integer>(n);
integer f_lda = static_cast<integer>(lda);
integer f_info = info;
integer f_info = 0;
#ifdef NO_FTN_STRING_LEN_AT_END
_DPOTRF_(&uplo, &f_n, a, &f_lda, &f_info);
@ -502,7 +502,7 @@ inline void ct_dpotrs(ctlapack::upperlower_t uplot, size_t n, size_t nrhs, doubl
integer f_nrhs = static_cast<integer>(nrhs);
integer f_lda = static_cast<integer>(lda);
integer f_ldb = static_cast<integer>(ldb);
integer f_info = info;
integer f_info = 0;
#ifdef NO_FTN_STRING_LEN_AT_END
_DPOTRS_(&uplo, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);
@ -531,7 +531,7 @@ inline doublereal ct_dgecon(const char norm, size_t n, doublereal* a, size_t lda
}
integer f_n = static_cast<integer>(n);
integer f_lda = static_cast<integer>(lda);
integer f_info = info;
integer f_info = 0;
doublereal rcond;
#ifdef NO_FTN_STRING_LEN_AT_END
@ -564,7 +564,7 @@ inline doublereal ct_dgbcon(const char norm, size_t n, size_t kl, size_t ku,
integer f_kl = static_cast<integer>(kl);
integer f_ku = static_cast<integer>(ku);
integer f_ldab = static_cast<integer>(ldab);
integer f_info = info;
integer f_info = 0;
doublereal rcond;
#ifdef NO_FTN_STRING_LEN_AT_END

2
src/thermo/WaterPropsIAPWSphi.cpp
View file

@ -32,9 +32,7 @@ using std::fabs;
*/
// \cond
static const doublereal T_c = 647.096; // Kelvin
static const doublereal P_c = 22.064E6; // Pascals
static const doublereal Rho_c = 322.; // kg m-3
static const doublereal M_water = 18.015268; // kg kmol-1
// \endcond
/*

1
src/tpx/Methane.cpp
View file

@ -14,7 +14,6 @@ Tmx = 1700.0,
Tc = 190.555,
Pc = 4.5988e6,
Roc= 160.43,
To = 90.68,
Tt = 90.68,
Pt=11743.5675,
R = 5.18253475866e2,

1
src/tpx/Nitrogen.cpp
View file

@ -12,7 +12,6 @@ static const double M = 28.01348,
Tc = 126.200,
Pc = 3.4e6,
Roc = 314.03,
To = 63.15,
R = 2.96790515164171e2,
Gamma = 7.13602531283233e-6,
alpha = 1.95,

1
src/tpx/Oxygen.cpp
View file

@ -13,7 +13,6 @@ Tmx = 2000.0,
Tc = 154.581,
Pc = 5.0429e6,
Roc = 436.15,
To = 54.34,
R = 2.59820853437877e2,
Gamma = 5.46895508389297e-6,
alpha = 1.91576,