Merge branch 'fix/h20heavyoil' into 'master'

Fix/h2oheavyoil

See merge request !1111

dumux/material/fluidsystems/h2oheavyoil.hh

@@ -37,8 +37,9 @@ namespace Dumux {
 namespace FluidSystems {
 
 /*!
- * \brief A compositional fluid with water and heavy oil
- *        components in both, the liquid and the gas phase.
+ * \ingroup Fluidsystems
+ * \brief A compositional fluid system with water and heavy oil
+ *        components in both the liquid and the gas phase.
  */
 template <class Scalar,
           class H2OType = Dumux::Components::TabulatedComponent<Dumux::Components::H2O<Scalar> > >
@@ -355,7 +356,8 @@ public:
             DUNE_THROW(Dune::InvalidStateException, "non-existent diffusion coefficient for phase index " << phaseIdx);
     }
 
-     /* Henry coefficients
+    /*!
+     * \brief Henry coefficients \f$[N/m^2]\f$ of a component in a phase.
      */
     template <class FluidState>
     static Scalar henryCoefficient(const FluidState &fluidState,
@@ -366,20 +368,20 @@ public:
         assert(0 <= compIdx  && compIdx < numComponents);
 
         const Scalar T = fluidState.temperature(phaseIdx);
-        const Scalar p = fluidState.pressure(phaseIdx);
 
         if (compIdx == NAPLIdx && phaseIdx == wPhaseIdx)
-            return Dumux::BinaryCoeff::H2O_HeavyOil::henryOilInWater(T)/p;
+            return Dumux::BinaryCoeff::H2O_HeavyOil::henryOilInWater(T);
 
         else if (phaseIdx == nPhaseIdx && compIdx == H2OIdx)
-            return Dumux::BinaryCoeff::H2O_HeavyOil::henryWaterInOil(T)/p;
+            return Dumux::BinaryCoeff::H2O_HeavyOil::henryWaterInOil(T);
 
         else
             DUNE_THROW(Dune::InvalidStateException, "non-existent henry coefficient for phase index " << phaseIdx
                                                      << " and component index " << compIdx);
     }
 
-     /*  partial pressures in the gas phase, taken from saturation vapor pressures
+    /*!
+     * \brief Partial pressures in the gas phase, taken from saturation vapor pressures.
      */
     template <class FluidState>
     static Scalar partialPressureGas(const FluidState &fluidState, int phaseIdx,
@@ -396,7 +398,8 @@ public:
             DUNE_THROW(Dune::InvalidStateException, "non-existent component index " << compIdx);
     }
 
-     /*  inverse vapor pressures, taken from inverse saturation vapor pressures
+    /*!
+     * \brief Inverse vapor pressures, taken from inverse saturation vapor pressures
      */
     template <class FluidState>
     static Scalar inverseVaporPressureCurve(const FluidState &fluidState,
@@ -418,11 +421,10 @@ public:
 
     /*!
      * \brief Given all mole fractions in a phase, return the specific
-     *        phase enthalpy [J/kg].
-     */
-    /*!
+     *        phase enthalpy\f$\mathrm{[J/kg]}\f$.
      *  \todo This system neglects the contribution of gas-molecules in the liquid phase.
-     *        This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ...
+     *        This contribution is probably not big.
+     *        Somebody would have to find out the enthalpy of solution for this system. ...
      */
     using Base::enthalpy;
     template <class FluidState>
@@ -458,6 +460,14 @@ public:
         DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2ONAPL::heatCapacity()");
     }
 
+    /*!
+     * \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
+     *
+     * Use the conductivity of water (wPhase and gPhase) and oil (nPhase) as a first approximation.
+     *
+     * \param fluidState An arbitrary fluid state
+     * \param phaseIdx The index of the fluid phase to consider
+     */
     using Base::thermalConductivity;
     template <class FluidState>
     static Scalar thermalConductivity(const FluidState &fluidState,
@@ -480,10 +490,7 @@ public:
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
-private:
-
 };
-
 } // end namespace FluidSystems
 } // end namespace Dumux
 

test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdspatialparams.hh

@@ -87,11 +87,9 @@ public:
 
         // residual saturations
         fineMaterialParams_.setSwr(0.1);
-        fineMaterialParams_.setSwrx(0.12);  //Total liquid Residual Saturation
         fineMaterialParams_.setSnr(0.09);   //Residual of NAPL if there is no water
         fineMaterialParams_.setSgr(0.01);
         coarseMaterialParams_.setSwr(0.1);
-        coarseMaterialParams_.setSwrx(0.12);
         coarseMaterialParams_.setSnr(0.09);
         coarseMaterialParams_.setSgr(0.01);
 

test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt

@@ -6,7 +6,7 @@ dune_add_test(NAME test_box3pwateroil
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                 CMD_ARGS --script fuzzy
             --files ${CMAKE_SOURCE_DIR}/test/references/3pwateroilbox-reference.vtu
-                   ${CMAKE_CURRENT_BINARY_DIR}/sagd-00011.vtu
+                   ${CMAKE_CURRENT_BINARY_DIR}/sagd-00020.vtu
             --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pwateroil"
   )