Commit ce0f1415 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[multidomain] Remove unused Vtk includes.

Deprecate unused function simulate from MultiDomainProblem.
(reviewed and tested by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15109 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 83e1ff29
...@@ -22,6 +22,8 @@ Differences Between DuMuX 2.7 and DuMuX 2.8 ...@@ -22,6 +22,8 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
* Deprecated CLASSES/FILES, to be removed after 2.8: * Deprecated CLASSES/FILES, to be removed after 2.8:
* Deprecated MEMBER FUNCTIONS, to be removed after 2.8: * Deprecated MEMBER FUNCTIONS, to be removed after 2.8:
- The method simulate(Scalar dtInitial, Scalar tEnd) from MultiDomainProblem,
it is unused and wil be dropped.
* Deprecated protected MEMBER VARIABLES, to be removed after 2.8: BEWARE: Older * Deprecated protected MEMBER VARIABLES, to be removed after 2.8: BEWARE: Older
compilers will not print any warning if a deprecated protected member variable compilers will not print any warning if a deprecated protected member variable
......
...@@ -24,13 +24,14 @@ ...@@ -24,13 +24,14 @@
#ifndef DUMUX_MULTIDOMAIN_PROBLEM_HH #ifndef DUMUX_MULTIDOMAIN_PROBLEM_HH
#define DUMUX_MULTIDOMAIN_PROBLEM_HH #define DUMUX_MULTIDOMAIN_PROBLEM_HH
#include <dune/common/deprecated.hh>
#include "multidomainmodel.hh" #include "multidomainmodel.hh"
#include "multidomainnewtoncontroller.hh" #include "multidomainnewtoncontroller.hh"
#include "multidomainpropertydefaults.hh" #include "multidomainpropertydefaults.hh"
#include "subdomainpropertydefaults.hh" #include "subdomainpropertydefaults.hh"
#include "multidomainassembler.hh" #include "multidomainassembler.hh"
#include <dumux/io/vtkmultiwriter.hh>
#include <dumux/io/restart.hh> #include <dumux/io/restart.hh>
...@@ -168,6 +169,7 @@ public: ...@@ -168,6 +169,7 @@ public:
* \param dtInitial Initial time step * \param dtInitial Initial time step
* \param tEnd Time, when simulation ends * \param tEnd Time, when simulation ends
*/ */
DUNE_DEPRECATED_MSG("Is deprecated and will be removed without replacement.")
bool simulate(Scalar dtInitial, Scalar tEnd) bool simulate(Scalar dtInitial, Scalar tEnd)
{ {
timeManager_.setEndTime(tEnd); timeManager_.setEndTime(tEnd);
......
...@@ -245,7 +245,7 @@ public: ...@@ -245,7 +245,7 @@ public:
~TwoCNIStokesTwoPTwoCNIProblem() ~TwoCNIStokesTwoPTwoCNIProblem()
{ {
fluxFile_.close(); fluxFile_.close();
}; }
/*! /*!
* \brief Called by the Dumux::TimeManager in order to * \brief Called by the Dumux::TimeManager in order to
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#ifndef DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH #ifndef DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
#define DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH #define DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
#include <dune/grid/io/file/vtk/common.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh> #include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH #ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
#define DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH #define DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
#include <dune/grid/io/file/vtk/common.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh> #include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh> #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#ifndef DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH #ifndef DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
#define DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH #define DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
#include <dune/grid/io/file/vtk/common.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh> #include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh> #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
......
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