diff --git a/CHANGELOG b/CHANGELOG index 79b06f7d1de1a139bd5d06b91ddad20eaa0633bf..52c4b7e8f5984f0fbb4f97fe531b9bb9ad63f858 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 2673414714899fa86ce6c052ce519d47f0df4af9..d9f6a8524ceb01fc1ef0c15b6ec2c5f473da1fa4 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 d775b6c4eb6c55ef27aaf836d5108aca900686cc..65a5d74bf6ec0ad97e0b5663222dd353ab0b68f8 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 0a2e546e7ec133cae3232af49970dc97812a39f1..ed661885aa24158d839edbba04dbcfecba1c2f90 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 daa8aaaecf03899ddd0b38debdd7db54f858601d..d0fbb1c5108994405eb26d6bb1db645e68b76342 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 9f8dcb85d1b2853abe6180c22d4556a927297c49..154d9eeeab04cbbf184df477d7b58cec01d4f1ef 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>