Skip to content
Snippets Groups Projects
Commit 5c9d26e4 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[material] rename fluidsystem file

Manual cherry-pick of a part of 993d4801.
parent e1454895
No related branches found
No related tags found
1 merge request!721Fix/rename fluidsystem file
...@@ -8,7 +8,7 @@ install(FILES ...@@ -8,7 +8,7 @@ install(FILES
h2oair.hh h2oair.hh
h2oairmesitylene.hh h2oairmesitylene.hh
h2oairxylene.hh h2oairxylene.hh
h2oheavyoilfluidsystem.hh h2oheavyoil.hh
h2on2.hh h2on2.hh
h2on2kinetic.hh h2on2kinetic.hh
h2on2o2.hh h2on2o2.hh
......
...@@ -27,30 +27,34 @@ ...@@ -27,30 +27,34 @@
#include <dumux/material/idealgas.hh> #include <dumux/material/idealgas.hh>
#include <dumux/material/components/h2o.hh> #include <dumux/material/components/h2o.hh>
#include <dumux/material/components/tabulatedcomponent.hh> #include <dumux/material/components/tabulatedcomponent.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/heavyoil.hh> #include <dumux/material/components/heavyoil.hh>
#include <dumux/material/binarycoefficients/h2o_heavyoil.hh> #include <dumux/material/binarycoefficients/h2o_heavyoil.hh>
#include <dumux/material/fluidsystems/base.hh> #include <dumux/material/fluidsystems/base.hh>
namespace Dumux { namespace Dumux
namespace FluidSystems { {
namespace FluidSystems
{
/*! /*!
* \brief A compositional fluid with water and heavy oil * \ingroup Fluidsystems
* components in both, the liquid and the gas phase. * \brief A compositional fluid system with water and heavy oil
* components in both the liquid and the gas phase.
*/ */
template <class Scalar, template <class TypeTag, class Scalar,
class H2OType = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > > class H2OType = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > >
class H2OHeavyOil class H2OHeavyOil
: public BaseFluidSystem<Scalar, H2OHeavyOil<Scalar, H2OType> > : public BaseFluidSystem<Scalar, H2OHeavyOil<TypeTag, Scalar, H2OType> >
{ {
using ThisType = H2OHeavyOil<Scalar, H2OType>; typedef H2OHeavyOil<TypeTag, Scalar, H2OType> ThisType;
using Base = BaseFluidSystem<Scalar, ThisType>; typedef BaseFluidSystem<Scalar, ThisType> Base;
public: public:
using HeavyOil = Dumux::HeavyOil<Scalar>; typedef Dumux::HeavyOil<Scalar> HeavyOil;
using H2O = H2OType; typedef H2OType H2O;
static const int numPhases = 3; static const int numPhases = 3;
...@@ -156,7 +160,7 @@ public: ...@@ -156,7 +160,7 @@ public:
* *
* \param phaseIdx The index of the fluid phase to consider * \param phaseIdx The index of the fluid phase to consider
*/ */
static constexpr bool isCompressible(int phaseIdx) static bool isCompressible(int phaseIdx)
{ {
assert(0 <= phaseIdx && phaseIdx < numPhases); assert(0 <= phaseIdx && phaseIdx < numPhases);
// gases are always compressible // gases are always compressible
...@@ -307,7 +311,8 @@ public: ...@@ -307,7 +311,8 @@ public:
DUNE_THROW(Dune::InvalidStateException, "non-existent diffusion coefficient for phase index " << phaseIdx); DUNE_THROW(Dune::InvalidStateException, "non-existent diffusion coefficient for phase index " << phaseIdx);
} }
/* Henry coefficients /*!
* \brief Henry coefficients
*/ */
template <class FluidState> template <class FluidState>
static Scalar henryCoefficient(const FluidState &fluidState, static Scalar henryCoefficient(const FluidState &fluidState,
...@@ -318,20 +323,20 @@ public: ...@@ -318,20 +323,20 @@ public:
assert(0 <= compIdx && compIdx < numComponents); assert(0 <= compIdx && compIdx < numComponents);
const Scalar T = fluidState.temperature(phaseIdx); const Scalar T = fluidState.temperature(phaseIdx);
const Scalar p = fluidState.pressure(phaseIdx);
if (compIdx == NAPLIdx && phaseIdx == wPhaseIdx) 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) else if (phaseIdx == nPhaseIdx && compIdx == H2OIdx)
return Dumux::BinaryCoeff::H2O_HeavyOil::henryWaterInOil(T)/p; return Dumux::BinaryCoeff::H2O_HeavyOil::henryWaterInOil(T);
else else
DUNE_THROW(Dune::InvalidStateException, "non-existent henry coefficient for phase index " << phaseIdx DUNE_THROW(Dune::InvalidStateException, "non-existent henry coefficient for phase index " << phaseIdx
<< " and component index " << compIdx); << " 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> template <class FluidState>
static Scalar partialPressureGas(const FluidState &fluidState, int phaseIdx, static Scalar partialPressureGas(const FluidState &fluidState, int phaseIdx,
...@@ -348,7 +353,8 @@ public: ...@@ -348,7 +353,8 @@ public:
DUNE_THROW(Dune::InvalidStateException, "non-existent component index " << compIdx); 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> template <class FluidState>
static Scalar inverseVaporPressureCurve(const FluidState &fluidState, static Scalar inverseVaporPressureCurve(const FluidState &fluidState,
...@@ -371,8 +377,7 @@ public: ...@@ -371,8 +377,7 @@ public:
/*! /*!
* \brief Given all mole fractions in a phase, return the specific * \brief Given all mole fractions in a phase, return the specific
* phase enthalpy [J/kg]. * phase enthalpy [J/kg].
*/ *
/*!
* \todo This system neglects the contribution of gas-molecules in the liquid phase. * \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. ...
*/ */
...@@ -435,7 +440,6 @@ public: ...@@ -435,7 +440,6 @@ public:
private: private:
}; };
} // end namespace FluidSystems } // end namespace FluidSystems
} // end namespace Dumux } // end namespace Dumux
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <dumux/discretization/box/properties.hh> #include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh> #include <dumux/porousmediumflow/3pwateroil/model.hh>
#include <dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh> #include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include "3pwateroilsagdspatialparams.hh" #include "3pwateroilsagdspatialparams.hh"
namespace Dumux namespace Dumux
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment