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

Renamed Derivatives to HelmholtzDerivatives; they all check fine

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-08-16 14:26:25 +02:00
parent 5cad463158
commit 9a1a0122e3
3 changed files with 33 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Helmholtz.cpp
View File

@@ -18,7 +18,7 @@ long double kahanSum(std::vector<long double> &x)
}
bool wayToSort(long double i, long double j) { return std::abs(i) > std::abs(j); }
void ResidualHelmholtzGeneralizedExponential::all(const long double &tau, const long double &delta, Derivatives &derivs) throw()
void ResidualHelmholtzGeneralizedExponential::all(const long double &tau, const long double &delta, HelmholtzDerivatives &derivs) throw()
{
long double log_tau = log(tau), log_delta = log(delta), ndteu,
u, du_ddelta, du_dtau, d2u_ddelta2, d2u_dtau2, d3u_ddelta3, d3u_dtau3,
@@ -176,7 +176,7 @@ void ResidualHelmholtzNonAnalytic::to_json(rapidjson::Value &el, rapidjson::Docu
el.AddMember("D",_D,doc.GetAllocator());
}
void ResidualHelmholtzNonAnalytic::all(const long double &tau, const long double &delta, Derivatives &derivs) throw()
void ResidualHelmholtzNonAnalytic::all(const long double &tau, const long double &delta, HelmholtzDerivatives &derivs) throw()
{
if (N==0){return;}
for (unsigned int i=0; i<N; ++i)
@@ -785,7 +785,7 @@ long double ResidualHelmholtzSAFTAssociating::eta(const long double &delta){
return this->vbarn*delta;
}
void ResidualHelmholtzSAFTAssociating::all(const long double &tau, const long double &delta, Derivatives &deriv) throw()
void ResidualHelmholtzSAFTAssociating::all(const long double &tau, const long double &delta, HelmholtzDerivatives &deriv) throw()
{
if (disabled){return;}
long double X = this->X(delta, this->Deltabar(tau, delta));

6
src/main.cxx
View File

@@ -413,11 +413,11 @@ int main()
int rr = 0;
}
#endif
#if 0
#if 1
{
#if ENABLE_CATCH
std::vector<std::string> tags;
tags.push_back("[ancillaries]");
tags.push_back("[helmholtz]");
run_user_defined_tests(tags);
double rr = 0;
char c;
@@ -503,7 +503,7 @@ int main()
shared_ptr<HelmholtzEOSMixtureBackend> Water(new HelmholtzEOSMixtureBackend(names));
Water->set_mole_fractions(std::vector<long double>(1,1));
Derivatives derivs;
HelmholtzDerivatives derivs;
time_t t1,t2;
long N = 100000;
double ss = 0;