Commit 943badf5 authored by Farid Mohammadi's avatar Farid Mohammadi Committed by Timo Koch

Removed deprecated IOFields::init

parent be356908
......@@ -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)
......
......@@ -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)
......
......@@ -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>
......
......@@ -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
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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
......
......@@ -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
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment