From 0651e76d514ffe7438bfb12928adf59f22ba5a6c Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 12 Dec 2017 13:34:50 +0100
Subject: [PATCH] [2p1cni] Inherit from 2p vtkoutputfields
---
dumux/porousmediumflow/2p1c/implicit/model.hh | 3 ++-
.../2p1c/implicit/vtkoutputfields.hh | 22 ++++++++++++-------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/dumux/porousmediumflow/2p1c/implicit/model.hh b/dumux/porousmediumflow/2p1c/implicit/model.hh
index 47d4d9b7fd..a34fe9c357 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 12296f473e..ee2702256c 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");
}
};
--
GitLab