From f45e6277459b2eea7147424170e0eee105dce3d4 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 21 Jan 2014 17:21:37 +0000 Subject: [PATCH] Fix compiler warnings about implicit double -> int conversions --- src/thermo/NasaThermo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/thermo/NasaThermo.cpp b/src/thermo/NasaThermo.cpp index 376438271..fd601aea9 100644 --- a/src/thermo/NasaThermo.cpp +++ b/src/thermo/NasaThermo.cpp @@ -278,7 +278,7 @@ doublereal NasaThermo::checkContinuity(const std::string& name, double tmid, doublereal cplow = cp_R(tmid, clow); doublereal cphigh = cp_R(tmid, chigh); doublereal delta = cplow - cphigh; - doublereal maxError = abs(delta); + doublereal maxError = std::abs(delta); if (fabs(delta/(fabs(cplow)+1.0E-4)) > 0.001) { writelog("\n\n**** WARNING ****\nFor species "+name+ ", discontinuity in cp/R detected at Tmid = " @@ -433,7 +433,7 @@ void NasaThermo::fixDiscontinuities(doublereal Tlow, doublereal Tmid, ct_dgelss(nRows, nCols, 1, &M(0,0), nRows, &b[0], nRows, &sigma[0], -1, rank, &work[0], lwork, info); work.resize(work[0]); - lwork = work[0]; + lwork = static_cast(work[0]); ct_dgelss(nRows, nCols, 1, &M(0,0), nRows, &b[0], nRows, &sigma[0], -1, rank, &work[0], lwork, info);