github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-13 07:15:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

ExcessHEFunction.h all unsigned int replaced with std::size_t

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-09-06 21:39:37 +02:00
parent b6f9ce89ed
commit 783f27f0dc
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Backends/Helmholtz/ExcessHEFunction.h
View File

@@ -48,7 +48,7 @@ public:
GERG2008DepartureFunction(){};
GERG2008DepartureFunction(const std::vector<double> &n,const std::vector<double> &d,const std::vector<double> &t,
const std::vector<double> &eta,const std::vector<double> &epsilon,const std::vector<double> &beta,
const std::vector<double> &gamma, unsigned int Npower)
const std::vector<double> &gamma, std::size_t Npower)
{
/// Break up into power and gaussian terms
{
@@ -123,7 +123,7 @@ typedef shared_ptr<DepartureFunction> DepartureFunctionPointer;
class ExcessTerm
{
public:
unsigned int N;
std::size_t N;
std::vector<std::vector<DepartureFunctionPointer> > DepartureFunctionMatrix;
std::vector<std::vector<long double> > F;
@@ -143,9 +143,9 @@ public:
double alphar(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->alphar(tau,delta);
}
@@ -155,9 +155,9 @@ public:
double dalphar_dDelta(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->dalphar_dDelta(tau,delta);
}
@@ -167,9 +167,9 @@ public:
double d2alphar_dDelta2(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->d2alphar_dDelta2(tau,delta);
}
@@ -179,9 +179,9 @@ public:
double d2alphar_dDelta_dTau(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->d2alphar_dDelta_dTau(tau,delta);
}
@@ -191,9 +191,9 @@ public:
double dalphar_dTau(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->dalphar_dTau(tau,delta);
}
@@ -203,9 +203,9 @@ public:
double d2alphar_dTau2(double tau, double delta, const std::vector<long double> &x)
{
double summer = 0;
for (unsigned int i = 0; i < N-1; i++)
for (std::size_t i = 0; i < N-1; i++)
{
for (unsigned int j = i + 1; j < N; j++)
for (std::size_t j = i + 1; j < N; j++)
{
summer += x[i]*x[j]*F[i][j]*DepartureFunctionMatrix[i][j]->d2alphar_dTau2(tau,delta);
}
@@ -215,7 +215,7 @@ public:
double dalphar_dxi(double tau, double delta, const std::vector<long double> &x, unsigned int i)
{
double summer = 0;
for (unsigned int k = 0; k < N; k++)
for (std::size_t k = 0; k < N; k++)
{
if (i != k)
{
@@ -238,7 +238,7 @@ public:
double d2alphar_dxi_dTau(double tau, double delta, const std::vector<long double> &x, unsigned int i)
{
double summer = 0;
for (unsigned int k = 0; k < N; k++)
for (std::size_t k = 0; k < N; k++)
{
if (i != k)
{
@@ -250,7 +250,7 @@ public:
double d2alphar_dxi_dDelta(double tau, double delta, const std::vector<long double> &x, unsigned int i)
{
double summer = 0;
for (unsigned int k = 0; k < N; k++)
for (std::size_t k = 0; k < N; k++)
{
if (i != k)
{