Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring in unit tests #38

Merged
merged 6 commits into from
Aug 22, 2023
Merged

Refactoring in unit tests #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
929d29c
Adding a c-tor for SinglePhaseFluidProperties::Props
andrsd Aug 22, 2023
6f48902
Refactoring in air unit tests
andrsd Aug 22, 2023
61ff333
Refactoring in CO2 unit tests
andrsd Aug 22, 2023
5d01a86
Refactoring in helium unit tests
andrsd Aug 22, 2023
58e61df
Refactoring in nitrogen unit tests
andrsd Aug 22, 2023
edc532b
Refactoring in ideal gas unit tests
andrsd Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions include/SinglePhaseFluidProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ class SinglePhaseFluidProperties : public FluidProperties {
double w;

Props();
Props(double u,
double v,
double rho,
double p,
double T,
double mu,
double cp,
double cv,
double s,
double k,
double h,
double w);
};

/// Compute thermodynamical state given density and temperature
Expand Down
27 changes: 27 additions & 0 deletions src/SinglePhaseFluidProperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,33 @@ SinglePhaseFluidProperties::Props::Props()
this->w = 0.;
}

SinglePhaseFluidProperties::Props::Props(double u,
double v,
double rho,
double p,
double T,
double mu,
double cp,
double cv,
double s,
double k,
double h,
double w) :
u(u),
v(v),
rho(rho),
p(p),
T(T),
mu(mu),
cp(cp),
cv(cv),
s(s),
k(k),
h(h),
w(w)
{
}

SinglePhaseFluidProperties::SinglePhaseFluidProperties() : FluidProperties() {}

} // namespace fprops
90 changes: 54 additions & 36 deletions test/src/Air_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@

using namespace fprops;

namespace {

// T = 300 K, p = 101325 Pa
SinglePhaseFluidProperties::Props gold1 = { 340138.96058601438,
0.84965298744304329,
1.1769510785919943,
101325,
300,
1.8537852519143559e-05,
1006.1967213037287,
717.95390122400988,
3923.025553321696,
26.386197401795309e-3,
426230.04953868076,
347.30666259109006 };

} // namespace

TEST(Air, rho_T)
{
Air fp;
Expand All @@ -11,18 +29,18 @@ TEST(Air, rho_T)
double T = 300;
SinglePhaseFluidProperties::Props props = fp.rho_T(rho, T);

EXPECT_DOUBLE_EQ(props.rho, rho);
EXPECT_DOUBLE_EQ(props.T, T);
EXPECT_DOUBLE_EQ(props.p, 101325);
EXPECT_DOUBLE_EQ(props.u, 340138.96058601438);
EXPECT_DOUBLE_EQ(props.cv, 717.95390122400988);
EXPECT_DOUBLE_EQ(props.cp, 1006.1967213037287);
EXPECT_DOUBLE_EQ(props.mu, 1.8537852519143559e-05);
EXPECT_DOUBLE_EQ(props.k, 26.386197401795309e-3);
EXPECT_DOUBLE_EQ(props.v, 0.84965298744304329);
EXPECT_DOUBLE_EQ(props.s, 3923.025553321696);
EXPECT_DOUBLE_EQ(props.h, 426230.04953868076);
EXPECT_DOUBLE_EQ(props.w, 347.30666259109006);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}

TEST(Air, p_T)
Expand All @@ -33,18 +51,18 @@ TEST(Air, p_T)
double p = 101325;
SinglePhaseFluidProperties::Props props = fp.p_T(p, T);

EXPECT_DOUBLE_EQ(props.p, p);
EXPECT_DOUBLE_EQ(props.T, T);
EXPECT_DOUBLE_EQ(props.rho, 1.1769510785919943);
EXPECT_DOUBLE_EQ(props.u, 340138.96058601438);
EXPECT_DOUBLE_EQ(props.cv, 717.95390122400988);
EXPECT_DOUBLE_EQ(props.cp, 1006.1967213037287);
EXPECT_DOUBLE_EQ(props.mu, 1.8537852519143559e-05);
EXPECT_DOUBLE_EQ(props.k, 26.386197401795309e-3);
EXPECT_DOUBLE_EQ(props.v, 0.84965298744304329);
EXPECT_DOUBLE_EQ(props.s, 3923.025553321696);
EXPECT_DOUBLE_EQ(props.h, 426230.04953868076);
EXPECT_DOUBLE_EQ(props.w, 347.30666259109006);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}

TEST(Air, v_u)
Expand All @@ -55,16 +73,16 @@ TEST(Air, v_u)
double u = 340138.96058601438;
SinglePhaseFluidProperties::Props props = fp.v_u(v, u);

EXPECT_DOUBLE_EQ(props.v, v);
EXPECT_DOUBLE_EQ(props.u, u);
EXPECT_DOUBLE_EQ(props.p, 101325);
EXPECT_DOUBLE_EQ(props.T, 300);
EXPECT_DOUBLE_EQ(props.rho, 1.1769510785919943);
EXPECT_DOUBLE_EQ(props.cv, 717.95390122400988);
EXPECT_DOUBLE_EQ(props.cp, 1006.1967213037287);
EXPECT_DOUBLE_EQ(props.mu, 1.8537852519143559e-05);
EXPECT_DOUBLE_EQ(props.k, 26.386197401795309e-3);
EXPECT_DOUBLE_EQ(props.s, 3923.025553321696);
EXPECT_DOUBLE_EQ(props.h, 426230.04953868076);
EXPECT_DOUBLE_EQ(props.w, 347.30666259109006);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}
90 changes: 54 additions & 36 deletions test/src/CarbonDioxide_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@

