From 289c1b3b617dfddb650956507ed462bc44e5484d Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 25 Aug 2014 18:36:47 +0200 Subject: [PATCH] Mixture derivatives now use std::size_t instead of int everywhere Signed-off-by: Ian Bell --- src/Backends/Helmholtz/MixtureDerivatives.cpp | 56 +++++++++--------- src/Backends/Helmholtz/MixtureDerivatives.h | 58 +++++++++---------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/Backends/Helmholtz/MixtureDerivatives.cpp b/src/Backends/Helmholtz/MixtureDerivatives.cpp index 2a71bef2..9fa3d281 100644 --- a/src/Backends/Helmholtz/MixtureDerivatives.cpp +++ b/src/Backends/Helmholtz/MixtureDerivatives.cpp @@ -2,58 +2,58 @@ namespace CoolProp{ -long double MixtureDerivatives::dalphar_dxi(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dalphar_dxi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS.components[i]->pEOS->baser(HEOS._tau, HEOS._delta) + HEOS.Excess.dalphar_dxi(HEOS._tau, HEOS._delta, HEOS.mole_fractions, i); } -long double MixtureDerivatives::d2alphar_dxi_dTau(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::d2alphar_dxi_dTau(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS.components[i]->pEOS->dalphar_dTau(HEOS._tau, HEOS._delta) + HEOS.Excess.d2alphar_dxi_dTau(HEOS._tau, HEOS._delta, HEOS.mole_fractions, i); } -long double MixtureDerivatives::d2alphar_dxi_dDelta(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::d2alphar_dxi_dDelta(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS.components[i]->pEOS->dalphar_dDelta(HEOS._tau, HEOS._delta) + HEOS.Excess.d2alphar_dxi_dDelta(HEOS._tau, HEOS._delta, HEOS.mole_fractions, i); } -long double MixtureDerivatives::d2alphardxidxj(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::d2alphardxidxj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { return 0 + HEOS.Excess.d2alphardxidxj(HEOS._tau, HEOS._delta, HEOS.mole_fractions, i, j); } -long double MixtureDerivatives::ln_fugacity_coefficient(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::ln_fugacity_coefficient(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS.alphar() + ndalphar_dni__constT_V_nj(HEOS, i)-log(1+HEOS._delta.pt()*HEOS.dalphar_dDelta()); } -long double MixtureDerivatives::dln_fugacity_coefficient_dT__constrho_n(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dln_fugacity_coefficient_dT__constrho_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { double dtau_dT = -HEOS._tau.pt()/HEOS._T; //[1/K] return (HEOS.dalphar_dTau() + d_ndalphardni_dTau(HEOS, i)-1/(1+HEOS._delta.pt()*HEOS.dalphar_dDelta())*(HEOS._delta.pt()*HEOS.d2alphar_dDelta_dTau()))*dtau_dT; } -long double MixtureDerivatives::dln_fugacity_coefficient_drho__constT_n(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dln_fugacity_coefficient_drho__constT_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { double ddelta_drho = 1/HEOS._reducing.rhomolar; //[m^3/mol] return (HEOS.dalphar_dDelta() + d_ndalphardni_dDelta(HEOS, i)-1/(1+HEOS._delta.pt()*HEOS.dalphar_dDelta())*(HEOS._delta.pt()*HEOS.d2alphar_dDelta2()+HEOS.dalphar_dDelta()))*ddelta_drho; } -long double MixtureDerivatives::dnalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dnalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { // GERG Equation 7.42 return HEOS.alphar() + ndalphar_dni__constT_V_nj(HEOS, i); } -long double MixtureDerivatives::d2nalphar_dni_dT(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::d2nalphar_dni_dT(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return -HEOS._tau.pt()/HEOS._T*(HEOS.dalphar_dTau() + d_ndalphardni_dTau(HEOS, i)); } -long double MixtureDerivatives::dln_fugacity_coefficient_dT__constp_n(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dln_fugacity_coefficient_dT__constp_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { double T = HEOS._reducing.T/HEOS._tau.pt(); long double R_u = HEOS.gas_constant(); return d2nalphar_dni_dT(HEOS, i) + 1/T-partial_molar_volume(HEOS, i)/(R_u*T)*dpdT__constV_n(HEOS); } -long double MixtureDerivatives::partial_molar_volume(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::partial_molar_volume(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return -ndpdni__constT_V_nj(HEOS, i)/ndpdV__constT_n(HEOS); } -long double MixtureDerivatives::dln_fugacity_coefficient_dp__constT_n(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::dln_fugacity_coefficient_dp__constT_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { // GERG equation 7.30 long double R_u = HEOS.gas_constant(); @@ -63,21 +63,21 @@ long double MixtureDerivatives::dln_fugacity_coefficient_dp__constT_n(HelmholtzE return term1 - term2; } -long double MixtureDerivatives::dln_fugacity_coefficient_dxj__constT_p_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::dln_fugacity_coefficient_dxj__constT_p_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { // Gernert 3.115 long double R_u = HEOS.gas_constant(); // partial molar volume is -dpdn/dpdV, so need to flip the sign here return d2nalphar_dxi_dnj__constT_V(HEOS, i, j) - partial_molar_volume(HEOS, i)/(R_u*HEOS._T)*dpdxj__constT_V_xi(HEOS, j); } -long double MixtureDerivatives::dpdxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j) +long double MixtureDerivatives::dpdxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j) { // Gernert 3.130 long double R_u = HEOS.gas_constant(); return HEOS._rhomolar*R_u*HEOS._T*(ddelta_dxj__constT_V_xi(HEOS, j)*HEOS.dalphar_dDelta()+HEOS._delta.pt()*d_dalpharddelta_dxj__constT_V_xi(HEOS, j)); } -long double MixtureDerivatives::d_dalpharddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j) +long double MixtureDerivatives::d_dalpharddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j) { // Gernert Equation 3.134 (Catch test provided) return HEOS.d2alphar_dDelta2()*ddelta_dxj__constT_V_xi(HEOS, j) @@ -85,24 +85,24 @@ long double MixtureDerivatives::d_dalpharddelta_dxj__constT_V_xi(HelmholtzEOSMix + d2alphar_dxi_dDelta(HEOS, j); } -long double MixtureDerivatives::dalphar_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j) +long double MixtureDerivatives::dalphar_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j) { //Gernert 3.119 (Catch test provided) return HEOS.dalphar_dDelta()*ddelta_dxj__constT_V_xi(HEOS, j)+HEOS.dalphar_dTau()*dtau_dxj__constT_V_xi(HEOS, j)+dalphar_dxi(HEOS, j); } -long double MixtureDerivatives::d_ndalphardni_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::d_ndalphardni_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { // Gernert 3.118 return d_ndalphardni_dxj__constdelta_tau_xi(HEOS, i,j) + ddelta_dxj__constT_V_xi(HEOS, j)*d_ndalphardni_dDelta(HEOS, i) + dtau_dxj__constT_V_xi(HEOS, j)*d_ndalphardni_dTau(HEOS, i); } -long double MixtureDerivatives::ddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j) +long double MixtureDerivatives::ddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j) { // Gernert 3.121 (Catch test provided) return -HEOS._delta.pt()/HEOS._reducing.rhomolar*HEOS.Reducing.p->drhormolardxi__constxj(HEOS.mole_fractions,j); } -long double MixtureDerivatives::dtau_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j) +long double MixtureDerivatives::dtau_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j) { // Gernert 3.122 (Catch test provided) return 1/HEOS._T*HEOS.Reducing.p->dTrdxi__constxj(HEOS.mole_fractions,j); @@ -123,7 +123,7 @@ long double MixtureDerivatives::ndpdV__constT_n(HelmholtzEOSMixtureBackend &HEOS long double R_u = HEOS.gas_constant(); return -pow(HEOS._rhomolar,2)*R_u*HEOS._T*(1+2*HEOS._delta.pt()*HEOS.dalphar_dDelta()+pow(HEOS._delta.pt(),2)*HEOS.d2alphar_dDelta2()); } -long double MixtureDerivatives::ndpdni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::ndpdni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { // Eqn 7.64 and 7.63 long double R_u = HEOS.gas_constant(); @@ -138,7 +138,7 @@ long double MixtureDerivatives::ndpdni__constT_V_nj(HelmholtzEOSMixtureBackend & return HEOS._rhomolar*R_u*HEOS._T*(1+HEOS._delta.pt()*HEOS.dalphar_dDelta()*(2-1/HEOS._reducing.rhomolar*ndrhorbar_dni__constnj)+HEOS._delta.pt()*nd2alphar_dni_dDelta); } -long double MixtureDerivatives::ndalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::ndalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { double term1 = HEOS._delta.pt()*HEOS.dalphar_dDelta()*(1-1/HEOS._reducing.rhomolar*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions,i)); double term2 = HEOS._tau.pt()*HEOS.dalphar_dTau()*(1/HEOS._reducing.T)*HEOS.Reducing.p->ndTrdni__constnj(HEOS.mole_fractions,i); @@ -151,20 +151,20 @@ long double MixtureDerivatives::ndalphar_dni__constT_V_nj(HelmholtzEOSMixtureBac double term3 = dalphar_dxi(HEOS, i); return term1 + term2 + term3 - s; } -long double MixtureDerivatives::ndln_fugacity_coefficient_dnj__constT_p(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::ndln_fugacity_coefficient_dnj__constT_p(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { long double R_u = HEOS.gas_constant(); return nd2nalphardnidnj__constT_V(HEOS, j, i) + 1 - partial_molar_volume(HEOS, j)/(R_u*HEOS._T)*ndpdni__constT_V_nj(HEOS, i); } -long double MixtureDerivatives::nddeltadni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::nddeltadni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS._delta.pt()-HEOS._delta.pt()/HEOS._reducing.rhomolar*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions, i); } -long double MixtureDerivatives::ndtaudni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::ndtaudni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { return HEOS._tau.pt()/HEOS._reducing.T*HEOS.Reducing.p->ndTrdni__constnj(HEOS.mole_fractions, i); } -long double MixtureDerivatives::d_ndalphardni_dxj__constdelta_tau_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::d_ndalphardni_dxj__constdelta_tau_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { double line1 = HEOS._delta.pt()*d2alphar_dxi_dDelta(HEOS, j)*(1-1/HEOS._reducing.rhomolar*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions, i)); double line2 = -HEOS._delta.pt()*HEOS.dalphar_dDelta()*(1/HEOS._reducing.rhomolar)*(HEOS.Reducing.p->d_ndrhorbardni_dxj__constxi(HEOS.mole_fractions, i, j)-1/HEOS._reducing.rhomolar*HEOS.Reducing.p->drhormolardxi__constxj(HEOS.mole_fractions,j)*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions,i)); @@ -178,7 +178,7 @@ long double MixtureDerivatives::d_ndalphardni_dxj__constdelta_tau_xi(HelmholtzEO double line5 = d2alphardxidxj(HEOS, i,j)-dalphar_dxi(HEOS, j)-s; return line1+line2+line3+line4+line5; } -long double MixtureDerivatives::nd2nalphardnidnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, int i, int j) +long double MixtureDerivatives::nd2nalphardnidnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j) { double line0 = ndalphar_dni__constT_V_nj(HEOS, j); // First term from 7.46 double line1 = d_ndalphardni_dDelta(HEOS, i)*nddeltadni__constT_V_nj(HEOS, j); @@ -191,7 +191,7 @@ long double MixtureDerivatives::nd2nalphardnidnj__constT_V(HelmholtzEOSMixtureBa double line3 = d_ndalphardni_dxj__constdelta_tau_xi(HEOS, i, j)-summer; return line0 + line1 + line2 + line3; } -long double MixtureDerivatives::d_ndalphardni_dDelta(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::d_ndalphardni_dDelta(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { // The first line double term1 = (HEOS._delta.pt()*HEOS.d2alphar_dDelta2()+HEOS.dalphar_dDelta())*(1-1/HEOS._reducing.rhomolar*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions, i)); @@ -208,7 +208,7 @@ long double MixtureDerivatives::d_ndalphardni_dDelta(HelmholtzEOSMixtureBackend return term1 + term2 + term3; } -long double MixtureDerivatives::d_ndalphardni_dTau(HelmholtzEOSMixtureBackend &HEOS, int i) +long double MixtureDerivatives::d_ndalphardni_dTau(HelmholtzEOSMixtureBackend &HEOS, std::size_t i) { // The first line double term1 = HEOS._delta.pt()*HEOS.d2alphar_dDelta_dTau()*(1-1/HEOS._reducing.rhomolar*HEOS.Reducing.p->ndrhorbardni__constnj(HEOS.mole_fractions, i)); diff --git a/src/Backends/Helmholtz/MixtureDerivatives.h b/src/Backends/Helmholtz/MixtureDerivatives.h index db7861df..7b7e15ed 100644 --- a/src/Backends/Helmholtz/MixtureDerivatives.h +++ b/src/Backends/Helmholtz/MixtureDerivatives.h @@ -29,10 +29,10 @@ and not pollute the HelmholtzEOSMixtureBackend namespace class MixtureDerivatives{ public: - static long double dalphar_dxi(HelmholtzEOSMixtureBackend &HEOS, int i); - static long double d2alphar_dxi_dTau(HelmholtzEOSMixtureBackend &HEOS, int i); - static long double d2alphar_dxi_dDelta(HelmholtzEOSMixtureBackend &HEOS, int i); - static long double d2alphardxidxj(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double dalphar_dxi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); + static long double d2alphar_dxi_dTau(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); + static long double d2alphar_dxi_dDelta(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); + static long double d2alphardxidxj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); /** \brief GERG 2004 Monograph equation 7.61 * @@ -64,7 +64,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double ndpdni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double ndpdni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 monograph Eqn. 7.32 * @@ -74,25 +74,25 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double partial_molar_volume(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double partial_molar_volume(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief Natural logarithm of the fugacity coefficient * * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double ln_fugacity_coefficient(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double ln_fugacity_coefficient(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief Derivative of the natural logarithm of the fugacity coefficient with respect to T * * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dln_fugacity_coefficient_dT__constrho_n(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double dln_fugacity_coefficient_dT__constrho_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief Derivative of the natural logarithm of the fugacity coefficient with respect to T * * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dln_fugacity_coefficient_drho__constT_n(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double dln_fugacity_coefficient_drho__constT_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph Eqn. 7.29 * @@ -103,7 +103,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dln_fugacity_coefficient_dT__constp_n(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double dln_fugacity_coefficient_dT__constp_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief Table B4, Kunz, JCED, 2012 for the original term and the subsequent substitutions * @@ -119,10 +119,10 @@ class MixtureDerivatives{ * \f} * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double ndalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double ndalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /// GERG Equation 7.42 - static long double dnalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double dnalphar_dni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph Eqn. 7.30 * @@ -132,7 +132,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dln_fugacity_coefficient_dp__constT_n(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double dln_fugacity_coefficient_dp__constT_n(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph Equation 7.31 * @@ -146,7 +146,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double ndln_fugacity_coefficient_dnj__constT_p(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double ndln_fugacity_coefficient_dnj__constT_p(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); /** \brief Gernert Equation 3.115 * @@ -156,7 +156,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dln_fugacity_coefficient_dxj__constT_p_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double dln_fugacity_coefficient_dxj__constT_p_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); /** \brief Gernert Equation 3.130 * @@ -166,7 +166,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double dpdxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j); + static long double dpdxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j); /** \brief Gernert Equation 3.117 * @@ -176,27 +176,27 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double d2nalphar_dxi_dnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, int i, int j){ return MixtureDerivatives::d_ndalphardni_dxj__constT_V_xi(HEOS, i, j) + MixtureDerivatives::dalphar_dxj__constT_V_xi(HEOS, j);}; + static long double d2nalphar_dxi_dnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j){ return MixtureDerivatives::d_ndalphardni_dxj__constT_V_xi(HEOS, i, j) + MixtureDerivatives::dalphar_dxj__constT_V_xi(HEOS, j);}; /// Gernert Equation 3.119 /// Catch test provided - static long double dalphar_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j); + static long double dalphar_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j); /// Gernert Equation 3.118 /// Catch test provided - static long double d_ndalphardni_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double d_ndalphardni_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); /// Gernert Equation 3.134 /// Catch test provided - static long double d_dalpharddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j); + static long double d_dalpharddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j); /// Gernert Equation 3.121 /// Catch test provided - static long double ddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j); + static long double ddelta_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j); /// Gernert Equation 3.122 /// Catch test provided - static long double dtau_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, int j); + static long double dtau_dxj__constT_V_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t j); /** \brief GERG 2004 Monograph, equations 7.44 and 7.51 * @@ -209,7 +209,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double d2nalphar_dni_dT(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double d2nalphar_dni_dT(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph Equation 7.51 and Table B4, Kunz, JCED, 2012 * @@ -221,7 +221,7 @@ class MixtureDerivatives{ * \f} * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double d_ndalphardni_dTau(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double d_ndalphardni_dTau(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph Equation 7.50 and Table B4, Kunz, JCED, 2012 * @@ -233,7 +233,7 @@ class MixtureDerivatives{ * \f} * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double d_ndalphardni_dDelta(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double d_ndalphardni_dDelta(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph equation 7.41 * @@ -254,7 +254,7 @@ class MixtureDerivatives{ * \f} * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double nd2nalphardnidnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double nd2nalphardnidnj__constT_V(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); /** \brief GERG 2004 Monograph equation 7.48 * @@ -264,7 +264,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double nddeltadni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double nddeltadni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph equation 7.49 * @@ -274,7 +274,7 @@ class MixtureDerivatives{ * \f] * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double ndtaudni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, int i); + static long double ndtaudni__constT_V_nj(HelmholtzEOSMixtureBackend &HEOS, std::size_t i); /** \brief GERG 2004 Monograph equation 7.52 * @@ -288,7 +288,7 @@ class MixtureDerivatives{ * \f} * @param HEOS The HelmholtzEOSMixtureBackend to be used */ - static long double d_ndalphardni_dxj__constdelta_tau_xi(HelmholtzEOSMixtureBackend &HEOS, int i, int j); + static long double d_ndalphardni_dxj__constdelta_tau_xi(HelmholtzEOSMixtureBackend &HEOS, std::size_t i, std::size_t j); }; /* class MixtureDerivatives */