From ce0f141523cee89d208072b76821519ff7c495d2 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 21 Jul 2015 06:08:53 +0000
Subject: [PATCH] [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
---
CHANGELOG | 2 ++
dumux/multidomain/common/multidomainproblem.hh | 4 +++-
test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh | 2 +-
.../2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh | 2 --
.../2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh | 2 --
.../multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh | 2 --
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 79b06f7d1d..52c4b7e8f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,8 @@ Differences Between DuMuX 2.7 and DuMuX 2.8
* Deprecated CLASSES/FILES, 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
compilers will not print any warning if a deprecated protected member variable
diff --git a/dumux/multidomain/common/multidomainproblem.hh b/dumux/multidomain/common/multidomainproblem.hh
index 2673414714..d9f6a8524c 100644
--- a/dumux/multidomain/common/multidomainproblem.hh
+++ b/dumux/multidomain/common/multidomainproblem.hh
@@ -24,13 +24,14 @@
#ifndef DUMUX_MULTIDOMAIN_PROBLEM_HH
#define DUMUX_MULTIDOMAIN_PROBLEM_HH
+#include <dune/common/deprecated.hh>
+
#include "multidomainmodel.hh"
#include "multidomainnewtoncontroller.hh"
#include "multidomainpropertydefaults.hh"
#include "subdomainpropertydefaults.hh"
#include "multidomainassembler.hh"
-#include <dumux/io/vtkmultiwriter.hh>
#include <dumux/io/restart.hh>
@@ -168,6 +169,7 @@ public:
* \param dtInitial Initial time step
* \param tEnd Time, when simulation ends
*/
+ DUNE_DEPRECATED_MSG("Is deprecated and will be removed without replacement.")
bool simulate(Scalar dtInitial, Scalar tEnd)
{
timeManager_.setEndTime(tEnd);
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index d775b6c4eb..65a5d74bf6 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -245,7 +245,7 @@ public:
~TwoCNIStokesTwoPTwoCNIProblem()
{
fluxFile_.close();
- };
+ }
/*!
* \brief Called by the Dumux::TimeManager in order to
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh
index 0a2e546e7e..ed661885aa 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh
@@ -27,8 +27,6 @@
#ifndef DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
#define DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
-#include <dune/grid/io/file/vtk/common.hh>
-
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
diff --git a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh
index daa8aaaecf..d0fbb1c510 100644
--- a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh
@@ -26,8 +26,6 @@
#ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
#define DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
-#include <dune/grid/io/file/vtk/common.hh>
-
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh
index 9f8dcb85d1..154d9eeeab 100644
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh
+++ b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh
@@ -27,8 +27,6 @@
#ifndef DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
#define DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
-#include <dune/grid/io/file/vtk/common.hh>
-
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
--
GitLab