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

Fixed some incompressible build problems

Browse Source
This commit is contained in:
jowr
2014-06-06 15:33:32 +02:00
parent 0d845cf966
commit 0dd5faa31a
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Backends/Helmholtz/Fluids/Incompressible.cpp
View File

@@ -22,39 +22,39 @@ std::vector<std::vector<double> > Incompressible::changeAxis(const std::vector<d
return output;
}
/* All functions need T and p as input. Might not
* be necessary, but gives a clearer structure.
*/
/// Density as a function of temperature, pressure and composition.
double Incompressible::rho(double T_K, double p) {
return poly.polyval(cRho, getxInput(x), getTInput(T_K));
}
/// Heat capacities as a function of temperature, pressure and composition.
double Incompressible::c(double T_K, double p) {
return poly.polyval(cHeat, getxInput(x), getTInput(T_K));
}
/// Enthalpy as a function of temperature, pressure and composition.
double Incompressible::h(double T_K, double p) {
return h_u(T_K, p);
}
/// Entropy as a function of temperature, pressure and composition.
double Incompressible::s(double T_K, double p) {
return poly.polyfracintcentral(cHeat, getxInput(x), T_K, Tbase)
- poly.polyfracintcentral(cHeat, getxInput(x), Tref, Tbase);
}
/// Viscosity as a function of temperature, pressure and composition.
double Incompressible::visc(double T_K, double p) {
return expo.expval(cVisc, getxInput(x), getTInput(T_K), 2) / 1e3;
}
/// Thermal conductivity as a function of temperature, pressure and composition.
double Incompressible::cond(double T_K, double p) {
return poly.polyval(cCond, getxInput(x), getTInput(T_K));
}
/// Internal energy as a function of temperature, pressure and composition.
double Incompressible::u(double T_K, double p) {
return poly.polyint(cHeat, getxInput(x), getTInput(T_K))
- poly.polyint(cHeat, getxInput(x), getTInput(Tref));
}
// /* All functions need T and p as input. Might not
// * be necessary, but gives a clearer structure.
// */
// /// Density as a function of temperature, pressure and composition.
// double Incompressible::rho(double T_K, double p) {
// return poly.polyval(cRho, getxInput(x), getTInput(T_K));
// }
// /// Heat capacities as a function of temperature, pressure and composition.
// double Incompressible::c(double T_K, double p) {
// return poly.polyval(cHeat, getxInput(x), getTInput(T_K));
// }
// /// Enthalpy as a function of temperature, pressure and composition.
// double Incompressible::h(double T_K, double p) {
// return h_u(T_K, p);
// }
// /// Entropy as a function of temperature, pressure and composition.
// double Incompressible::s(double T_K, double p) {
// return poly.polyfracintcentral(cHeat, getxInput(x), T_K, Tbase)
// - poly.polyfracintcentral(cHeat, getxInput(x), Tref, Tbase);
// }
// /// Viscosity as a function of temperature, pressure and composition.
// double Incompressible::visc(double T_K, double p) {
// return expo.expval(cVisc, getxInput(x), getTInput(T_K), 2) / 1e3;
// }
// /// Thermal conductivity as a function of temperature, pressure and composition.
// double Incompressible::cond(double T_K, double p) {
// return poly.polyval(cCond, getxInput(x), getTInput(T_K));
// }
// /// Internal energy as a function of temperature, pressure and composition.
// double Incompressible::u(double T_K, double p) {
// return poly.polyint(cHeat, getxInput(x), getTInput(T_K))
// - poly.polyint(cHeat, getxInput(x), getTInput(Tref));
// }
/// Saturation pressure as a function of temperature and composition.
double Incompressible::psat(double T_K ){throw NotImplementedError("Psat is not available");};

6
src/Backends/Helmholtz/Fluids/Incompressible.h
View File

@@ -36,9 +36,9 @@ protected:
std::vector<std::vector<double> > changeAxis(const std::vector<double> &input);
BasePolynomial poly;
PolynomialSolver solver;
BaseExponential expo;
//BasePolynomial poly;
//PolynomialSolver solver;
//BaseExponential expo;
public:
Incompressible();