diff --git a/dumux/material/binarycoefficients/air_xylene.hh b/dumux/material/binarycoefficients/air_xylene.hh index fabf7eb7b7049b952f10df053cd20a5773eda075..014f239fb52129646d14c862abd7da38de5e904f 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 4a7f2b8d2182c53f5c295b5c109209071214c282..752d80322fa634a3177cde0f380ab53990f3e5bb 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 8ee33d8cc30bab38722663a9415f440b21d53d0f..4765c278323d5c5bd8f58f6a08cabb2105425a97 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 4f4fe211852cfbba1d9af036e5a1d128763dd815..8cdf31c151c3d1dea8cf34aecd9203c70bbf60bd 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 98257469a4348264f19085da19947e6ec1c17836..efc1e079eed2375b93611e4d91eb0f72f0633018 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>(); }