diff --git a/dumux/porousmediumflow/1p/vtkoutputfields.hh b/dumux/porousmediumflow/1p/iofields.hh similarity index 66% rename from dumux/porousmediumflow/1p/vtkoutputfields.hh rename to dumux/porousmediumflow/1p/iofields.hh index fc5642d5246f2b0a35986b0089ba2697139b6e81..ad66508d6bee3e69705f9a4570c0897fab9cacbd 100644 --- a/dumux/porousmediumflow/1p/vtkoutputfields.hh +++ b/dumux/porousmediumflow/1p/iofields.hh @@ -21,22 +21,42 @@ * \ingroup OnePModel * \brief Adds vtk output fields specific to the one phase model */ -#ifndef DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH -#define DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH +#ifndef DUMUX_ONEP_IO_FIELDS_HH +#define DUMUX_ONEP_IO_FIELDS_HH + +#include <dune/common/deprecated.hh> + +#include <dumux/io/fieldnames.hh> namespace Dumux { +using namespace IOFieldNames; + /*! * \ingroup OnePModel - * \brief Adds vtk output fields specific to the one phase model + * \brief Adds I/O fields specific to the one phase model */ -class OnePVtkOutputFields +class OnePIOFields { public: - template <class VtkOutputModule> - static void init(VtkOutputModule& vtk) + template <class OutputModule> + static void initOutputModule(OutputModule& out) + { + out.addVolumeVariable([](const auto& volVars){ return volVars.pressure(); }, + pressure()); + } + + template <class OutputModule> + DUNE_DEPRECATED_MSG("use initOutputModule instead") + static void init(OutputModule& out) + { + initOutputModule(out); + } + + template <class FluidSystem = void, class SolidSystem = void> + static std::string primaryVariableName(int pvIdx = 0, int state = 0) { - vtk.addVolumeVariable([](const auto& volVars){ return volVars.pressure(); }, "p"); + return pressure(); } }; diff --git a/dumux/porousmediumflow/1p/model.hh b/dumux/porousmediumflow/1p/model.hh index 51b0bc168aa59ffd8cae1ead63a0f8d983a4589a..1de0921a9663b94cc2770baf2e2ab355ebe49e12 100644 --- a/dumux/porousmediumflow/1p/model.hh +++ b/dumux/porousmediumflow/1p/model.hh @@ -54,7 +54,7 @@ #include "indices.hh" #include "volumevariables.hh" -#include "vtkoutputfields.hh" +#include "iofields.hh" namespace Dumux { @@ -119,7 +119,7 @@ NEW_TYPE_TAG(OnePNI, INHERITS_FROM(OneP)); /////////////////////////////////////////////////////////////////////////// // properties for the isothermal single phase model /////////////////////////////////////////////////////////////////////////// -SET_TYPE_PROP(OneP, VtkOutputFields, OnePVtkOutputFields); //!< default vtk output fields specific to this model +SET_TYPE_PROP(OneP, IOFields, OnePIOFields); //!< default I/O fields specific to this model SET_TYPE_PROP(OneP, LocalResidual, ImmiscibleLocalResidual<TypeTag>); //!< the local residual function SET_TYPE_PROP(OneP, ModelTraits, OnePModelTraits); //!< states some specifics of the one-phase model @@ -160,7 +160,7 @@ public: /////////////////////////////////////////////////////////////////////////// //! Add temperature to the output -SET_TYPE_PROP(OnePNI, VtkOutputFields, EnergyVtkOutputFields<OnePVtkOutputFields>); +SET_TYPE_PROP(OnePNI, VtkOutputFields, EnergyVtkOutputFields<OnePIOFields>); //! The model traits of the non-isothermal model SET_TYPE_PROP(OnePNI, ModelTraits, PorousMediumFlowNIModelTraits<OnePModelTraits>);