diff --git a/dumux/freeflow/compositional/iofields.hh b/dumux/freeflow/compositional/iofields.hh index 80b3470ebdb5affb9f33dca8cab2f6a742298822..8876aa71cc6d92eee6152f82da6571e077252cda 100644 --- a/dumux/freeflow/compositional/iofields.hh +++ b/dumux/freeflow/compositional/iofields.hh @@ -24,8 +24,6 @@ #ifndef DUMUX_FREEFLOW_NC_IO_FIELDS_HH #define DUMUX_FREEFLOW_NC_IO_FIELDS_HH -#include <dune/common/deprecated.hh> - #include <dumux/io/name.hh> #include <dumux/freeflow/navierstokes/iofields.hh> @@ -38,14 +36,6 @@ namespace Dumux { template<class BaseOutputFields, bool turbulenceModel = false> struct FreeflowNCIOFields { - //! Initialize the FreeflowNC specific output fields. - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - //! Initialize the FreeflowNC specific output fields. template <class OutputModule> static void initOutputModule(OutputModule& out) diff --git a/dumux/freeflow/navierstokes/iofields.hh b/dumux/freeflow/navierstokes/iofields.hh index d3eae2221de4c8c62eca140b0db89ee2c53a911b..176a90fee2483fd6a921dd5499f6949847cb5186 100644 --- a/dumux/freeflow/navierstokes/iofields.hh +++ b/dumux/freeflow/navierstokes/iofields.hh @@ -24,8 +24,6 @@ #ifndef DUMUX_NAVIER_STOKES_IO_FIELDS_HH #define DUMUX_NAVIER_STOKES_IO_FIELDS_HH -#include <dune/common/deprecated.hh> - #include <dumux/common/parameters.hh> #include <dumux/io/name.hh> @@ -99,13 +97,6 @@ public: additionalOutput_(out, isStaggered<OutputModule>()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - //! return the names of the primary variables template <class ModelTraits, class FluidSystem = void> static std::string primaryVariableName(int pvIdx = 0, int state = 0) diff --git a/dumux/freeflow/nonisothermal/iofields.hh b/dumux/freeflow/nonisothermal/iofields.hh index 976b908fa8c171bb6047058dda97d9e0234af597..d672f23333e186a487e650a51b034c888c25cfed 100644 --- a/dumux/freeflow/nonisothermal/iofields.hh +++ b/dumux/freeflow/nonisothermal/iofields.hh @@ -24,7 +24,6 @@ #ifndef DUMUX_FREEFLOW_NI_IO_FIELDS_HH #define DUMUX_FREEFLOW_NI_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> @@ -37,13 +36,6 @@ namespace Dumux { template<class IsothermalIOFields, bool turbulenceModel = false> struct FreeflowNonIsothermalIOFields { - //! Initialize the non-isothermal specific output fields. - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } //! Add the non-isothermal specific output fields. template <class OutputModule> diff --git a/dumux/geomechanics/poroelastic/iofields.hh b/dumux/geomechanics/poroelastic/iofields.hh index b2daf79b747b53650d995f139984cf85b1d6097b..3127c3a21f0f2c9fa40754cfd240673d41be2a3f 100644 --- a/dumux/geomechanics/poroelastic/iofields.hh +++ b/dumux/geomechanics/poroelastic/iofields.hh @@ -24,7 +24,6 @@ #ifndef DUMUX_POROELASTIC_IO_FIELDS_HH #define DUMUX_POROELASTIC_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -45,12 +44,6 @@ public: IOName::porosity()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } }; } // end namespace Dumux diff --git a/dumux/porousmediumflow/1p/iofields.hh b/dumux/porousmediumflow/1p/iofields.hh index e0516a672911bcecbaa02ffa7917f8ad68ebfb65..c511b381044d708d1733e6f2ce992ab76edf4e31 100644 --- a/dumux/porousmediumflow/1p/iofields.hh +++ b/dumux/porousmediumflow/1p/iofields.hh @@ -25,8 +25,6 @@ #ifndef DUMUX_ONEP_IO_FIELDS_HH #define DUMUX_ONEP_IO_FIELDS_HH -#include <dune/common/deprecated.hh> - #include <dumux/io/name.hh> namespace Dumux { @@ -45,13 +43,6 @@ public: IOName::pressure()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits = void, class FluidSystem = void, class SolidSystem = void> static std::string primaryVariableName(int pvIdx = 0, int state = 0) { diff --git a/dumux/porousmediumflow/1pnc/iofields.hh b/dumux/porousmediumflow/1pnc/iofields.hh index 8aed6991ceedfd0f62dade6c1ff913bd5a372bce..88a737f566106e0982e521496d2a1c6a8fb15f84 100644 --- a/dumux/porousmediumflow/1pnc/iofields.hh +++ b/dumux/porousmediumflow/1pnc/iofields.hh @@ -26,7 +26,6 @@ #define DUMUX_ONEPNC_IO_FIELDS_HH #include <string> -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -62,13 +61,6 @@ public: IOName::massFraction<FluidSystem>(0, i)); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/dumux/porousmediumflow/2p/iofields.hh b/dumux/porousmediumflow/2p/iofields.hh index 4f83c98018b1d93fa59744a8a9dcf814354c1b5d..c312803c09b1e77c7775827a8f7c0d26d5640c01 100644 --- a/dumux/porousmediumflow/2p/iofields.hh +++ b/dumux/porousmediumflow/2p/iofields.hh @@ -25,8 +25,6 @@ #ifndef DUMUX_TWOP_IO_FIELDS_HH #define DUMUX_TWOP_IO_FIELDS_HH -#include <dune/common/deprecated.hh> - #include <dumux/io/name.hh> #include "model.hh" @@ -64,13 +62,6 @@ public: IOName::porosity()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/dumux/porousmediumflow/2p1c/iofields.hh b/dumux/porousmediumflow/2p1c/iofields.hh index 8ccd981ef6c2c9166c31f2699318db19d3095d5b..c8dc637a5eba991c112e0e257e5534898d95f35b 100644 --- a/dumux/porousmediumflow/2p1c/iofields.hh +++ b/dumux/porousmediumflow/2p1c/iofields.hh @@ -48,13 +48,6 @@ public: IOName::phasePresence()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state) { diff --git a/dumux/porousmediumflow/2pnc/iofields.hh b/dumux/porousmediumflow/2pnc/iofields.hh index 1abd9a9fc3392df70e2686bb6b14f0bc1f0f7737..c64c355f399314c452fa567db669717b585aa18f 100644 --- a/dumux/porousmediumflow/2pnc/iofields.hh +++ b/dumux/porousmediumflow/2pnc/iofields.hh @@ -67,13 +67,6 @@ public: IOName::phasePresence()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state) { diff --git a/dumux/porousmediumflow/3p/iofields.hh b/dumux/porousmediumflow/3p/iofields.hh index c38c946ba3d38b33710680bce9fb6cac882376dd..aed9ee26709a2a4fe76c2e4f24fcbc1eacc4f79d 100644 --- a/dumux/porousmediumflow/3p/iofields.hh +++ b/dumux/porousmediumflow/3p/iofields.hh @@ -25,7 +25,6 @@ #ifndef DUMUX_THREEP_IO_FIELDS_HH #define DUMUX_THREEP_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -60,13 +59,6 @@ public: IOName::permeability()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/dumux/porousmediumflow/3p3c/iofields.hh b/dumux/porousmediumflow/3p3c/iofields.hh index 385e76a2c292c519d8d3c9de96ad23c83ee2242b..095bd9e5705ccaa55ee6ee4cfcea0724a75245ec 100644 --- a/dumux/porousmediumflow/3p3c/iofields.hh +++ b/dumux/porousmediumflow/3p3c/iofields.hh @@ -26,7 +26,6 @@ #define DUMUX_THREEPTHREEC_IO_FIELDS_HH #include <array> -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -67,13 +66,6 @@ public: IOName::permeability()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state) { diff --git a/dumux/porousmediumflow/3pwateroil/iofields.hh b/dumux/porousmediumflow/3pwateroil/iofields.hh index 354c2f639f1cd6147ccf0231e9df9ee3727174a8..fb96ac0108f1e782ed3c31bd24189ffbdb5f5007 100644 --- a/dumux/porousmediumflow/3pwateroil/iofields.hh +++ b/dumux/porousmediumflow/3pwateroil/iofields.hh @@ -71,13 +71,6 @@ public: IOName::permeability()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state) { diff --git a/dumux/porousmediumflow/mineralization/iofields.hh b/dumux/porousmediumflow/mineralization/iofields.hh index 4da343c0f1d7399594c6254f557d0c2f9898223f..fd5debf20826af3695f67854bcc67e33450062be 100644 --- a/dumux/porousmediumflow/mineralization/iofields.hh +++ b/dumux/porousmediumflow/mineralization/iofields.hh @@ -26,7 +26,6 @@ #ifndef DUMUX_MINERALIZATION_IO_FIELDS_HH #define DUMUX_MINERALIZATION_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -55,13 +54,6 @@ public: } } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/dumux/porousmediumflow/mpnc/iofields.hh b/dumux/porousmediumflow/mpnc/iofields.hh index 61ed44bbd538bb07431d31c0d74645d05b357108..5b9875595efe963d2c41ac2f16b1329434ee19be 100644 --- a/dumux/porousmediumflow/mpnc/iofields.hh +++ b/dumux/porousmediumflow/mpnc/iofields.hh @@ -25,7 +25,6 @@ #ifndef DUMUX_MPNC_IO_FIELDS_HH #define DUMUX_MPNC_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -67,13 +66,6 @@ public: out.addVolumeVariable([](const auto& v){ return v.porosity(); }, IOName::porosity()); } - - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } }; } // end namespace Dumux diff --git a/dumux/porousmediumflow/nonequilibrium/iofields.hh b/dumux/porousmediumflow/nonequilibrium/iofields.hh index 11491392c4790af065246950d4650a2eb93fafec..992b5239ca15e86e1a5ed4d795c6adeb1628b79d 100644 --- a/dumux/porousmediumflow/nonequilibrium/iofields.hh +++ b/dumux/porousmediumflow/nonequilibrium/iofields.hh @@ -25,7 +25,6 @@ #ifndef DUMUX_NONEQUILBRIUM_OUTPUT_FIELDS_HH #define DUMUX_NONEQUILBRIUM_OUTPUT_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -60,13 +59,6 @@ public: out.addVolumeVariable( [i](const auto& v){ return v.prandtlNumber(i); }, "prandtlNumber_" + FluidSystem::phaseName(i) ); } } - - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } }; } // end namespace Dumux diff --git a/dumux/porousmediumflow/richards/iofields.hh b/dumux/porousmediumflow/richards/iofields.hh index 0aa4ea9cde4f93c8b406c759ca4228b39fef56be..8c53b02cd554abc07197c9598b8e06e04c2074f6 100644 --- a/dumux/porousmediumflow/richards/iofields.hh +++ b/dumux/porousmediumflow/richards/iofields.hh @@ -78,13 +78,6 @@ public: IOName::phasePresence()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template<class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state) { diff --git a/dumux/porousmediumflow/richardsnc/iofields.hh b/dumux/porousmediumflow/richardsnc/iofields.hh index 90e61a22deb6cadaad66a96a847737ed5e7d75c1..ccaf20c8d0139372a56488f011fbdad37c11e248 100644 --- a/dumux/porousmediumflow/richardsnc/iofields.hh +++ b/dumux/porousmediumflow/richardsnc/iofields.hh @@ -77,13 +77,6 @@ public: } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/dumux/porousmediumflow/tracer/iofields.hh b/dumux/porousmediumflow/tracer/iofields.hh index e0b1632127e77112ffa48aba64bd8a1ab62b28d4..b4d34644d6cfe8f3fb5bcb70b4201ec132517132 100644 --- a/dumux/porousmediumflow/tracer/iofields.hh +++ b/dumux/porousmediumflow/tracer/iofields.hh @@ -27,7 +27,6 @@ #include <string> -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -56,13 +55,6 @@ public: out.addVolumeVariable( [](const auto& v){ return v.density(); }, IOName::density()); } - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } - template <class ModelTraits, class FluidSystem, class SolidSystem = void> static std::string primaryVariableName(int pvIdx, int state = 0) { diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh index 0fa97389c6d7a96e0f3964b1938f54f85442f450..f76b105f511394fb8f86da7846f5fcb2ebf6c1df 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh @@ -24,7 +24,6 @@ #ifndef DUMUX_TWOPTWOC_MPNC_IO_FIELDS_HH #define DUMUX_TWOPTWOC_MPNC_IO_FIELDS_HH -#include <dune/common/deprecated.hh> #include <dumux/io/name.hh> namespace Dumux { @@ -76,13 +75,6 @@ public: out.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); }, IOName::moleFraction<FS>(i, j)); } - - template <class OutputModule> - DUNE_DEPRECATED_MSG("use initOutputModule instead") - static void init(OutputModule& out) - { - initOutputModule(out); - } }; } // end namespace Dumux