diff --git a/include/cantera/equil/equil.h b/include/cantera/equil/equil.h index 806fca851..22d190c00 100644 --- a/include/cantera/equil/equil.h +++ b/include/cantera/equil/equil.h @@ -12,7 +12,7 @@ #define CT_KERNEL_EQUIL_H -#pragma message "cantera/equil/equil.h is deprecated" +#pragma message("cantera/equil/equil.h is deprecated") #include "MultiPhase.h" #include "vcs_defs.h" diff --git a/include/cantera/equilibrium.h b/include/cantera/equilibrium.h index 512265f70..ef5ac0ef9 100644 --- a/include/cantera/equilibrium.h +++ b/include/cantera/equilibrium.h @@ -7,7 +7,7 @@ */ #ifndef CT_EQUIL_INCL #define CT_EQUIL_INCL -#pragma message "cantera/equil/equil.h is deprecated" +#pragma message("cantera/equilibrium.h is deprecated") #include "equil/equil.h" #include "equil/ChemEquil.h" #include "equil/MultiPhaseEquil.h" diff --git a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h index 02c10297f..b5dac0d89 100644 --- a/include/cantera/numerics/CVodesIntegrator.h +++ b/include/cantera/numerics/CVodesIntegrator.h @@ -53,7 +53,7 @@ public: virtual double& solution(size_t k); virtual double* solution(); virtual int nEquations() const { - return m_neq; + return static_cast(m_neq); } virtual int nEvals() const; virtual void setMaxOrder(int n) { @@ -70,7 +70,7 @@ public: m_mlower = N_Lower; } virtual int nSensParams() { - return m_np; + return static_cast(m_np); } virtual double sensitivity(size_t k, size_t p); diff --git a/src/base/global.cpp b/src/base/global.cpp index 7b7645193..f4ed902e4 100644 --- a/src/base/global.cpp +++ b/src/base/global.cpp @@ -240,7 +240,7 @@ XML_Node* get_XML_Node(const std::string& file_ID, XML_Node* root) } try { findInputFile(fname); - } catch (CanteraError& err2) { + } catch (CanteraError&) { // rethrow the original error, which indicates the given file name throw err; } diff --git a/src/equil/vcs_rank.cpp b/src/equil/vcs_rank.cpp index 87b8be28a..6e31105b8 100644 --- a/src/equil/vcs_rank.cpp +++ b/src/equil/vcs_rank.cpp @@ -84,7 +84,7 @@ namespace VCSnonideal { * It's equal to the minimum of the number of elements and the * number of total species. */ - int ncTrial = std::min(numElemConstraints, numSpecies); + int ncTrial = static_cast(std::min(numElemConstraints, numSpecies)); numComponents = ncTrial; *usedZeroedSpecies = false; @@ -112,7 +112,7 @@ namespace VCSnonideal { * The first search criteria is always the largest positive * magnitude of the mole number. */ - k = basisOptMax1(VCS_DATA_PTR(aw), numSpecies); + k = basisOptMax1(VCS_DATA_PTR(aw), static_cast(numSpecies)); if ((aw[k] != test) && fabs(aw[k]) == 0.0) { *usedZeroedSpecies = true; @@ -213,7 +213,7 @@ namespace VCSnonideal { do { - k = basisOptMax1(VCS_DATA_PTR(aw), numElemConstraints); + k = basisOptMax1(VCS_DATA_PTR(aw), static_cast(numElemConstraints)); if (aw[k] == test) { numComponents = jr; diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp index 97f8d1d7e..a8b32fded 100644 --- a/src/equil/vcs_root1d.cpp +++ b/src/equil/vcs_root1d.cpp @@ -85,7 +85,7 @@ int vcsUtil_root1d(double xmin, double xmax, size_t itmax, } f1 = func(x1, FuncTargVal, varID, fptrPassthrough, &err); if (DEBUG_MODE_ENABLED && printLvl >= 3) { - print_funcEval(fp, x1, f1, its); + print_funcEval(fp, x1, f1, static_cast(its)); fprintf(fp, "%-5d %-5d %-15.5E %-15.5E\n", -2, 0, x1, f1); } if (f1 == 0.0) { @@ -104,7 +104,7 @@ int vcsUtil_root1d(double xmin, double xmax, size_t itmax, } f2 = func(x2, FuncTargVal, varID, fptrPassthrough, &err); if (DEBUG_MODE_ENABLED && printLvl >= 3) { - print_funcEval(fp, x2, f2, its); + print_funcEval(fp, x2, f2, static_cast(its)); fprintf(fp, "%-5d %-5d %-15.5E %-15.5E", -1, 0, x2, f2); } @@ -312,7 +312,7 @@ QUAD_BAIL: fnew = func(xnew, FuncTargVal, varID, fptrPassthrough, &err); if (DEBUG_MODE_ENABLED && printLvl >= 3) { fprintf(fp,"\n"); - print_funcEval(fp, xnew, fnew, its); + print_funcEval(fp, xnew, fnew, static_cast(its)); fprintf(fp, "%-5d %-5d %-15.5E %-15.5E", (int) its, 0, xnew, fnew); } diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index 4d11d0993..9629e2322 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -1892,8 +1892,10 @@ int VCS_SOLVE::vcs_delete_species(const size_t kspec) * -> This zeroes w[kspec] and modifies m_tPhaseMoles_old[] */ const int retn = vcs_zero_species(kspec); - AssertThrowMsg(retn, "VCS_SOLVE::vcs_delete_species", - "Failed to delete a species!"); + if (!retn) { + throw CanteraError("VCS_SOLVE::vcs_delete_species", + "Failed to delete a species!"); + } /* * Decrement the minor species counter if the current species is * a minor species diff --git a/src/kinetics/ElectrodeKinetics.cpp b/src/kinetics/ElectrodeKinetics.cpp index b6beaab40..f2b78c7e4 100644 --- a/src/kinetics/ElectrodeKinetics.cpp +++ b/src/kinetics/ElectrodeKinetics.cpp @@ -897,7 +897,7 @@ void ElectrodeKinetics::finalize() // Malloc and calculate all of the quantities that go into the extra description of reactions rmcVector.resize(m_ii, 0); for (size_t i = 0; i < m_ii; i++) { - rmcVector[i] = new RxnMolChange(this, i); + rmcVector[i] = new RxnMolChange(this, static_cast(i)); } } diff --git a/src/kinetics/ExtraGlobalRxn.cpp b/src/kinetics/ExtraGlobalRxn.cpp index fdb59be4a..366f1a2d6 100644 --- a/src/kinetics/ExtraGlobalRxn.cpp +++ b/src/kinetics/ExtraGlobalRxn.cpp @@ -72,7 +72,7 @@ static void erase_vi(std::vector& m_vec, int index) static void addV(int kkinspec, double ps, std::vector& m_Products, std::vector& m_ProductStoich) { - int nsize = m_Products.size(); + int nsize = static_cast(m_Products.size()); for (int i = 0; i < nsize; i++) { if (m_Products[i] == kkinspec) { m_ProductStoich[i] += ps; @@ -104,9 +104,9 @@ ExtraGlobalRxn::ExtraGlobalRxn(Kinetics* k_ptr) : if (m_InterfaceKinetics) { m_ThisIsASurfaceRxn = true; } - m_nRxns = m_kinetics->nReactions(); + m_nRxns = static_cast(m_kinetics->nReactions()); m_ElemRxnVector.resize(m_nRxns,0.0); - m_nKinSpecies = m_kinetics->nTotalSpecies(); + m_nKinSpecies = static_cast(m_kinetics->nTotalSpecies()); } //============================================================================================================ void ExtraGlobalRxn::setupElemRxnVector(double* RxnVector, @@ -194,9 +194,9 @@ Recheck: } } - m_nProducts = m_Products.size(); - m_nReactants = m_Reactants.size(); - m_nNetSpecies = m_NetSpecies.size(); + m_nProducts = static_cast(m_Products.size()); + m_nReactants = static_cast(m_Reactants.size()); + m_nNetSpecies = static_cast(m_NetSpecies.size()); /* * Section to assign the special species diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp index 2ddc91113..c6f37c8a9 100644 --- a/src/kinetics/Kinetics.cpp +++ b/src/kinetics/Kinetics.cpp @@ -180,14 +180,14 @@ std::pair Kinetics::checkDuplicates(bool throw_err) const for (Composition::const_iterator iter = R.reactants.begin(); iter != R.reactants.end(); ++iter) { - size_t k = kineticsSpeciesIndex(iter->first); + int k = static_cast(kineticsSpeciesIndex(iter->first)); key += k*(k+1); net[-1 -k] -= iter->second; } for (Composition::const_iterator iter = R.products.begin(); iter != R.products.end(); ++iter) { - size_t k = kineticsSpeciesIndex(iter->first); + int k = static_cast(kineticsSpeciesIndex(iter->first)); key += k*(k+1); net[1+k] += iter->second; } diff --git a/src/kinetics/RxnMolChange.cpp b/src/kinetics/RxnMolChange.cpp index e3df108bc..fe8859792 100644 --- a/src/kinetics/RxnMolChange.cpp +++ b/src/kinetics/RxnMolChange.cpp @@ -37,12 +37,11 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, int irxn) : m_egr(0) { warn_deprecated("class RxnMolChange", "To be removed after Cantera 2.2."); - int nReac = kinPtr->nReactions(); int iph; AssertTrace(irxn >= 0); - AssertTrace(irxn < nReac); + AssertTrace(irxn < static_cast(kinPtr->nReactions())); - m_nPhases = kinPtr->nPhases(); + m_nPhases = static_cast(kinPtr->nPhases()); m_phaseMoleChange.resize(m_nPhases, 0.0); m_phaseReactantMoles.resize(m_nPhases, 0.0); @@ -52,12 +51,12 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, int irxn) : m_phaseTypes.resize(m_nPhases, 0); m_phaseDims.resize(m_nPhases, 0); - int m_kk = kinPtr->nTotalSpecies(); + int m_kk = static_cast(kinPtr->nTotalSpecies()); for (int kKin = 0; kKin < m_kk; kKin++) { - iph = m_kinBase->speciesPhaseIndex(kKin); + iph = static_cast(m_kinBase->speciesPhaseIndex(kKin)); Cantera::ThermoPhase& tpRef = m_kinBase->thermo(iph); - int kLoc = kKin - m_kinBase->kineticsSpeciesIndex(0, iph); + int kLoc = kKin - static_cast(m_kinBase->kineticsSpeciesIndex(0, iph)); double rsc = m_kinBase->reactantStoichCoeff(kKin, irxn); double psc = m_kinBase->productStoichCoeff(kKin, irxn); double nsc = psc - rsc; @@ -72,7 +71,7 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, int irxn) : for (iph = 0; iph < m_nPhases; iph++) { Cantera::ThermoPhase& tpRef = m_kinBase->thermo(iph); - m_phaseDims[iph] = tpRef.nDim(); + m_phaseDims[iph] = static_cast(tpRef.nDim()); m_phaseTypes[iph] = tpRef.eosType(); if (m_phaseChargeChange[iph] != 0.0) { double tmp = fabs(m_phaseChargeChange[iph]); @@ -104,7 +103,7 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, Cantera::ExtraGlobalRxn* e int iph; AssertTrace(egr != 0); - m_nPhases = kinPtr->nPhases(); + m_nPhases = static_cast(kinPtr->nPhases()); m_phaseMoleChange.resize(m_nPhases, 0.0); m_phaseReactantMoles.resize(m_nPhases, 0.0); @@ -114,12 +113,12 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, Cantera::ExtraGlobalRxn* e m_phaseTypes.resize(m_nPhases, 0); m_phaseDims.resize(m_nPhases, 0); - int m_kk = kinPtr->nTotalSpecies(); + int m_kk = static_cast(kinPtr->nTotalSpecies()); for (int kKin = 0; kKin < m_kk; kKin++) { - iph = m_kinBase->speciesPhaseIndex(kKin); + iph = static_cast(m_kinBase->speciesPhaseIndex(kKin)); ThermoPhase& tpRef = m_kinBase->thermo(iph); - int kLoc = kKin - m_kinBase->kineticsSpeciesIndex(0, iph); + int kLoc = kKin - static_cast(m_kinBase->kineticsSpeciesIndex(0, iph)); double rsc = egr->reactantStoichCoeff(kKin); double psc = egr->productStoichCoeff(kKin); double nsc = psc - rsc; @@ -134,7 +133,7 @@ RxnMolChange::RxnMolChange(Cantera::Kinetics* kinPtr, Cantera::ExtraGlobalRxn* e for (iph = 0; iph < m_nPhases; iph++) { ThermoPhase& tpRef = m_kinBase->thermo(iph); - m_phaseDims[iph] = tpRef.nDim(); + m_phaseDims[iph] = static_cast(tpRef.nDim()); m_phaseTypes[iph] = tpRef.eosType(); if (m_phaseChargeChange[iph] != 0.0) { double tmp = fabs(m_phaseChargeChange[iph]); diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index 7e1420093..2569aaf39 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -27,6 +27,12 @@ using namespace std; #define CV_SS 1 #define CV_SV 2 +#if SUNDIALS_VERSION < 25 +typedef int sd_size_t; +#else +typedef long int sd_size_t; +#endif + #include namespace Cantera @@ -35,7 +41,7 @@ namespace Cantera class FuncData { public: - FuncData(FuncEval* f, int npar = 0) { + FuncData(FuncEval* f, size_t npar = 0) { m_pars.resize(npar, 1.0); m_func = f; } @@ -152,7 +158,7 @@ void CVodesIntegrator::setTolerances(double reltol, size_t n, double* abstol) if (m_abstol) { N_VDestroy_Serial(m_abstol); } - m_abstol = N_VNew_Serial(n); + m_abstol = N_VNew_Serial(static_cast(n)); } for (size_t i=0; i(nv)); + m_yS = N_VCloneVectorArray_Serial(static_cast(m_np), y); for (size_t n = 0; n < m_np; n++) { data = NV_DATA_S(m_yS[n]); for (size_t j = 0; j < nv; j++) { @@ -249,8 +255,8 @@ void CVodesIntegrator::sensInit(double t0, FuncEval& func) } } - int flag = CVodeSensInit(m_cvode_mem, m_np, CV_STAGGERED, - CVSensRhsFn(0), m_yS); + int flag = CVodeSensInit(m_cvode_mem, static_cast(m_np), + CV_STAGGERED, CVSensRhsFn(0), m_yS); if (flag != CV_SUCCESS) { throw CVodesErr("Error in CVodeSensMalloc"); @@ -270,7 +276,7 @@ void CVodesIntegrator::initialize(double t0, FuncEval& func) if (m_y) { N_VDestroy_Serial(m_y); // free solution vector if already allocated } - m_y = N_VNew_Serial(m_neq); // allocate solution vector + m_y = N_VNew_Serial(static_cast(m_neq)); // allocate solution vector for (size_t i = 0; i < m_neq; i++) { NV_Ith_S(m_y, i) = 0.0; } @@ -344,7 +350,8 @@ void CVodesIntegrator::reinitialize(double t0, FuncEval& func) { m_t0 = t0; m_time = t0; - func.getInitialConditions(m_t0, m_neq, NV_DATA_S(m_y)); + func.getInitialConditions(m_t0, static_cast(m_neq), + NV_DATA_S(m_y)); int result; @@ -358,7 +365,7 @@ void CVodesIntegrator::reinitialize(double t0, FuncEval& func) void CVodesIntegrator::applyOptions() { if (m_type == DENSE + NOJAC) { - long int N = m_neq; + sd_size_t N = static_cast(m_neq); #if SUNDIALS_USE_LAPACK CVLapackDense(m_cvode_mem, N); #else @@ -369,7 +376,7 @@ void CVodesIntegrator::applyOptions() } else if (m_type == GMRES) { CVSpgmr(m_cvode_mem, PREC_NONE, 0); } else if (m_type == BAND + NOJAC) { - long int N = m_neq; + sd_size_t N = static_cast(m_neq); long int nu = m_mupper; long int nl = m_mlower; #if SUNDIALS_USE_LAPACK @@ -452,8 +459,8 @@ double CVodesIntegrator::sensitivity(size_t k, size_t p) string CVodesIntegrator::getErrorInfo(int N) { - N_Vector errs = N_VNew_Serial(m_neq); - N_Vector errw = N_VNew_Serial(m_neq); + N_Vector errs = N_VNew_Serial(static_cast(m_neq)); + N_Vector errw = N_VNew_Serial(static_cast(m_neq)); CVodeGetErrWeights(m_cvode_mem, errw); CVodeGetEstLocalErrors(m_cvode_mem, errs); diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index cfb428677..b83b86959 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -3301,7 +3301,7 @@ 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 (DEBUG_MODE_ENABLED) { @@ -3332,8 +3332,8 @@ int NonlinearSolver::beuler_jac(GeneralMatrix& J, doublereal* const f, int ku, kl; size_t ivec[2]; size_t n = J.nRowsAndStruct(ivec); - kl = ivec[0]; - ku = ivec[1]; + kl = static_cast(ivec[0]); + ku = static_cast(ivec[1]); if (n != neq_) { printf("we have probs\n"); exit(-1); diff --git a/src/thermo/MaskellSolidSolnPhase.cpp b/src/thermo/MaskellSolidSolnPhase.cpp index 89a3c36cd..c53bd9c73 100644 --- a/src/thermo/MaskellSolidSolnPhase.cpp +++ b/src/thermo/MaskellSolidSolnPhase.cpp @@ -257,8 +257,8 @@ void MaskellSolidSolnPhase::initThermoXML(XML_Node& phaseNode, const std::string if (thNode.hasChild("product_species")) { std::string product_species_name = thNode.child("product_species").value(); - product_species_index = speciesIndex(product_species_name); - if (product_species_index == static_cast(npos)) { + product_species_index = static_cast(speciesIndex(product_species_name)); + if (product_species_index == -1) { throw CanteraError("MaskellSolidSolnPhase::initThermoXML", "Species " + product_species_name + " not found."); } diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index 9254ee30f..1c226d0ea 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -647,7 +647,7 @@ doublereal Phase::elementalMoleFraction(const size_t m) const checkElementIndex(m); doublereal Z_n = 0.0; for (size_t k = 0; k != m_kk; ++k) { - int nTotalAtoms = 0; + double nTotalAtoms = 0; for (size_t l = 0; l != m_mm; ++l) { nTotalAtoms += nAtoms(k, l); } diff --git a/src/transport/LiquidTranInteraction.cpp b/src/transport/LiquidTranInteraction.cpp index 07cc2c11a..675f60ae1 100644 --- a/src/transport/LiquidTranInteraction.cpp +++ b/src/transport/LiquidTranInteraction.cpp @@ -632,11 +632,10 @@ void LTI_StefanMaxwell_PPN::getMatrixTransProp(DenseMatrix& mat, doublereal* spe m_selfDiffMix[k] = m_selfDiffMixModel[k]->getMixTransProp(m_selfDiffSpecies[k]); } - //! @todo Suspicious implicit conversion from double to int. - int vP = max(viS[cation[0]],viS[cation[1]]); - int vM = viS[anion[0]]; - int zP = charges[cation[0]]; - int zM = charges[anion[0]]; + double vP = max(viS[cation[0]],viS[cation[1]]); + double vM = viS[anion[0]]; + double zP = charges[cation[0]]; + double zM = charges[anion[0]]; doublereal xA, xB, eps; doublereal inv_vP_vM_MutualDiff; vector_fp dlnActCoeffdlnN_diag; diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index c8554cfdb..482b29341 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -932,7 +932,7 @@ void LiquidTransport::update_Grad_lnAC() doublereal grad_T; for (size_t k = 0; k < m_nDim; k++) { grad_T = m_Grad_T[k]; - const int start = m_nsp*k; + size_t start = m_nsp*k; m_thermo->getdlnActCoeffds(grad_T, &(m_Grad_X[start]), &(m_Grad_lnAC[start])); for (size_t i = 0; i < m_nsp; i++) if (m_molefracs[i] < 1.e-15) { diff --git a/src/transport/PecosTransport.cpp b/src/transport/PecosTransport.cpp index a4eca6c0e..3d45cb756 100755 --- a/src/transport/PecosTransport.cpp +++ b/src/transport/PecosTransport.cpp @@ -27,7 +27,7 @@ bool PecosTransport::initGas(GasTransportParams& tr) { // constant substance attributes m_thermo = tr.thermo; - m_nsp = m_thermo->nSpecies(); + m_nsp = static_cast(m_thermo->nSpecies()); // make a local copy of the molecular weights m_mw.resize(m_nsp); diff --git a/test/kinetics/kineticsFromScratch.cpp b/test/kinetics/kineticsFromScratch.cpp index e43b48c72..1ee608e88 100644 --- a/test/kinetics/kineticsFromScratch.cpp +++ b/test/kinetics/kineticsFromScratch.cpp @@ -39,11 +39,11 @@ public: kin.getFwdRateConstants(&k[0]); kin_ref.getFwdRateConstants(&k_ref[0]); - EXPECT_FLOAT_EQ(k_ref[iRef], k[0]); + EXPECT_DOUBLE_EQ(k_ref[iRef], k[0]); kin.getRevRateConstants(&k[0]); kin_ref.getRevRateConstants(&k_ref[0]); - EXPECT_FLOAT_EQ(k_ref[iRef], k[0]); + EXPECT_DOUBLE_EQ(k_ref[iRef], k[0]); } }; @@ -357,11 +357,11 @@ public: kin.getFwdRateConstants(&k[0]); kin_ref.getFwdRateConstants(&k_ref[0]); - EXPECT_FLOAT_EQ(k_ref[iRef], k[0]); + EXPECT_DOUBLE_EQ(k_ref[iRef], k[0]); kin.getRevRateConstants(&k[0]); kin_ref.getRevRateConstants(&k_ref[0]); - EXPECT_FLOAT_EQ(k_ref[iRef], k[0]); + EXPECT_DOUBLE_EQ(k_ref[iRef], k[0]); } }; diff --git a/test/thermo/phaseConstructors.cpp b/test/thermo/phaseConstructors.cpp index 7279a47ad..9521f9154 100644 --- a/test/thermo/phaseConstructors.cpp +++ b/test/thermo/phaseConstructors.cpp @@ -21,7 +21,7 @@ TEST_F(FixedChemPotSstpConstructorTest, fromXML) ASSERT_EQ((int) p->nSpecies(), 1); double mu; p->getChemPotentials(&mu); - ASSERT_FLOAT_EQ(-2.3e7, mu); + ASSERT_DOUBLE_EQ(-2.3e7, mu); delete p; } @@ -31,7 +31,7 @@ TEST_F(FixedChemPotSstpConstructorTest, SimpleConstructor) ASSERT_EQ((int) p.nSpecies(), 1); double mu; p.getChemPotentials(&mu); - ASSERT_FLOAT_EQ(-2.3e7, mu); + ASSERT_DOUBLE_EQ(-2.3e7, mu); } #ifndef HAS_NO_PYTHON // skip these tests if the Python converter is unavailable @@ -187,7 +187,7 @@ TEST_F(ConstructFromScratch, addUndefinedElements) ASSERT_EQ((size_t) 1, p.nAtoms(p.speciesIndex("CO2"), p.elementIndex("C"))); ASSERT_EQ((size_t) 2, p.nAtoms(p.speciesIndex("CO2"), p.elementIndex("O"))); p.setMassFractionsByName("H2:0.5, CO2:0.5"); - ASSERT_FLOAT_EQ(0.5, p.massFraction("CO2")); + ASSERT_DOUBLE_EQ(0.5, p.massFraction("CO2")); } } // namespace Cantera diff --git a/test/thermo/thermoParameterizations.cpp b/test/thermo/thermoParameterizations.cpp index 809b0d70b..734d5acd1 100644 --- a/test/thermo/thermoParameterizations.cpp +++ b/test/thermo/thermoParameterizations.cpp @@ -44,10 +44,10 @@ TEST_F(SpeciesThermoInterpTypeTest, install_const_cp) p.initThermo(); p2.setState_TPX(298.15, 101325, "H2:0.2, O2:0.7, H2O:0.1"); p.setState_TPX(298.15, 101325, "H2:0.2, O2:0.7, H2O:0.1"); - EXPECT_FLOAT_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); - EXPECT_FLOAT_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); - EXPECT_FLOAT_EQ(p2.entropy_mass(), p.entropy_mass()); - EXPECT_FLOAT_EQ(p2.cp_mass(), p.cp_mass()); + EXPECT_DOUBLE_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); + EXPECT_DOUBLE_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); + EXPECT_DOUBLE_EQ(p2.entropy_mass(), p.entropy_mass()); + EXPECT_DOUBLE_EQ(p2.cp_mass(), p.cp_mass()); } TEST_F(SpeciesThermoInterpTypeTest, DISABLED_install_bad_pref) @@ -79,10 +79,10 @@ TEST_F(SpeciesThermoInterpTypeTest, install_nasa) p.initThermo(); p2.setState_TPX(900, 101325, "H2:0.2, O2:0.7, H2O:0.1"); p.setState_TPX(900, 101325, "H2:0.2, O2:0.7, H2O:0.1"); - EXPECT_FLOAT_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); - EXPECT_FLOAT_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); - EXPECT_FLOAT_EQ(p2.entropy_mass(), p.entropy_mass()); - EXPECT_FLOAT_EQ(p2.cp_mass(), p.cp_mass()); + EXPECT_DOUBLE_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); + EXPECT_DOUBLE_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); + EXPECT_DOUBLE_EQ(p2.entropy_mass(), p.entropy_mass()); + EXPECT_DOUBLE_EQ(p2.cp_mass(), p.cp_mass()); } TEST_F(SpeciesThermoInterpTypeTest, install_shomate) @@ -98,8 +98,8 @@ TEST_F(SpeciesThermoInterpTypeTest, install_shomate) p.initThermo(); p2.setState_TPX(900, 101325, "CO:0.2, CO2:0.8"); p.setState_TPX(900, 101325, "CO:0.2, CO2:0.8"); - EXPECT_FLOAT_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); - EXPECT_FLOAT_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); - EXPECT_FLOAT_EQ(p2.entropy_mass(), p.entropy_mass()); - EXPECT_FLOAT_EQ(p2.cp_mass(), p.cp_mass()); + EXPECT_DOUBLE_EQ(p2.meanMolecularWeight(), p.meanMolecularWeight()); + EXPECT_DOUBLE_EQ(p2.enthalpy_mass(), p.enthalpy_mass()); + EXPECT_DOUBLE_EQ(p2.entropy_mass(), p.entropy_mass()); + EXPECT_DOUBLE_EQ(p2.cp_mass(), p.cp_mass()); } diff --git a/test/transport/transportFromScratch.cpp b/test/transport/transportFromScratch.cpp index 772671170..14e4b663e 100644 --- a/test/transport/transportFromScratch.cpp +++ b/test/transport/transportFromScratch.cpp @@ -107,7 +107,7 @@ TEST_F(TransportFromScratch, viscosity) MixTransport trTest; trTest.init(test.get()); - for (size_t i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { double T = 300 + 111*i; ref->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); test->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); @@ -121,7 +121,7 @@ TEST_F(TransportFromScratch, thermalConductivityMix) MixTransport trTest; trTest.init(test.get()); - for (size_t i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { double T = 300 + 111*i; ref->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); test->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); @@ -157,7 +157,7 @@ TEST_F(TransportFromScratch, thermalConductivityMulti) MultiTransport trTest; trTest.init(test.get()); - for (size_t i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { double T = 300 + 111*i; ref->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); test->setState_TPX(T, 5e5, "H2:0.5, O2:0.3, H2O:0.2"); diff --git a/test_problems/VCSnonideal/LatticeSolid_LiSi/latsol.cpp b/test_problems/VCSnonideal/LatticeSolid_LiSi/latsol.cpp index b2fc44951..0c34d6c23 100644 --- a/test_problems/VCSnonideal/LatticeSolid_LiSi/latsol.cpp +++ b/test_problems/VCSnonideal/LatticeSolid_LiSi/latsol.cpp @@ -31,7 +31,7 @@ void testProblem() salt.setState_TPX(T, OneAtm, &x[0]); LiSi_solid->setState_TP(T, OneAtm); - int ee = LiSi_solid->nElements(); + int ee = static_cast(LiSi_solid->nElements()); printf("Number of elements = %d\n", ee); LiFixed.setState_TP(T, OneAtm);