From 0c38f2600c722461eede299c265eeb93b41bcf8e Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Wed, 3 Sep 2014 17:38:13 +0100 Subject: [PATCH] Remove std::size_t cast in ReducingFunctions Signed-off-by: Ian Bell --- src/Backends/Helmholtz/ReducingFunctions.cpp | 6 +++--- src/Backends/Helmholtz/ReducingFunctions.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Backends/Helmholtz/ReducingFunctions.cpp b/src/Backends/Helmholtz/ReducingFunctions.cpp index 1517df5d..4d3fdabb 100644 --- a/src/Backends/Helmholtz/ReducingFunctions.cpp +++ b/src/Backends/Helmholtz/ReducingFunctions.cpp @@ -265,14 +265,14 @@ long double GERG2008ReducingFunction::d2rhormolardxi2__constxj(const std::vector { long double rhor = this->rhormolar(x); long double dvrbardxi = this->dvrmolardxi__constxj(x,i, xN_flag); - return 2*pow(rhor,(std::size_t)3)*pow(dvrbardxi,(std::size_t)2)-pow(rhor,(std::size_t)2)*this->d2vrmolardxi2__constxj(x,i, xN_flag); + return 2*pow(rhor,3)*pow(dvrbardxi,2)-pow(rhor,2)*this->d2vrmolardxi2__constxj(x,i, xN_flag); } long double GERG2008ReducingFunction::d2rhormolardxidxj(const std::vector &x, std::size_t i, std::size_t j, x_N_dependency_flag xN_flag) { double rhor = this->rhormolar(x); double dvrbardxi = this->dvrmolardxi__constxj(x,i, xN_flag); double dvrbardxj = this->dvrmolardxi__constxj(x,j, xN_flag); - return 2*pow(rhor,(std::size_t)3)*dvrbardxi*dvrbardxj-pow(rhor,(std::size_t)2)*this->d2vrmolardxidxj(x,i,j, xN_flag); + return 2*pow(rhor,3)*dvrbardxi*dvrbardxj-pow(rhor,2)*this->d2vrmolardxidxj(x,i,j, xN_flag); } long double GERG2008ReducingFunction::Yr(const std::vector &x, const STLMatrix &beta, const STLMatrix &gamma, const STLMatrix &Y_c_ij, const std::vector &Yc) @@ -451,7 +451,7 @@ long double GERG2008ReducingFunction::d2fYijdxidxj(const std::vectorpEOS->reduce.T*pFluids[j]->pEOS->reduce.T); - v_c[i][j] = 1.0/8.0*pow(pow(pFluids[i]->pEOS->reduce.rhomolar, -1.0/3.0)+pow(pFluids[j]->pEOS->reduce.rhomolar, -1.0/3.0),(std::size_t)3); + v_c[i][j] = 1.0/8.0*pow(pow(pFluids[i]->pEOS->reduce.rhomolar, -1.0/3.0)+pow(pFluids[j]->pEOS->reduce.rhomolar, -1.0/3.0),3); } Yc_T[i] = pFluids[i]->pEOS->reduce.T; Yc_v[i] = 1/pFluids[i]->pEOS->reduce.rhomolar; @@ -218,7 +218,7 @@ public: long double v_i = 1/pFluids[i]->pEOS->reduce.rhomolar; long double v_j = 1/pFluids[j]->pEOS->reduce.rhomolar; long double one_third = 1.0/3.0; - gamma_v = (v_i + v_j + zeta_ij)/(0.25*pow(pow(v_i, one_third)+pow(v_j, one_third),(std::size_t)3)); + gamma_v = (v_i + v_j + zeta_ij)/(0.25*pow(pow(v_i, one_third)+pow(v_j, one_third),3)); }; };