diff --git a/include/cantera/base/ct_defs.h b/include/cantera/base/ct_defs.h index e77b671e3..4b9743609 100644 --- a/include/cantera/base/ct_defs.h +++ b/include/cantera/base/ct_defs.h @@ -159,27 +159,6 @@ const doublereal Undef = -999.1234; //! Small number to compare differences of mole fractions against. const doublereal Tiny = 1.e-20; -//! inline function to return the max value of two doubles. -/*! - * @param x double value - * @param y second double value - */ -inline doublereal fmaxx(doublereal x, doublereal y) -{ - return (x > y) ? x : y; -} - -//! inline function to return the min value of two doubles. -/*! - * @param x double value - * @param y second double value - */ -inline doublereal fminn(doublereal x, doublereal y) -{ - return (x < y) ? x : y; -} - - //! Map connecting a string name with a double. /*! * This is used mostly to assign concentrations and mole fractions diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h index a6a7eddaf..b60c9eebe 100644 --- a/include/cantera/base/utilities.h +++ b/include/cantera/base/utilities.h @@ -51,48 +51,6 @@ template struct timesConstant : public std::unary_function { namespace Cantera { - -/*! - * @defgroup globalUtilFuncs Global Utility Functions - * - */ -//@{ - -//! Maximum of two templated quantities, i and j. -/*! - * If \a i and \a j have different types, \a j - * is converted to the type of \a i before the comparison. - * - * @param i first argument, instance of templated class T - * @param j Second argument, instance of templated class S - * @return - * This function returns the maximum of the two values - * as an instance of templated type T. - */ -template -inline T max(T i, S j) -{ - return (i > T(j) ? i : T(j)); -} - -//! Minimum of two templated quantities, i and j. -/*! - * If \a i and \a j have different types, \a j - * is converted to the type of \a i before the comparison. - * - * @param i first argument, instance of templated class T - * @param j Second argument, instance of templated class S - * @return - * This function returns the minimum of the two values - * as an instance of templated type T. - */ -template -inline T min(T i, S j) -{ - return (i < T(j) ? i : T(j)); -} - - //! Templated Inner product of two vectors of length 4. /*! * If either \a x diff --git a/include/cantera/kinetics/RxnRates.h b/include/cantera/kinetics/RxnRates.h index 55aa8981b..1eee00fde 100644 --- a/include/cantera/kinetics/RxnRates.h +++ b/include/cantera/kinetics/RxnRates.h @@ -265,7 +265,7 @@ public: for (size_t n = 0; n < m_nmcov; n++) { k = m_msp[n]; // changed n to k, dgg 1/22/04 - th = fmaxx(theta[k], Tiny); + th = std::max(theta[k], Tiny); // th = fmaxx(theta[n], Tiny); m_mcov += m_mc[n]*log(th); } diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index af5ccf821..2734d1536 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -70,7 +70,7 @@ doublereal _minTemp(InputIter begin, InputIter end) { doublereal _minT = 0.0; for (; begin != end; ++begin) { - _minT = fmaxx(_minT, begin->minTemp()); + _minT = std::max(_minT, begin->minTemp()); } return _minT; } @@ -92,7 +92,7 @@ doublereal _maxTemp(_InputIter begin, _InputIter end) { doublereal _maxT = 1.e10; for (; begin != end; ++begin) { - _maxT = fminn(_maxT, begin->maxTemp()); + _maxT = std::min(_maxT, begin->maxTemp()); } return _maxT; } diff --git a/samples/cxx/bvp/stagnation.cpp b/samples/cxx/bvp/stagnation.cpp index b92ff5138..1bd11017e 100644 --- a/samples/cxx/bvp/stagnation.cpp +++ b/samples/cxx/bvp/stagnation.cpp @@ -617,13 +617,13 @@ void FreeFlame::eval(int jg, doublereal* xg, jmin = 0; jmax = m_points - 1; } else { // evaluate points for Jacobian - jmin = max(jpt-1, 0); - jmax = min(jpt+1,m_points-1); + jmin = std::max(jpt-1, 0); + jmax = std::min(jpt+1,m_points-1); } // properties are computed for grid points from j0 to j1 - int j0 = max(jmin-1,0); - int j1 = min(jmax+1,m_points-1); + int j0 = std::max(jmin-1,0); + int j1 = std::min(jmax+1,m_points-1); int j, k; diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp index 19a0b8e71..dd98244db 100644 --- a/src/clib/ctonedim.cpp +++ b/src/clib/ctonedim.cpp @@ -117,7 +117,7 @@ extern "C" { { try { string nm = _domain(i)->componentName(n); - int lout = min(sz, nm.size()); + size_t lout = std::min(sz, nm.size()); copy(nm.c_str(), nm.c_str() + lout, buf); buf[lout] = '\0'; return static_cast(nm.size()); diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index af87847b2..0de2df1e5 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -932,8 +932,8 @@ next: for (m = 0; m < nvar; m++) { newval = x[m] + res_trial[m]; if (newval > above[m]) { - fctr = fmaxx(0.0, - fminn(fctr,0.8*(above[m] - x[m])/(newval - x[m]))); + fctr = std::max(0.0, + std::min(fctr,0.8*(above[m] - x[m])/(newval - x[m]))); } else if (newval < below[m]) { if (m < m_mm && (m != m_skip)) { res_trial[m] = -50; @@ -941,13 +941,13 @@ next: res_trial[m] = below[m] - x[m]; } } else { - fctr = fminn(fctr, 0.8*(x[m] - below[m])/(x[m] - newval)); + fctr = std::min(fctr, 0.8*(x[m] - below[m])/(x[m] - newval)); } } // Delta Damping if (m == mm) { if (fabs(res_trial[mm]) > 0.2) { - fctr = fminn(fctr, 0.2/fabs(res_trial[mm])); + fctr = std::min(fctr, 0.2/fabs(res_trial[mm])); } } } diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp index 6dad4494f..11a33357f 100644 --- a/src/equil/MultiPhaseEquil.cpp +++ b/src/equil/MultiPhaseEquil.cpp @@ -631,7 +631,7 @@ void MultiPhaseEquil::step(doublereal omega, vector_fp& deltaN, if (m_majorsp[k]) { m_moles[k] += omega * deltaN[k]; } else { - m_moles[k] = fabs(m_moles[k])*fminn(10.0, + m_moles[k] = fabs(m_moles[k])*std::min(10.0, exp(-m_deltaG_RT[ik - m_nel])); } } diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index 627132ef8..795c3bd4f 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -105,7 +105,7 @@ extern "C" { { try { std::string pnm = _fph(n)->name(); - int lout = min(lennm,pnm.size()); + int lout = std::min(lennm, (int) pnm.size()); std::copy(pnm.c_str(), pnm.c_str() + lout, nm); for (int nn = lout; nn < lennm; nn++) { nm[nn] = ' '; @@ -273,7 +273,7 @@ extern "C" { { try { std::string spnm = _fph(n)->speciesName(*k-1); - int lout = min(lennm,spnm.size()); + int lout = std::min(lennm, (int) spnm.size()); std::copy(spnm.c_str(), spnm.c_str() + lout, nm); for (int nn = lout; nn < lennm; nn++) { nm[nn] = ' '; @@ -289,7 +289,7 @@ extern "C" { { try { std::string elnm = _fph(n)->elementName(*m-1); - int lout = min(lennm,elnm.size()); + int lout = std::min(lennm, (int) elnm.size()); std::copy(elnm.c_str(), elnm.c_str() + lout, nm); for (int nn = lout; nn < lennm; nn++) { nm[nn] = ' '; @@ -790,7 +790,7 @@ extern "C" { try { Kinetics* k = _fkin(n); std::string r = k->reactionString(*i-1); - int lout = min(lenbuf,r.size()); + int lout = std::min(lenbuf, (int) r.size()); std::copy(r.c_str(), r.c_str() + lout, buf); for (int nn = lout; nn < lenbuf; nn++) { buf[nn] = ' '; @@ -977,7 +977,7 @@ extern "C" { std::string e; // = ""; //if (nErrors() > 0) e = lastErrorMessage(); - int n = min(e.size(), buflen-1); + int n = std::min((int) e.size(), buflen-1); copy(e.begin(), e.begin() + n, buf); for (int nn = n; nn < buflen; nn++) { buf[nn] = ' '; diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp index c0bf062a6..f57bab779 100644 --- a/src/kinetics/FalloffFactory.cpp +++ b/src/kinetics/FalloffFactory.cpp @@ -112,7 +112,7 @@ public: virtual void updateTemp(doublereal T, workPtr work) const { doublereal Fcent = (1.0 - m_a) * exp(- T * m_rt3) + m_a * exp(- T * m_rt1); - *work = log10(fmaxx(Fcent, SmallNumber)); + *work = log10(std::max(Fcent, SmallNumber)); } //! Function that returns F @@ -122,7 +122,7 @@ public: */ virtual doublereal F(doublereal pr, const_workPtr work) const { doublereal lpr,f1,lgf, cc, nn; - lpr = log10(fmaxx(pr,SmallNumber)); + lpr = log10(std::max(pr,SmallNumber)); cc = -0.4 - 0.67 * (*work); nn = 0.75 - 1.27 * (*work); f1 = (lpr + cc)/ (nn - 0.14 * (lpr + cc)); @@ -256,7 +256,7 @@ public: doublereal Fcent = (1.0 - m_a) * exp(- T * m_rt3) + m_a * exp(- T * m_rt1) + exp(- m_t2 / T); - *work = log10(fmaxx(Fcent, SmallNumber)); + *work = log10(std::max(Fcent, SmallNumber)); } //! Function that returns F @@ -266,7 +266,7 @@ public: */ virtual doublereal F(doublereal pr, const_workPtr work) const { doublereal lpr,f1,lgf, cc, nn; - lpr = log10(fmaxx(pr,SmallNumber)); + lpr = log10(std::max(pr,SmallNumber)); cc = -0.4 - 0.67 * (*work); nn = 0.75 - 1.27 * (*work); f1 = (lpr + cc)/ (nn - 0.14 * (lpr + cc)); @@ -377,7 +377,7 @@ public: * @param work Pointer to the previously saved work space */ virtual doublereal F(doublereal pr, const_workPtr work) const { - doublereal lpr = log10(fmaxx(pr,SmallNumber)); + doublereal lpr = log10(std::max(pr,SmallNumber)); doublereal xx = 1.0/(1.0 + lpr*lpr); doublereal ff = pow(*work , xx); return ff; @@ -489,7 +489,7 @@ public: * @param work Pointer to the previously saved work space */ virtual doublereal F(doublereal pr, const_workPtr work) const { - doublereal lpr = log10(fmaxx(pr,SmallNumber)); + doublereal lpr = log10(std::max(pr,SmallNumber)); doublereal xx = 1.0/(1.0 + lpr*lpr); return pow(*work, xx) * work[1]; } @@ -630,7 +630,7 @@ public: * @param work Pointer to the previously saved work space */ virtual doublereal F(doublereal pr, const_workPtr work) const { - doublereal lpr = log10(fmaxx(pr, SmallNumber)); + doublereal lpr = log10(std::max(pr, SmallNumber)); doublereal x = (lpr - work[0])/work[1]; doublereal flog = work[2]/exp(x*x); return pow(10.0, flog); diff --git a/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp index 9e383389e..a216ea0d3 100644 --- a/src/kinetics/ReactionPath.cpp +++ b/src/kinetics/ReactionPath.cpp @@ -358,7 +358,7 @@ void ReactionPathDiagram::exportToDot(ostream& s) s << "[fontname=\""+m_font+"\", style=\"setlinewidth(" << lwidth << ")\""; s << ", arrowsize=" - << min(6.0, 0.5*lwidth); + << std::min(6.0, 0.5*lwidth); } else { s << ", style=\"setlinewidth(" << arrow_width << ")\""; @@ -425,7 +425,7 @@ void ReactionPathDiagram::exportToDot(ostream& s) << lwidth << ")\""; s << ", arrowsize=" - << min(6.0, 0.5*lwidth); // 1 - arrow_width*flxratio; + << std::min(6.0, 0.5*lwidth); // 1 - arrow_width*flxratio; } else { s << ", style=\"setlinewidth(" << arrow_width << ")\""; diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index 99968f0e3..53a3d623f 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -775,7 +775,7 @@ void solveSP::resjac_eval(std::vector &JacCol, sd = m_ptrsSurfPhase[jsp]->siteDensity(); for (kCol = 0; kCol < nsp; kCol++) { cSave = CSoln[kColIndex]; - dc = fmaxx(1.0E-10 * sd, fabs(cSave) * 1.0E-7); + dc = std::max(1.0E-10 * sd, fabs(cSave) * 1.0E-7); CSoln[kColIndex] += dc; fun_eval(DATA_PTR(m_numEqn2), CSoln, CSolnOld, do_time, deltaT); col_j = JacCol[kColIndex]; @@ -793,7 +793,7 @@ void solveSP::resjac_eval(std::vector &JacCol, sd = m_bulkPhasePtrs[jsp]->molarDensity(); for (kCol = 0; kCol < nsp; kCol++) { cSave = CSoln[kColIndex]; - dc = fmaxx(1.0E-10 * sd, fabs(cSave) * 1.0E-7); + dc = std::max(1.0E-10 * sd, fabs(cSave) * 1.0E-7); CSoln[kColIndex] += dc; fun_eval(DATA_PTR(m_numEqn2), CSoln, CSolnOld, do_time, deltaT); col_j = JacCol[kColIndex]; diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index a06904d7e..fe36e2501 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -33,7 +33,7 @@ DenseMatrix::DenseMatrix(size_t n, size_t m, doublereal v) : m_useReturnErrorCode(0), m_printLevel(0) { - m_ipiv.resize(max(n, m)); + m_ipiv.resize(std::max(n, m)); m_colPts.resize(m); for (size_t j = 0; j < m; j++) { m_colPts[j] = &(m_data[m_nrows*j]); @@ -82,7 +82,7 @@ DenseMatrix::~DenseMatrix() void DenseMatrix::resize(size_t n, size_t m, doublereal v) { Array2D::resize(n,m,v); - m_ipiv.resize(max(n,m)); + m_ipiv.resize(std::max(n,m)); m_colPts.resize(m_ncols); for (size_t j = 0; j < m_ncols; j++) { m_colPts[j] = &(m_data[m_nrows*j]); diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 6529045d8..562c2738d 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -197,7 +197,7 @@ calcDeltaSolnVariables(const doublereal t, const doublereal* const ySoln, } } else { for (int i = 0; i < neq_; i++) { - deltaYSoln[i] = fmaxx(1.0E-2 * solnWeights[i], 1.0E-6 * fabs(ySoln[i])); + deltaYSoln[i] = std::max(1.0E-2 * solnWeights[i], 1.0E-6 * fabs(ySoln[i])); } } return 1; diff --git a/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp index c278597be..4527794f4 100644 --- a/src/numerics/solveProb.cpp +++ b/src/numerics/solveProb.cpp @@ -461,7 +461,7 @@ void solveProb::resjac_eval(std::vector &JacCol, if (sd < 1.0E-200) { sd = 1.0E-4; } - dc = fmaxx(1.0E-11 * sd, fabs(cSave) * 1.0E-6); + dc = std::max(1.0E-11 * sd, fabs(cSave) * 1.0E-6); CSoln[kCol] += dc; fun_eval(DATA_PTR(m_numEqn2), CSoln, CSolnOld, do_time, deltaT); col_j = JacCol[kCol]; diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp index 7dbd1192a..7f2517853 100644 --- a/src/oneD/MultiNewton.cpp +++ b/src/oneD/MultiNewton.cpp @@ -175,7 +175,7 @@ doublereal MultiNewton::boundStep(const doublereal* x0, { doublereal fbound = 1.0; for (size_t i = 0; i < r.nDomains(); i++) { - fbound = fminn(fbound, + fbound = std::min(fbound, bound_step(x0 + r.start(i), step0 + r.start(i), r.domain(i), loglevel)); } diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp index b4d336e00..72038c038 100644 --- a/src/oneD/OneDim.cpp +++ b/src/oneD/OneDim.cpp @@ -316,7 +316,7 @@ doublereal OneDim::ssnorm(doublereal* x, doublereal* r) eval(-1, x, r, 0.0, 0); doublereal ss = 0.0; for (size_t i = 0; i < m_size; i++) { - ss = fmaxx(fabs(r[i]),ss); + ss = std::max(fabs(r[i]),ss); } return ss; } diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index 0e922dd1c..c582c1f2c 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -366,13 +366,13 @@ void AxiStagnFlow::eval(size_t jg, doublereal* xg, jmin = 0; jmax = m_points - 1; } else { // evaluate points for Jacobian - jmin = max(jpt-1, 0); - jmax = min(jpt+1,m_points-1); + jmin = std::max(jpt-1, 0); + jmax = std::min(jpt+1,m_points-1); } // properties are computed for grid points from j0 to j1 - size_t j0 = max(jmin-1,0); - size_t j1 = min(jmax+1,m_points-1); + size_t j0 = std::max(jmin-1,0); + size_t j1 = std::min(jmax+1,m_points-1); size_t j, k; @@ -674,13 +674,13 @@ void FreeFlame::eval(size_t jg, doublereal* xg, jmin = 0; jmax = m_points - 1; } else { // evaluate points for Jacobian - jmin = max(jpt-1, 0); - jmax = min(jpt+1,m_points-1); + jmin = std::max(jpt-1, 0); + jmax = std::min(jpt+1,m_points-1); } // properties are computed for grid points from j0 to j1 - size_t j0 = max(jmin-1,0); - size_t j1 = min(jmax+1,m_points-1); + size_t j0 = std::max(jmin-1,0); + size_t j1 = std::min(jmax+1,m_points-1); size_t j, k; diff --git a/src/oneD/newton_utils.cpp b/src/oneD/newton_utils.cpp index 58343884e..68662cbf4 100644 --- a/src/oneD/newton_utils.cpp +++ b/src/oneD/newton_utils.cpp @@ -55,10 +55,10 @@ doublereal bound_step(const doublereal* x, const doublereal* step, newval = val + step[index(m,j)]; if (newval > above) { - fbound = fmaxx(0.0, fminn(fbound, - (above - val)/(newval - val))); + fbound = std::max(0.0, std::min(fbound, + (above - val)/(newval - val))); } else if (newval < below) { - fbound = fminn(fbound, (val - below)/(val - newval)); + fbound = std::min(fbound, (val - below)/(val - newval)); } if (loglevel > 1 && (newval > above || newval < below)) { diff --git a/src/oneD/refine.cpp b/src/oneD/refine.cpp index 7c0e12e45..138fe4f04 100644 --- a/src/oneD/refine.cpp +++ b/src/oneD/refine.cpp @@ -109,8 +109,8 @@ int Refiner::analyze(size_t n, const doublereal* z, smax = *max_element(s.begin(), s.end()); // max absolute values of v and s - aa = fmaxx(fabs(vmax), fabs(vmin)); - ss = fmaxx(fabs(smax), fabs(smin)); + aa = std::max(fabs(vmax), fabs(vmin)); + ss = std::max(fabs(smax), fabs(smin)); // refine based on component i only if the range of v is // greater than a fraction 'min_range' of max |v|. This diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index 9c4fd9049..a32594495 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -140,7 +140,7 @@ void ConstDensityThermo::getChemPotentials(doublereal* mu) const doublereal rt = temperature() * GasConstant; const array_fp& g_RT = gibbs_RT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] = rt*(g_RT[k] + log(xx)) + vdp; } } diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index b6ef31f98..be0176327 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -784,12 +784,12 @@ getPartialMolarEntropies(doublereal* sbar) const doublereal mm; for (size_t k = 0; k < m_kk; k++) { if (k != m_indexSolvent) { - mm = fmaxx(SmallNumber, m_molalities[k]); + mm = std::max(SmallNumber, m_molalities[k]); sbar[k] -= R * (log(mm) + m_lnActCoeffMolal[k]); } } double xmolSolvent = moleFraction(m_indexSolvent); - mm = fmaxx(SmallNumber, xmolSolvent); + mm = std::max(SmallNumber, xmolSolvent); sbar[m_indexSolvent] -= R *(log(mm) + m_lnActCoeffMolal[m_indexSolvent]); /* * Check to see whether activity coefficients are temperature diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 573169303..5f6d513f6 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -1239,12 +1239,12 @@ getPartialMolarEntropies(doublereal* sbar) const doublereal mm; for (size_t k = 0; k < m_kk; k++) { if (k != m_indexSolvent) { - mm = fmaxx(SmallNumber, m_molalities[k]); + mm = std::max(SmallNumber, m_molalities[k]); sbar[k] -= R * (log(mm) + m_lnActCoeffMolal_Scaled[k]); } } double xmolSolvent = moleFraction(m_indexSolvent); - mm = fmaxx(SmallNumber, xmolSolvent); + mm = std::max(SmallNumber, xmolSolvent); sbar[m_indexSolvent] -= R *(log(mm) + m_lnActCoeffMolal_Scaled[m_indexSolvent]); /* * Check to see whether activity coefficients are temperature diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index 3fd598827..e03e0514b 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -216,7 +216,7 @@ void IdealGasPhase::getChemPotentials(doublereal* mu) const doublereal rt = temperature() * GasConstant; //const array_fp& g_RT = gibbs_RT_ref(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] += rt*(log(xx)); } } @@ -243,7 +243,7 @@ void IdealGasPhase::getPartialMolarEntropies(doublereal* sbar) const scale(_s.begin(), _s.end(), sbar, r); doublereal logp = log(pressure()/m_spthermo->refPressure()); for (size_t k = 0; k < m_kk; k++) { - doublereal xx = fmaxx(SmallNumber, moleFraction(k)); + doublereal xx = std::max(SmallNumber, moleFraction(k)); sbar[k] += r * (- logp - log(xx)); } } diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index 35fe36bff..b00e934c8 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -537,7 +537,7 @@ void IdealMolalSoln::getActivities(doublereal* ac) const ac[k] = m_molalities[k]; } double xmolSolvent = moleFraction(m_indexSolvent); - xmolSolvent = fmaxx(m_xmolSolventMIN, xmolSolvent); + xmolSolvent = std::max(m_xmolSolventMIN, xmolSolvent); ac[m_indexSolvent] = exp((xmolSolvent - 1.0)/xmolSolvent); } else { @@ -575,7 +575,7 @@ getMolalityActivityCoefficients(doublereal* acMolality) const acMolality[k] = 1.0; } double xmolSolvent = moleFraction(m_indexSolvent); - xmolSolvent = fmaxx(m_xmolSolventMIN, xmolSolvent); + xmolSolvent = std::max(m_xmolSolventMIN, xmolSolvent); acMolality[m_indexSolvent] = exp((xmolSolvent - 1.0)/xmolSolvent) / xmolSolvent; } else { @@ -641,7 +641,7 @@ void IdealMolalSoln::getChemPotentials(doublereal* mu) const if (IMS_typeCutoff_ == 0 || xmolSolvent > 3.* IMS_X_o_cutoff_/2.0) { for (size_t k = 1; k < m_kk; k++) { - xx = fmaxx(m_molalities[k], xxSmall); + xx = std::max(m_molalities[k], xxSmall); mu[k] += RT * log(xx); } /* @@ -649,7 +649,7 @@ void IdealMolalSoln::getChemPotentials(doublereal* mu) const * -> see my notes */ - xx = fmaxx(xmolSolvent, xxSmall); + xx = std::max(xmolSolvent, xxSmall); mu[m_indexSolvent] += (RT * (xmolSolvent - 1.0) / xx); } else { @@ -721,7 +721,7 @@ void IdealMolalSoln::getPartialMolarEntropies(doublereal* sbar) const if (IMS_typeCutoff_ == 0) { for (size_t k = 0; k < m_kk; k++) { if (k != m_indexSolvent) { - mm = fmaxx(SmallNumber, m_molalities[k]); + mm = std::max(SmallNumber, m_molalities[k]); sbar[k] -= R * log(mm); } } @@ -740,12 +740,12 @@ void IdealMolalSoln::getPartialMolarEntropies(doublereal* sbar) const doublereal mm; for (size_t k = 0; k < m_kk; k++) { if (k != m_indexSolvent) { - mm = fmaxx(SmallNumber, m_molalities[k]); + mm = std::max(SmallNumber, m_molalities[k]); sbar[k] -= R * (log(mm) + IMS_lnActCoeffMolal_[k]); } } double xmolSolvent = moleFraction(m_indexSolvent); - mm = fmaxx(SmallNumber, xmolSolvent); + mm = std::max(SmallNumber, xmolSolvent); sbar[m_indexSolvent] -= R *(log(mm) + IMS_lnActCoeffMolal_[m_indexSolvent]); } diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index b2a84a522..1d1e6c342 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -658,7 +658,7 @@ getChemPotentials(doublereal* mu) const doublereal RT = temperature() * GasConstant; const array_fp& g_RT = gibbs_RT_ref(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] = RT * (g_RT[k] + log(xx)) + delta_p * m_speciesMolarVolume[k]; } @@ -689,7 +689,7 @@ getChemPotentials_RT(doublereal* mu) const doublereal xx; const array_fp& g_RT = gibbs_RT_ref(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] = (g_RT[k] + log(xx)) + delta_pdRT * m_speciesMolarVolume[k]; } @@ -745,7 +745,7 @@ getPartialMolarEntropies(doublereal* sbar) const doublereal r = GasConstant; doublereal xx; for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); sbar[k] = r * (_s[k] - log(xx)); } } diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 40bda11c8..f6ef26a5a 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -367,7 +367,7 @@ void IdealSolnGasVPSS::getChemPotentials(doublereal* mu) const doublereal xx; doublereal rt = temperature() * GasConstant; for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] += rt*(log(xx)); } } @@ -386,7 +386,7 @@ void IdealSolnGasVPSS::getPartialMolarEntropies(doublereal* sbar) const doublereal r = GasConstant; scale(sbar, sbar+m_kk, sbar, r); for (size_t k = 0; k < m_kk; k++) { - doublereal xx = fmaxx(SmallNumber, moleFraction(k)); + doublereal xx = std::max(SmallNumber, moleFraction(k)); sbar[k] += r * (- log(xx)); } } diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index f7fce8685..6290acedb 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -411,21 +411,21 @@ IonsFromNeutralVPSSTP::getChemPotentials(doublereal* mu) const //! Get the id for the next cation icat = cationList_[k]; jNeut = fm_invert_ionForNeutral[icat]; - xx = fmaxx(SmallNumber, moleFractions_[icat]); + xx = std::max(SmallNumber, moleFractions_[icat]); mu[icat] = muNeutralMolecule_[jNeut] + fact2 + RT_ * (lnActCoeff_NeutralMolecule_[jNeut] + log(xx)); } // Do the anion list icat = anionList_[0]; jNeut = fm_invert_ionForNeutral[icat]; - xx = fmaxx(SmallNumber, moleFractions_[icat]); + xx = std::max(SmallNumber, moleFractions_[icat]); mu[icat] = RT_ * log(xx); // Do the list of neutral molecules for (size_t k = 0; k < numPassThroughSpecies_; k++) { icat = passThroughList_[k]; jNeut = fm_invert_ionForNeutral[icat]; - xx = fmaxx(SmallNumber, moleFractions_[icat]); + xx = std::max(SmallNumber, moleFractions_[icat]); mu[icat] = muNeutralMolecule_[jNeut] + RT_ * (lnActCoeff_NeutralMolecule_[jNeut] + log(xx)); } break; @@ -513,7 +513,7 @@ void IonsFromNeutralVPSSTP::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeffdT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] -log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index a8d8d1d67..606b9af3b 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -311,7 +311,7 @@ void LatticePhase::getChemPotentials(doublereal* mu) const doublereal RT = temperature() * GasConstant; const array_fp& g_RT = gibbs_RT_ref(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); mu[k] = RT * (g_RT[k] + log(xx)) + delta_p * m_speciesMolarVolume[k]; } @@ -331,7 +331,7 @@ void LatticePhase::getPartialMolarEntropies(doublereal* sbar) const doublereal r = GasConstant; doublereal xx; for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(SmallNumber, moleFraction(k)); + xx = std::max(SmallNumber, moleFraction(k)); sbar[k] = r * (_s[k] - log(xx)); } } diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index dcb7de82d..3f9f03364 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -395,7 +395,7 @@ void MargulesVPSSTP::getChemPotentials(doublereal* mu) const s_update_lnActCoeff(); doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); mu[k] += RT * (log(xx) + lnActCoeff_Scaled_[k]); } } @@ -554,7 +554,7 @@ void MargulesVPSSTP::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeff_dT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] -log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index 890d97139..6940bb040 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -400,7 +400,7 @@ void MixedSolventElectrolyte::getChemPotentials(doublereal* mu) const */ doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); mu[k] += RT * (log(xx) + lnActCoeff_Scaled_[k]); } } @@ -559,7 +559,7 @@ void MixedSolventElectrolyte::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeff_dT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] -log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index aa77927d0..a7bffb93e 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -320,7 +320,7 @@ void MolalityVPSSTP::setMolalitiesByName(compositionMap& mMap) vector_fp mf(kk, 0.0); getMoleFractions(DATA_PTR(mf)); double xmolS = mf[m_indexSolvent]; - double xmolSmin = max(xmolS, m_xmolSolventMIN); + double xmolSmin = std::max(xmolS, m_xmolSolventMIN); compositionMap::iterator p; for (size_t k = 0; k < kk; k++) { p = mMap.find(speciesName(k)); @@ -533,7 +533,7 @@ doublereal MolalityVPSSTP::osmoticCoefficient() const */ double sum = 0; for (size_t k = 1; k < m_kk; k++) { - sum += fmaxx(m_molalities[k], 0.0); + sum += std::max(m_molalities[k], 0.0); } double oc = 1.0; double lac = log(act[m_indexSolvent]); diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index 8f99b0a28..ad6062217 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -332,7 +332,7 @@ void MolarityIonicVPSSTP::getChemPotentials(doublereal* mu) const */ doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); mu[k] += RT * (log(xx) + lnActCoeff_Scaled_[k]); } } @@ -457,7 +457,7 @@ void MolarityIonicVPSSTP::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeff_dT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] -log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* @@ -543,7 +543,7 @@ void MolarityIonicVPSSTP::calcPseudoBinaryMoleFractions() const PBMoleFractions_[neutralPBindexStart + k] = moleFractions_[passThroughList_[k]]; } - sum = fmaxx(0.0, PBMoleFractions_[0]); + sum = std::max(0.0, PBMoleFractions_[0]); for (k = 1; k < numPBSpecies_; k++) { sum += PBMoleFractions_[k]; diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index 784493d1d..cbe9ed397 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -412,7 +412,7 @@ void PhaseCombo_Interaction::getChemPotentials(doublereal* mu) const */ doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); mu[k] += RT * (log(xx) + lnActCoeff_Scaled_[k]); } } @@ -570,7 +570,7 @@ void PhaseCombo_Interaction::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeff_dT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] - log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* @@ -764,7 +764,7 @@ void PhaseCombo_Interaction::s_update_lnActCoeff() const /* * We never sample the end of the mole fraction domains */ - xx = fmaxx(moleFractions_[iK], xxSmall); + xx = std::max(moleFractions_[iK], xxSmall); /* * First wipe out the ideal solution mixing term */ @@ -885,7 +885,7 @@ void PhaseCombo_Interaction::getdlnActCoeffds(const doublereal dTds, const doub /* * We never sample the end of the mole fraction domains */ - xx = fmaxx(moleFractions_[iK], xxSmall); + xx = std::max(moleFractions_[iK], xxSmall); /* * First wipe out the ideal solution mixing term */ @@ -949,7 +949,7 @@ void PhaseCombo_Interaction::s_update_dlnActCoeff_dlnN_diag() const /* * We never sample the end of the mole fraction domains */ - xx = fmaxx(moleFractions_[iK], xxSmall); + xx = std::max(moleFractions_[iK], xxSmall); /* * First wipe out the ideal solution mixing term */ @@ -1011,7 +1011,7 @@ void PhaseCombo_Interaction::s_update_dlnActCoeff_dlnN() const /* * We never sample the end of the mole fraction domains */ - xx = fmaxx(moleFractions_[iK], xxSmall); + xx = std::max(moleFractions_[iK], xxSmall); for (size_t iM = 0; iM < m_kk; iM++) { XM = moleFractions_[iM]; diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 6fde19920..77ca51280 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -205,7 +205,7 @@ void PseudoBinaryVPSSTP::calcPseudoBinaryMoleFractions() const moleFractions_[cationList_[k]]; } - sum = fmaxx(0.0, PBMoleFractions_[0]); + sum = std::max(0.0, PBMoleFractions_[0]); for (k = 1; k < numPBSpecies_; k++) { sum += PBMoleFractions_[k]; } diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index c6da39f2f..019f3f5c7 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -401,7 +401,7 @@ void RedlichKisterVPSSTP::getChemPotentials(doublereal* mu) const */ doublereal RT = GasConstant * temperature(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); mu[k] += RT * (log(xx) + lnActCoeff_Scaled_[k]); } } @@ -560,7 +560,7 @@ void RedlichKisterVPSSTP::getPartialMolarEntropies(doublereal* sbar) const s_update_dlnActCoeff_dT(); for (size_t k = 0; k < m_kk; k++) { - xx = fmaxx(moleFractions_[k], xxSmall); + xx = std::max(moleFractions_[k], xxSmall); sbar[k] += - lnActCoeff_Scaled_[k] -log(xx) - T * dlnActCoeffdT_Scaled_[k]; } /* diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index cd36794a5..2d7bc322d 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -516,7 +516,7 @@ void AqueousTransport::update_C() // negative mole fractions. MIN_X is 1.0E-20, a value // which is below the additive machine precision of mole fractions. for (size_t k = 0; k < m_nsp; k++) { - m_molefracs[k] = fmaxx(MIN_X, m_molefracs[k]); + m_molefracs[k] = std::max(MIN_X, m_molefracs[k]); } } //==================================================================================================================== diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index c9bb1bdd2..0630d196e 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -425,7 +425,7 @@ void DustyGasTransport::updateTransport_C() // add an offset to avoid a pure species condition // (check - this may be unnecessary) for (size_t k = 0; k < m_nsp; k++) { - m_x[k] = fmaxx(MIN_X, m_x[k]); + m_x[k] = std::max(MIN_X, m_x[k]); } // diffusion coeffs depend on Pressure m_bulk_ok = false; diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 52db4139e..00a1c7ae6 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -1353,9 +1353,9 @@ bool LiquidTransport::update_C() concTot_ = 0.0; concTot_tran_ = 0.0; for (size_t k = 0; k < m_nsp; k++) { - m_molefracs[k] = fmaxx(0.0, m_molefracs[k]); - m_molefracs_tran[k] = fmaxx(MIN_X, m_molefracs[k]); - m_massfracs_tran[k] = fmaxx(MIN_X, m_massfracs[k]); + m_molefracs[k] = std::max(0.0, m_molefracs[k]); + m_molefracs_tran[k] = std::max(MIN_X, m_molefracs[k]); + m_massfracs_tran[k] = std::max(MIN_X, m_massfracs[k]); concTot_tran_ += m_molefracs_tran[k]; concTot_ += m_concentrations[k]; } diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index 33209f68a..e6dc17bd6 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -542,7 +542,7 @@ void MixTransport::update_C() // add an offset to avoid a pure species condition for (size_t k = 0; k < m_nsp; k++) { - m_molefracs[k] = fmaxx(MIN_X, m_molefracs[k]); + m_molefracs[k] = std::max(MIN_X, m_molefracs[k]); } } //==================================================================================================================== diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index d820b62c7..1949b2e9e 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -833,7 +833,7 @@ void MultiTransport::_update_transport_C() // add an offset to avoid a pure species condition // (check - this may be unnecessary) for (size_t k = 0; k < m_nsp; k++) { - m_molefracs[k] = fmaxx(MIN_X, m_molefracs[k]); + m_molefracs[k] = std::max(MIN_X, m_molefracs[k]); } } @@ -1021,7 +1021,7 @@ void MultiTransport::_update_thermal_T() for (size_t k = 0; k < m_nsp; k++) { tr = m_eps[k]/ m_kbt; sqtr = m_sqrt_eps_k[k] / m_sqrt_t; - m_rotrelax[k] = fmaxx(1.0,m_zrot[k]) * m_frot_298[k]/Frot(tr, sqtr); + m_rotrelax[k] = std::max(1.0,m_zrot[k]) * m_frot_298[k]/Frot(tr, sqtr); } doublereal d; diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 69dde68cd..3bbf8410c 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -903,7 +903,7 @@ bool SimpleTransport::update_C() m_thermo->getConcentrations(DATA_PTR(m_concentrations)); concTot_ = 0.0; for (size_t k = 0; k < m_nsp; k++) { - m_molefracs[k] = fmaxx(0.0, m_molefracs[k]); + m_molefracs[k] = std::max(0.0, m_molefracs[k]); concTot_ += m_concentrations[k]; } dens_ = m_thermo->density(); diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index 3630824a2..8375e2cd2 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -961,7 +961,7 @@ void TransportFactory::getTransportData(const std::vector &xspe tr.sigma[i] = 1.e-10 * trdat.diameter; tr.eps[i] = Boltzmann * trdat.wellDepth; - tr.zrot[i] = fmaxx(1.0, trdat.rotRelaxNumber); + tr.zrot[i] = std::max(1.0, trdat.rotRelaxNumber); } }