From 4549d83eb8fba56d61a3c1ba3597ca70a54a619f Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 31 Jan 2012 19:45:54 +0000
Subject: [PATCH] fluidsystems test: include the h2o-air-xylene fluid system
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7593 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../material/binarycoefficients/air_xylene.hh | 6 +++---
.../material/binarycoefficients/h2o_xylene.hh | 6 +++---
dumux/material/components/xylene.hh | 18 ++++++++++++++++++
test/material/fluidsystems/checkfluidsystem.hh | 1 +
.../material/fluidsystems/test_fluidsystems.cc | 5 +++++
5 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/dumux/material/binarycoefficients/air_xylene.hh b/dumux/material/binarycoefficients/air_xylene.hh
index fabf7eb7b7..014f239fb5 100644
--- a/dumux/material/binarycoefficients/air_xylene.hh
+++ b/dumux/material/binarycoefficients/air_xylene.hh
@@ -49,7 +49,7 @@ public:
static Scalar henry(Scalar temperature)
{ DUNE_THROW(Dune::NotImplemented,
"Henry coefficient of air in xylene");
- };
+ }
/*!
* \brief Binary diffusion coefficent [m^2/s] for air and xylene.
@@ -91,7 +91,7 @@ public:
/(1e-5*pressure*std::pow(sigma_ax, 2.0)*Omega); // [cm^2/s]
return D_ax*1e-4; // [m^2/s]
- };
+ }
/*!
* \brief Diffusion coefficent [m^2/s] for molecular xylene in liquid water.
@@ -102,7 +102,7 @@ public:
static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented,
"Binary liquid diffusion coefficients of air and xylene");
- };
+ }
};
}
diff --git a/dumux/material/binarycoefficients/h2o_xylene.hh b/dumux/material/binarycoefficients/h2o_xylene.hh
index 4a7f2b8d21..752d80322f 100644
--- a/dumux/material/binarycoefficients/h2o_xylene.hh
+++ b/dumux/material/binarycoefficients/h2o_xylene.hh
@@ -59,7 +59,7 @@ public:
Scalar dumuxH = sanderH / 101.325; // has now [(mol/m^3)/Pa]
dumuxH *= 18.02e-6; //multiplied by molar volume of reference phase = water
return 1.0/dumuxH; // [Pa]
- };
+ }
/*!
* \brief Binary diffusion coefficent [m^2/s] for molecular water and xylene.
@@ -100,7 +100,7 @@ public:
/(1e-5*pressure*std::pow(sigma_wx, 2.0)*Omega); // [cm^2/s]
return D_wx*1e-4; // [m^2/s]
- };
+ }
/*!
* \brief Diffusion coefficent [m^2/s] for xylene in liquid water.
@@ -111,7 +111,7 @@ public:
static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
{
return 1.e-9; // This is just an order of magnitude. Please improve it!
- };
+ }
};
}
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 8ee33d8cc3..4765c27832 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -239,6 +239,24 @@ public:
return (molarLiquidDensity(temperature, pressure)*molarMass()); // [kg/m^3]
}
+ /*!
+ * \brief Returns true iff the gas phase is assumed to be compressible
+ */
+ static bool gasIsCompressible()
+ { return true; }
+
+ /*!
+ * \brief Returns true iff the gas phase is assumed to be ideal
+ */
+ static bool gasIsIdeal()
+ { return true; }
+
+ /*!
+ * \brief Returns true iff the liquid phase is assumed to be compressible
+ */
+ static bool liquidIsCompressible()
+ { return false; }
+
/*!
* \brief The dynamic viscosity \f$\mathrm{[Pa*s]}\f$ of xylene vapor
*
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 4f4fe21185..8cdf31c151 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -38,6 +38,7 @@
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
#include <dumux/material/fluidsystems/spe5fluidsystem.hh>
// include all fluid states
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index 98257469a4..efc1e079ee 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -40,6 +40,7 @@
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
// include all fluid states
#include <dumux/material/fluidstates/pressureoverlayfluidstate.hh>
@@ -122,6 +123,10 @@ int main()
{ typedef Dumux::FluidSystems::H2OAirMesitylene<Scalar> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); }
+ // H2O -- Air -- Xylene
+ { typedef Dumux::FluidSystems::H2OAirXylene<Scalar> FluidSystem;
+ checkFluidSystem<Scalar, FluidSystem>(); }
+
// 2p-immiscible
{ typedef Dumux::FluidSystems::TwoPImmiscible<Scalar, Liquid, Liquid> FluidSystem;
checkFluidSystem<Scalar, FluidSystem>(); }
--
GitLab