Changed the interface for these test problems.
This commit is contained in:
parent
43ec6ff871
commit
a4e8f2f972
3 changed files with 285 additions and 285 deletions
|
|
@ -38,21 +38,21 @@ int main () {
|
||||||
dens = water->density(T, pres, WATER_LIQUID);
|
dens = water->density(T, pres, WATER_LIQUID);
|
||||||
printf("dens (liquid) = %g kg m-3\n", dens);
|
printf("dens (liquid) = %g kg m-3\n", dens);
|
||||||
|
|
||||||
u = water->intEnergy(T, dens);
|
u = water->intEnergy();
|
||||||
if (fabs(u) < 5.0E-7) {
|
if (fabs(u) < 5.0E-7) {
|
||||||
printf("intEng (liquid) ~= 0.0 J/kmol (less than fabs(5.0E-7))\n");
|
printf("intEng (liquid) ~= 0.0 J/kmol (less than fabs(5.0E-7))\n");
|
||||||
} else {
|
} else {
|
||||||
printf("intEng (liquid) = %g J/kmol\n", u);
|
printf("intEng (liquid) = %g J/kmol\n", u);
|
||||||
}
|
}
|
||||||
|
|
||||||
s = water->entropy(T, dens);
|
s = water->entropy();
|
||||||
if (fabs(s) < 1.0E-9) {
|
if (fabs(s) < 1.0E-9) {
|
||||||
printf("S (liquid) ~= 0.0 J/kmolK (less than fabs(1.0E-9))\n");
|
printf("S (liquid) ~= 0.0 J/kmolK (less than fabs(1.0E-9))\n");
|
||||||
} else {
|
} else {
|
||||||
printf("S (liquid) = %g J/kmolK\n", s);
|
printf("S (liquid) = %g J/kmolK\n", s);
|
||||||
}
|
}
|
||||||
|
|
||||||
h = water->enthalpy(T, dens);
|
h = water->enthalpy();
|
||||||
printf("h (liquid) = %g J/kmol\n", h);
|
printf("h (liquid) = %g J/kmol\n", h);
|
||||||
printf("h (liquid) = %g J/kg\n", (h)/18.015268);
|
printf("h (liquid) = %g J/kg\n", (h)/18.015268);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,21 +22,21 @@ int main () {
|
||||||
dens = water->density(T, pres, WATER_LIQUID);
|
dens = water->density(T, pres, WATER_LIQUID);
|
||||||
printf("dens (liquid) = %g kg m-3\n", dens);
|
printf("dens (liquid) = %g kg m-3\n", dens);
|
||||||
|
|
||||||
u = water->intEnergy(T, dens);
|
u = water->intEnergy();
|
||||||
if (fabs(u) < 5.0E-7) {
|
if (fabs(u) < 5.0E-7) {
|
||||||
printf("intEng (liquid) = ~0.0 J/kmol (fabs(u) < 5.0E-7)\n");
|
printf("intEng (liquid) = ~0.0 J/kmol (fabs(u) < 5.0E-7)\n");
|
||||||
} else {
|
} else {
|
||||||
printf("intEng (liquid) = %g J/kmol\n", u);
|
printf("intEng (liquid) = %g J/kmol\n", u);
|
||||||
}
|
}
|
||||||
|
|
||||||
s = water->entropy(T, dens);
|
s = water->entropy();
|
||||||
if (fabs(s) < 5.0E-9) {
|
if (fabs(s) < 5.0E-9) {
|
||||||
printf("S (liquid) = ~0.0 J/kmolK (fabs(s) < 5.0E-9)\n");
|
printf("S (liquid) = ~0.0 J/kmolK (fabs(s) < 5.0E-9)\n");
|
||||||
} else {
|
} else {
|
||||||
printf("S (liquid) = %g J/kmolK\n", s);
|
printf("S (liquid) = %g J/kmolK\n", s);
|
||||||
}
|
}
|
||||||
|
|
||||||
h = water->enthalpy(T, dens);
|
h = water->enthalpy();
|
||||||
printf("h (liquid) = %g J/kmol\n", h);
|
printf("h (liquid) = %g J/kmol\n", h);
|
||||||
printf("h (liquid) = %g J/kg\n", (h)/18.015268);
|
printf("h (liquid) = %g J/kg\n", (h)/18.015268);
|
||||||
|
|
||||||
|
|
@ -55,13 +55,13 @@ int main () {
|
||||||
printf("dens (gas) = %g kg m-3\n", dens);
|
printf("dens (gas) = %g kg m-3\n", dens);
|
||||||
|
|
||||||
|
|
||||||
u = water->intEnergy(T, dens);
|
u = water->intEnergy();
|
||||||
printf("intEng (gas) = %g J/kmol\n", u);
|
printf("intEng (gas) = %g J/kmol\n", u);
|
||||||
|
|
||||||
s = water->entropy(T, dens);
|
s = water->entropy();
|
||||||
printf("S (gas) = %g J/kmolK\n", s);
|
printf("S (gas) = %g J/kmolK\n", s);
|
||||||
|
|
||||||
h = water->enthalpy(T, dens);
|
h = water->enthalpy();
|
||||||
printf("h (gas) = %g J/kmol\n", h);
|
printf("h (gas) = %g J/kmol\n", h);
|
||||||
printf("h (gas) = %g J/kg\n", (h)/18.015268);
|
printf("h (gas) = %g J/kg\n", (h)/18.015268);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue