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

Fix issues indicated by compiler warnings

Browse source
This commit is contained in:
Ray Speth 2015-05-25 22:44:34 -04:00
parent 6a094c658f
commit 1c878c16de
23 changed files with 89 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/equil/equil.h
View file

@ -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"

2
include/cantera/equilibrium.h
View file

@ -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"

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

@ -53,7 +53,7 @@ public:
virtual double& solution(size_t k);
virtual double* solution();
virtual int nEquations() const {
return m_neq;
return static_cast<int>(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<int>(m_np);
}
virtual double sensitivity(size_t k, size_t p);

2
src/base/global.cpp
View file

@ -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;
}

6
src/equil/vcs_rank.cpp
View file

@ -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<int>(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<int>(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<int>(numElemConstraints));
if (aw[k] == test) {
numComponents = jr;

6
src/equil/vcs_root1d.cpp
View file

@ -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<int>(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<int>(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<int>(its));
fprintf(fp, "%-5d %-5d %-15.5E %-15.5E", (int) its, 0, xnew, fnew);
}

6
src/equil/vcs_solve_TP.cpp
View file

@ -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

2
src/kinetics/ElectrodeKinetics.cpp
View file

@ -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<int>(i));
}
}

12
src/kinetics/ExtraGlobalRxn.cpp
View file

@ -72,7 +72,7 @@ static void erase_vi(std::vector<int>& m_vec, int index)
static void addV(int kkinspec, double ps, std::vector<int>& m_Products,
std::vector<doublereal>& m_ProductStoich)
{
int nsize = m_Products.size();
int nsize = static_cast<int>(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<int>(m_kinetics->nReactions());
m_ElemRxnVector.resize(m_nRxns,0.0);
m_nKinSpecies = m_kinetics->nTotalSpecies();
m_nKinSpecies = static_cast<int>(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<int>(m_Products.size());
m_nReactants = static_cast<int>(m_Reactants.size());
m_nNetSpecies = static_cast<int>(m_NetSpecies.size());
/*
* Section to assign the special species

4
src/kinetics/Kinetics.cpp
View file

@ -180,14 +180,14 @@ std::pair<size_t, size_t> 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<int>(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<int>(kineticsSpeciesIndex(iter->first));
key += k*(k+1);
net[1+k] += iter->second;
}

23
src/kinetics/RxnMolChange.cpp
View file

@ -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<int>(kinPtr->nReactions()));
m_nPhases = kinPtr->nPhases();
m_nPhases = static_cast<int>(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<int>(kinPtr->nTotalSpecies());
for (int kKin = 0; kKin < m_kk; kKin++) {
iph = m_kinBase->speciesPhaseIndex(kKin);
iph = static_cast<int>(m_kinBase->speciesPhaseIndex(kKin));
Cantera::ThermoPhase& tpRef = m_kinBase->thermo(iph);
int kLoc = kKin - m_kinBase->kineticsSpeciesIndex(0, iph);
int kLoc = kKin - static_cast<int>(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<int>(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<int>(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<int>(kinPtr->nTotalSpecies());
for (int kKin = 0; kKin < m_kk; kKin++) {
iph = m_kinBase->speciesPhaseIndex(kKin);
iph = static_cast<int>(m_kinBase->speciesPhaseIndex(kKin));
ThermoPhase& tpRef = m_kinBase->thermo(iph);
int kLoc = kKin - m_kinBase->kineticsSpeciesIndex(0, iph);
int kLoc = kKin - static_cast<int>(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<int>(tpRef.nDim());
m_phaseTypes[iph] = tpRef.eosType();
if (m_phaseChargeChange[iph] != 0.0) {
double tmp = fabs(m_phaseChargeChange[iph]);

31
src/numerics/CVodesIntegrator.cpp
View file

@ -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 <sstream>
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<sd_size_t>(n));
}
for (size_t i=0; i<n; i++) {
NV_Ith_S(m_abstol, i) = abstol[i];
@ -240,8 +246,8 @@ void CVodesIntegrator::sensInit(double t0, FuncEval& func)
doublereal* data;
N_Vector y;
y = N_VNew_Serial(nv);
m_yS = N_VCloneVectorArray_Serial(m_np, y);
y = N_VNew_Serial(static_cast<sd_size_t>(nv));
m_yS = N_VCloneVectorArray_Serial(static_cast<sd_size_t>(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<sd_size_t>(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<sd_size_t>(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<sd_size_t>(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<sd_size_t>(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<sd_size_t>(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<sd_size_t>(m_neq));
N_Vector errw = N_VNew_Serial(static_cast<sd_size_t>(m_neq));
CVodeGetErrWeights(m_cvode_mem, errw);
CVodeGetEstLocalErrors(m_cvode_mem, errs);

6
src/numerics/NonlinearSolver.cpp
View file

@ -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<int>(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<int>(ivec[0]);
ku = static_cast<int>(ivec[1]);
if (n != neq_) {
printf("we have probs\n");
exit(-1);

4
src/thermo/MaskellSolidSolnPhase.cpp
View file

@ -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<int>(npos)) {
product_species_index = static_cast<int>(speciesIndex(product_species_name));
if (product_species_index == -1) {
throw CanteraError("MaskellSolidSolnPhase::initThermoXML",
"Species " + product_species_name + " not found.");
}

2
src/thermo/Phase.cpp
View file

@ -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);
}

9
src/transport/LiquidTranInteraction.cpp
View file

@ -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;

2
src/transport/LiquidTransport.cpp
View file

@ -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) {

2
src/transport/PecosTransport.cpp
View file

@ -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<int>(m_thermo->nSpecies());
// make a local copy of the molecular weights
m_mw.resize(m_nsp);

8
test/kinetics/kineticsFromScratch.cpp
View file

@ -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]);
}
};

6
test/thermo/phaseConstructors.cpp
View file

@ -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

24
test/thermo/thermoParameterizations.cpp
View file

@ -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());
}

6
test/transport/transportFromScratch.cpp
View file

@ -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");

2
test_problems/VCSnonideal/LatticeSolid_LiSi/latsol.cpp
View file

@ -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<int>(LiSi_solid->nElements());
printf("Number of elements = %d\n", ee);
LiFixed.setState_TP(T, OneAtm);