diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh index c957238580bb342309e7f27450aa24bea642048a..0c990a1dca573736cf80114440e63fb29ea6d2f1 100644 --- a/dumux/common/properties.hh +++ b/dumux/common/properties.hh @@ -72,9 +72,6 @@ template<class TypeTag, class MyTypeTag> struct PointSource { using type = UndefinedProperty; }; //!< Property defining the type of point source used template<class TypeTag, class MyTypeTag> struct PointSourceHelper { using type = UndefinedProperty; }; //!< Property defining the class that computes which sub control volume point sources belong to -// TODO: Remove deprecated property VtkOutputFields -template<class TypeTag, class MyTypeTag> -struct VtkOutputFields { using type = UndefinedProperty; }; //!< A class helping models to define default vtk output parameters template<class TypeTag, class MyTypeTag> struct IOFields { using type = UndefinedProperty; }; //!< A class helping models to define input and output fields template<class TypeTag, class MyTypeTag> diff --git a/dumux/common/properties/model.hh b/dumux/common/properties/model.hh index 6438ed9c69047479878a00cd740f81505114cc6c..ea9bb59c10c7c1d764d6b45bd57dfde5ee2e8bb9 100644 --- a/dumux/common/properties/model.hh +++ b/dumux/common/properties/model.hh @@ -60,12 +60,6 @@ struct ModelDefaultParameters<TypeTag, TTag::ModelProperties> static void defaultParams(Dune::ParameterTree& tree, const std::string& group = "") { } }; -//! \todo this property is deprecated use IOFields instead! -template<class TypeTag> -struct VtkOutputFields<TypeTag, TTag::ModelProperties> { - using type [[deprecated("This property is deprecated use property IOFields instead")]] = GetPropType<TypeTag, Properties::IOFields>; -}; - //! Set the default to an implementation throwing a NotImplemented error template<class TypeTag> struct IOFields<TypeTag, TTag::ModelProperties> { using type = DefaultIOFields; }; diff --git a/test/porousmediumflow/2p2c/implicit/injection/main.cc b/test/porousmediumflow/2p2c/implicit/injection/main.cc index dba92c9b3727e2a2e7668df7d4ece19d9db004f9..e27ab00852d32bfd6969068470059879ea4ae5fe 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/main.cc +++ b/test/porousmediumflow/2p2c/implicit/injection/main.cc @@ -121,11 +121,11 @@ int main(int argc, char** argv) try gridVariables->init(x); // intialize the vtk output module - using VtkOutputFields = GetPropType<TypeTag, Properties::VtkOutputFields>; + using IOFields = GetPropType<TypeTag, Properties::IOFields>; VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>; vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables)); - VtkOutputFields::initOutputModule(vtkWriter); // Add model specific output fields + IOFields::initOutputModule(vtkWriter); // Add model specific output fields vtkWriter.write(restartTime); // instantiate time loop