using namespace fprops;

namespace {

// T = 280 K, p = 1 MPa
SinglePhaseFluidProperties::Props gold1 = { 430888.05580697849,
0.049506644012416195,
20.199309000812121,
1e6,
280,
1.4150532169060509e-05,
925.17988930107481,
670.91985675762839,
2225.7418437948568,
0.015727797767537487,
480394.69981939468,
252.32654137014907 };

} // namespace

TEST(CarbonDioxide, rho_T)
{
CarbonDioxide fp;
Expand All @@ -11,18 +29,18 @@ TEST(CarbonDioxide, rho_T)
double T = 280;
SinglePhaseFluidProperties::Props props = fp.rho_T(rho, T);

EXPECT_DOUBLE_EQ(props.rho, rho);
EXPECT_DOUBLE_EQ(props.T, T);
EXPECT_DOUBLE_EQ(props.p, 1e6);
EXPECT_DOUBLE_EQ(props.u, 430888.05580697849);
EXPECT_DOUBLE_EQ(props.cv, 670.91985675762839);
EXPECT_DOUBLE_EQ(props.cp, 925.17988930107481);
EXPECT_DOUBLE_EQ(props.v, 0.049506644012416195);
EXPECT_DOUBLE_EQ(props.s, 2225.7418437948568);
EXPECT_DOUBLE_EQ(props.h, 480394.69981939468);
EXPECT_DOUBLE_EQ(props.w, 252.32654137014907);
EXPECT_DOUBLE_EQ(props.mu, 1.4150532169060509e-05);
EXPECT_DOUBLE_EQ(props.k, 0.015727797767537487);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}

TEST(CarbonDioxide, p_T)
Expand All @@ -33,18 +51,18 @@ TEST(CarbonDioxide, p_T)
double p = 1e6;
SinglePhaseFluidProperties::Props props = fp.p_T(p, T);

EXPECT_DOUBLE_EQ(props.p, p);
EXPECT_DOUBLE_EQ(props.T, T);
EXPECT_DOUBLE_EQ(props.rho, 20.199309000812121);
EXPECT_DOUBLE_EQ(props.u, 430888.05580697849);
EXPECT_DOUBLE_EQ(props.cv, 670.91985675762839);
EXPECT_DOUBLE_EQ(props.cp, 925.17988930107481);
EXPECT_DOUBLE_EQ(props.v, 0.049506644012416195);
EXPECT_DOUBLE_EQ(props.s, 2225.7418437948568);
EXPECT_DOUBLE_EQ(props.h, 480394.69981939468);
EXPECT_DOUBLE_EQ(props.w, 252.32654137014907);
EXPECT_DOUBLE_EQ(props.mu, 1.4150532169060509e-05);
EXPECT_DOUBLE_EQ(props.k, 0.015727797767537487);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}

TEST(CarbonDioxide, v_u)
Expand All @@ -55,16 +73,16 @@ TEST(CarbonDioxide, v_u)
double u = 430888.05580697849;
SinglePhaseFluidProperties::Props props = fp.v_u(v, u);

EXPECT_DOUBLE_EQ(props.v, v);
EXPECT_DOUBLE_EQ(props.u, u);
EXPECT_DOUBLE_EQ(props.p, 1e6);
EXPECT_DOUBLE_EQ(props.T, 280);
EXPECT_DOUBLE_EQ(props.rho, 20.199309000812121);
EXPECT_DOUBLE_EQ(props.cv, 670.91985675762839);
EXPECT_DOUBLE_EQ(props.cp, 925.17988930107481);
EXPECT_DOUBLE_EQ(props.s, 2225.7418437948568);
EXPECT_DOUBLE_EQ(props.h, 480394.69981939468);
EXPECT_DOUBLE_EQ(props.w, 252.32654137014907);
EXPECT_DOUBLE_EQ(props.mu, 1.4150532169060509e-05);
EXPECT_DOUBLE_EQ(props.k, 0.015727797767537487);
EXPECT_DOUBLE_EQ(props.rho, gold1.rho);
EXPECT_DOUBLE_EQ(props.T, gold1.T);
EXPECT_DOUBLE_EQ(props.p, gold1.p);
EXPECT_DOUBLE_EQ(props.u, gold1.u);
EXPECT_DOUBLE_EQ(props.cv, gold1.cv);
EXPECT_DOUBLE_EQ(props.cp, gold1.cp);
EXPECT_DOUBLE_EQ(props.mu, gold1.mu);
EXPECT_DOUBLE_EQ(props.k, gold1.k);
EXPECT_DOUBLE_EQ(props.v, gold1.v);
EXPECT_DOUBLE_EQ(props.s, gold1.s);
EXPECT_DOUBLE_EQ(props.h, gold1.h);
EXPECT_DOUBLE_EQ(props.w, gold1.w);
}
Loading
Loading