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

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");
-    };
+    }
 };
 
 }

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!
-    };
+    }
 };
 
 }

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
      *

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

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>(); }