diff --git a/dumux/porousmediumflow/2p1c/implicit/model.hh b/dumux/porousmediumflow/2p1c/implicit/model.hh index 47d4d9b7fd38eb0ab1cfd41f6e5174a81170eea6..a34fe9c35785f2a07dd9d3b82931227e869e5144 100644 --- a/dumux/porousmediumflow/2p1c/implicit/model.hh +++ b/dumux/porousmediumflow/2p1c/implicit/model.hh @@ -42,6 +42,7 @@ #include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh> #include "darcyslaw.hh" +#include "vtkoutputfields.hh" #include "indices.hh" #include "volumevariables.hh" #include "primaryvariableswitch.hh" @@ -188,7 +189,7 @@ SET_BOOL_PROP(TwoPOneCNI, EnableMolecularDiffusion, false); //! SET_TYPE_PROP(TwoPOneCNI, IsothermalIndices, TwoPOneCIndices<TypeTag, 0>); //! the isothermal vtk output fields - SET_TYPE_PROP(TwoPOneCNI, IsothermalVtkOutputFields, TwoPVtkOutputFields<TypeTag>); + SET_TYPE_PROP(TwoPOneCNI, IsothermalVtkOutputFields, TwoPOneCVtkOutputFields<TypeTag>); //set isothermal NumEq SET_INT_PROP(TwoPOneCNI, IsothermalNumEq, 1); diff --git a/dumux/porousmediumflow/2p1c/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p1c/implicit/vtkoutputfields.hh index 12296f473e9b81ab0b6ca393499cb4672db46f6a..ee2702256c58fa2d6aaa30df9c93993d5710cb02 100644 --- a/dumux/porousmediumflow/2p1c/implicit/vtkoutputfields.hh +++ b/dumux/porousmediumflow/2p1c/implicit/vtkoutputfields.hh @@ -18,27 +18,33 @@ *****************************************************************************/ /*! * \file - * \brief Adds vtk output fields specific to the onep model + * \brief Adds vtk output fields specific to the twop-onec model */ -#ifndef DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH -#define DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH +#ifndef DUMUX_TWOP_OneC_VTK_OUTPUT_FIELDS_HH +#define DUMUX_TWOP_OneC_VTK_OUTPUT_FIELDS_HH + +#include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh> namespace Dumux { /*! - * \ingroup OneP, InputOutput - * \brief Adds vtk output fields specific to the onep model + * \ingroup TwoPOneC, InputOutput + * \brief Adds vtk output fields specific to the TwoPOneC model */ template<class TypeTag> -class OnePVtkOutputFields +class TwoPOneCVtkOutputFields { - using Indices = typename GET_PROP_TYPE(TypeTag, Indices); + using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); public: template <class VtkOutputModule> static void init(VtkOutputModule& vtk) { - vtk.addVolumeVariable([](const auto& volVars){ return volVars.pressure(); }, "pressure"); + // use default fields from the 2p model + TwoPVtkOutputFields<TypeTag>::init(vtk); + + //output additional to TwoP output: + vtk.addVolumeVariable([](const VolumeVariables& v){ return v.priVars().state(); }, "phasePresence"); } };