From 053dfd67fedf4e6b7ef9b36ee9a6a0cd5e8825f5 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 12 Mar 2013 03:36:19 +0000
Subject: [PATCH] [boxmodels] Remove convenience headers and the complete
folder boxmodels as it contained only deprecated headers. (reviewed by bernd)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10388 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
configure.ac | 20 +---
dumux/Makefile.am | 11 +-
dumux/boxmodels/1p/1pindices.hh | 3 -
dumux/boxmodels/1p/1plocalresidual.hh | 3 -
dumux/boxmodels/1p/1pmodel.hh | 3 -
dumux/boxmodels/1p/1pproperties.hh | 3 -
dumux/boxmodels/1p/1ppropertydefaults.hh | 3 -
dumux/boxmodels/1p/1pvolumevariables.hh | 3 -
dumux/boxmodels/1p/Makefile.am | 4 -
dumux/boxmodels/1p2c/1p2cfluxvariables.hh | 3 -
dumux/boxmodels/1p2c/1p2cindices.hh | 3 -
dumux/boxmodels/1p2c/1p2clocalresidual.hh | 3 -
dumux/boxmodels/1p2c/1p2cmodel.hh | 3 -
dumux/boxmodels/1p2c/1p2cproperties.hh | 3 -
dumux/boxmodels/1p2c/1p2cpropertydefaults.hh | 3 -
dumux/boxmodels/1p2c/1p2cvolumevariables.hh | 3 -
dumux/boxmodels/1p2c/Makefile.am | 4 -
dumux/boxmodels/2p/2pindices.hh | 3 -
dumux/boxmodels/2p/2plocalresidual.hh | 3 -
dumux/boxmodels/2p/2pmodel.hh | 3 -
dumux/boxmodels/2p/2pproperties.hh | 3 -
dumux/boxmodels/2p/2ppropertydefaults.hh | 3 -
dumux/boxmodels/2p/2pvolumevariables.hh | 3 -
dumux/boxmodels/2p/Makefile.am | 5 -
dumux/boxmodels/2p2c/2p2cfluxvariables.hh | 3 -
dumux/boxmodels/2p2c/2p2cindices.hh | 3 -
dumux/boxmodels/2p2c/2p2clocalresidual.hh | 3 -
dumux/boxmodels/2p2c/2p2cmodel.hh | 3 -
dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh | 3 -
dumux/boxmodels/2p2c/2p2cproperties.hh | 3 -
dumux/boxmodels/2p2c/2p2cpropertydefaults.hh | 3 -
dumux/boxmodels/2p2c/2p2cvolumevariables.hh | 3 -
dumux/boxmodels/2p2c/Makefile.am | 4 -
dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh | 3 -
dumux/boxmodels/2p2cni/2p2cniindices.hh | 3 -
dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh | 3 -
dumux/boxmodels/2p2cni/2p2cnimodel.hh | 3 -
dumux/boxmodels/2p2cni/2p2cniproperties.hh | 3 -
.../2p2cni/2p2cnipropertydefaults.hh | 3 -
.../boxmodels/2p2cni/2p2cnivolumevariables.hh | 3 -
dumux/boxmodels/2p2cni/Makefile.am | 4 -
dumux/boxmodels/2pdfm/2pdfmfluxvariables.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmindices.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmlocalresidual.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmmodel.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmproblem.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmproperties.hh | 3 -
.../boxmodels/2pdfm/2pdfmpropertydefaults.hh | 3 -
dumux/boxmodels/2pdfm/2pdfmvolumevariables.hh | 3 -
dumux/boxmodels/2pdfm/Makefile.am | 4 -
dumux/boxmodels/2pni/2pnifluxvariables.hh | 3 -
dumux/boxmodels/2pni/2pniindices.hh | 3 -
dumux/boxmodels/2pni/2pnilocalresidual.hh | 3 -
dumux/boxmodels/2pni/2pnimodel.hh | 3 -
dumux/boxmodels/2pni/2pniproperties.hh | 3 -
dumux/boxmodels/2pni/2pnipropertydefaults.hh | 3 -
dumux/boxmodels/2pni/2pnivolumevariables.hh | 3 -
dumux/boxmodels/2pni/Makefile.am | 4 -
dumux/boxmodels/3p3c/3p3cfluxvariables.hh | 3 -
dumux/boxmodels/3p3c/3p3cindices.hh | 3 -
dumux/boxmodels/3p3c/3p3clocalresidual.hh | 3 -
dumux/boxmodels/3p3c/3p3cmodel.hh | 3 -
dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh | 3 -
dumux/boxmodels/3p3c/3p3cproperties.hh | 3 -
dumux/boxmodels/3p3c/3p3cpropertydefaults.hh | 3 -
dumux/boxmodels/3p3c/3p3cvolumevariables.hh | 3 -
dumux/boxmodels/3p3c/Makefile.am | 4 -
dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh | 3 -
dumux/boxmodels/3p3cni/3p3cniindices.hh | 3 -
dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh | 3 -
dumux/boxmodels/3p3cni/3p3cnimodel.hh | 3 -
dumux/boxmodels/3p3cni/3p3cniproperties.hh | 3 -
.../3p3cni/3p3cnipropertydefaults.hh | 3 -
.../boxmodels/3p3cni/3p3cnivolumevariables.hh | 3 -
dumux/boxmodels/3p3cni/Makefile.am | 4 -
dumux/boxmodels/Makefile.am | 5 -
dumux/boxmodels/co2/Makefile.am | 4 -
dumux/boxmodels/co2/co2model.hh | 3 -
dumux/boxmodels/co2/co2volumevariables.hh | 3 -
dumux/boxmodels/co2ni/Makefile.am | 4 -
dumux/boxmodels/co2ni/co2nimodel.hh | 3 -
dumux/boxmodels/co2ni/co2nivolumevariables.hh | 3 -
dumux/boxmodels/common/Makefile.am | 4 -
.../boxmodels/common/boxdarcyfluxvariables.hh | 78 --------------
.../common/boxforchheimerfluxvariables.hh | 101 ------------------
dumux/boxmodels/common/boxlocaljacobian.hh | 77 -------------
dumux/boxmodels/common/boxmodel.hh | 56 ----------
dumux/boxmodels/common/boxproblem.hh | 65 -----------
dumux/boxmodels/common/boxvolumevariables.hh | 57 ----------
.../boxmodels/common/porousmediaboxproblem.hh | 59 ----------
dumux/boxmodels/mpnc/Makefile.am | 6 --
dumux/boxmodels/mpnc/diffusion/Makefile.am | 4 -
dumux/boxmodels/mpnc/diffusion/diffusion.hh | 3 -
.../boxmodels/mpnc/diffusion/fluxvariables.hh | 3 -
.../mpnc/diffusion/volumevariables.hh | 3 -
dumux/boxmodels/mpnc/energy/Makefile.am | 4 -
.../mpnc/energy/mpncfluxvariablesenergy.hh | 3 -
.../mpnc/energy/mpncindicesenergy.hh | 3 -
.../mpnc/energy/mpnclocalresidualenergy.hh | 3 -
.../mpnc/energy/mpncvolumevariablesenergy.hh | 3 -
.../mpnc/energy/mpncvtkwriterenergy.hh | 3 -
dumux/boxmodels/mpnc/mass/Makefile.am | 4 -
dumux/boxmodels/mpnc/mass/mpncindicesmass.hh | 3 -
.../mpnc/mass/mpnclocalresidualmass.hh | 3 -
.../mpnc/mass/mpncvolumevariablesmass.hh | 3 -
.../boxmodels/mpnc/mass/mpncvtkwritermass.hh | 3 -
dumux/boxmodels/mpnc/mpncfluxvariables.hh | 3 -
dumux/boxmodels/mpnc/mpncindices.hh | 3 -
dumux/boxmodels/mpnc/mpnclocalresidual.hh | 3 -
dumux/boxmodels/mpnc/mpncmodel.hh | 3 -
dumux/boxmodels/mpnc/mpncnewtoncontroller.hh | 3 -
dumux/boxmodels/mpnc/mpncproperties.hh | 3 -
dumux/boxmodels/mpnc/mpncpropertydefaults.hh | 3 -
dumux/boxmodels/mpnc/mpncvolumevariables.hh | 3 -
dumux/boxmodels/mpnc/mpncvolumevariablesia.hh | 3 -
dumux/boxmodels/mpnc/mpncvtkwriter.hh | 3 -
dumux/boxmodels/mpnc/mpncvtkwritercommon.hh | 3 -
dumux/boxmodels/mpnc/mpncvtkwritermodule.hh | 3 -
dumux/boxmodels/richards/Makefile.am | 4 -
dumux/boxmodels/richards/richardsindices.hh | 3 -
.../richards/richardslocalresidual.hh | 3 -
dumux/boxmodels/richards/richardsmodel.hh | 3 -
.../richards/richardsnewtoncontroller.hh | 3 -
dumux/boxmodels/richards/richardsproblem.hh | 3 -
.../boxmodels/richards/richardsproperties.hh | 3 -
.../richards/richardspropertydefaults.hh | 3 -
.../richards/richardsvolumevariables.hh | 3 -
127 files changed, 11 insertions(+), 889 deletions(-)
delete mode 100644 dumux/boxmodels/1p/1pindices.hh
delete mode 100644 dumux/boxmodels/1p/1plocalresidual.hh
delete mode 100644 dumux/boxmodels/1p/1pmodel.hh
delete mode 100644 dumux/boxmodels/1p/1pproperties.hh
delete mode 100644 dumux/boxmodels/1p/1ppropertydefaults.hh
delete mode 100644 dumux/boxmodels/1p/1pvolumevariables.hh
delete mode 100644 dumux/boxmodels/1p/Makefile.am
delete mode 100644 dumux/boxmodels/1p2c/1p2cfluxvariables.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2cindices.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2clocalresidual.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2cmodel.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2cproperties.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
delete mode 100644 dumux/boxmodels/1p2c/1p2cvolumevariables.hh
delete mode 100644 dumux/boxmodels/1p2c/Makefile.am
delete mode 100644 dumux/boxmodels/2p/2pindices.hh
delete mode 100644 dumux/boxmodels/2p/2plocalresidual.hh
delete mode 100644 dumux/boxmodels/2p/2pmodel.hh
delete mode 100644 dumux/boxmodels/2p/2pproperties.hh
delete mode 100644 dumux/boxmodels/2p/2ppropertydefaults.hh
delete mode 100644 dumux/boxmodels/2p/2pvolumevariables.hh
delete mode 100644 dumux/boxmodels/2p/Makefile.am
delete mode 100644 dumux/boxmodels/2p2c/2p2cfluxvariables.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cindices.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2clocalresidual.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cmodel.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cproperties.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
delete mode 100644 dumux/boxmodels/2p2c/2p2cvolumevariables.hh
delete mode 100644 dumux/boxmodels/2p2c/Makefile.am
delete mode 100644 dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cniindices.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cnimodel.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cniproperties.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
delete mode 100644 dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
delete mode 100644 dumux/boxmodels/2p2cni/Makefile.am
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmfluxvariables.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmindices.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmlocalresidual.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmmodel.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmproblem.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmproperties.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmpropertydefaults.hh
delete mode 100644 dumux/boxmodels/2pdfm/2pdfmvolumevariables.hh
delete mode 100644 dumux/boxmodels/2pdfm/Makefile.am
delete mode 100644 dumux/boxmodels/2pni/2pnifluxvariables.hh
delete mode 100644 dumux/boxmodels/2pni/2pniindices.hh
delete mode 100644 dumux/boxmodels/2pni/2pnilocalresidual.hh
delete mode 100644 dumux/boxmodels/2pni/2pnimodel.hh
delete mode 100644 dumux/boxmodels/2pni/2pniproperties.hh
delete mode 100644 dumux/boxmodels/2pni/2pnipropertydefaults.hh
delete mode 100644 dumux/boxmodels/2pni/2pnivolumevariables.hh
delete mode 100644 dumux/boxmodels/2pni/Makefile.am
delete mode 100644 dumux/boxmodels/3p3c/3p3cfluxvariables.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cindices.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3clocalresidual.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cmodel.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cproperties.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
delete mode 100644 dumux/boxmodels/3p3c/3p3cvolumevariables.hh
delete mode 100644 dumux/boxmodels/3p3c/Makefile.am
delete mode 100644 dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cniindices.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cnimodel.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cniproperties.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
delete mode 100644 dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
delete mode 100644 dumux/boxmodels/3p3cni/Makefile.am
delete mode 100644 dumux/boxmodels/Makefile.am
delete mode 100644 dumux/boxmodels/co2/Makefile.am
delete mode 100644 dumux/boxmodels/co2/co2model.hh
delete mode 100644 dumux/boxmodels/co2/co2volumevariables.hh
delete mode 100644 dumux/boxmodels/co2ni/Makefile.am
delete mode 100644 dumux/boxmodels/co2ni/co2nimodel.hh
delete mode 100644 dumux/boxmodels/co2ni/co2nivolumevariables.hh
delete mode 100644 dumux/boxmodels/common/Makefile.am
delete mode 100644 dumux/boxmodels/common/boxdarcyfluxvariables.hh
delete mode 100644 dumux/boxmodels/common/boxforchheimerfluxvariables.hh
delete mode 100644 dumux/boxmodels/common/boxlocaljacobian.hh
delete mode 100644 dumux/boxmodels/common/boxmodel.hh
delete mode 100644 dumux/boxmodels/common/boxproblem.hh
delete mode 100644 dumux/boxmodels/common/boxvolumevariables.hh
delete mode 100644 dumux/boxmodels/common/porousmediaboxproblem.hh
delete mode 100644 dumux/boxmodels/mpnc/Makefile.am
delete mode 100644 dumux/boxmodels/mpnc/diffusion/Makefile.am
delete mode 100644 dumux/boxmodels/mpnc/diffusion/diffusion.hh
delete mode 100644 dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
delete mode 100644 dumux/boxmodels/mpnc/diffusion/volumevariables.hh
delete mode 100644 dumux/boxmodels/mpnc/energy/Makefile.am
delete mode 100644 dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
delete mode 100644 dumux/boxmodels/mpnc/energy/mpncindicesenergy.hh
delete mode 100644 dumux/boxmodels/mpnc/energy/mpnclocalresidualenergy.hh
delete mode 100644 dumux/boxmodels/mpnc/energy/mpncvolumevariablesenergy.hh
delete mode 100644 dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
delete mode 100644 dumux/boxmodels/mpnc/mass/Makefile.am
delete mode 100644 dumux/boxmodels/mpnc/mass/mpncindicesmass.hh
delete mode 100644 dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
delete mode 100644 dumux/boxmodels/mpnc/mass/mpncvolumevariablesmass.hh
delete mode 100644 dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncfluxvariables.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncindices.hh
delete mode 100644 dumux/boxmodels/mpnc/mpnclocalresidual.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncmodel.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncproperties.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncpropertydefaults.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncvolumevariables.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncvolumevariablesia.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncvtkwriter.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
delete mode 100644 dumux/boxmodels/mpnc/mpncvtkwritermodule.hh
delete mode 100644 dumux/boxmodels/richards/Makefile.am
delete mode 100644 dumux/boxmodels/richards/richardsindices.hh
delete mode 100644 dumux/boxmodels/richards/richardslocalresidual.hh
delete mode 100644 dumux/boxmodels/richards/richardsmodel.hh
delete mode 100644 dumux/boxmodels/richards/richardsnewtoncontroller.hh
delete mode 100644 dumux/boxmodels/richards/richardsproblem.hh
delete mode 100644 dumux/boxmodels/richards/richardsproperties.hh
delete mode 100644 dumux/boxmodels/richards/richardspropertydefaults.hh
delete mode 100644 dumux/boxmodels/richards/richardsvolumevariables.hh
diff --git a/configure.ac b/configure.ac
index 5d6ff27f0e..06e5fac02d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,25 +13,7 @@ AC_CONFIG_FILES([dumux.pc
doc/doxygen/Makefile
doc/doxygen/Doxyfile
doc/handbook/Makefile
- dumux/Makefile
- dumux/boxmodels/Makefile
- dumux/boxmodels/1p/Makefile
- dumux/boxmodels/1p2c/Makefile
- dumux/boxmodels/2p/Makefile
- dumux/boxmodels/2p2c/Makefile
- dumux/boxmodels/2p2cni/Makefile
- dumux/boxmodels/2pni/Makefile
- dumux/boxmodels/2pdfm/Makefile
- dumux/boxmodels/3p3c/Makefile
- dumux/boxmodels/3p3cni/Makefile
- dumux/boxmodels/common/Makefile
- dumux/boxmodels/co2/Makefile
- dumux/boxmodels/co2ni/Makefile
- dumux/boxmodels/mpnc/Makefile
- dumux/boxmodels/mpnc/diffusion/Makefile
- dumux/boxmodels/mpnc/energy/Makefile
- dumux/boxmodels/mpnc/mass/Makefile
- dumux/boxmodels/richards/Makefile
+ dumux/Makefile
dumux/common/Makefile
dumux/decoupled/Makefile
dumux/decoupled/1p/Makefile
diff --git a/dumux/Makefile.am b/dumux/Makefile.am
index f5093738d6..f2ce8bac46 100644
--- a/dumux/Makefile.am
+++ b/dumux/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS = boxmodels common decoupled freeflow implicit io linear material nonlinear parallel
+SUBDIRS = \
+ common \
+ decoupled \
+ freeflow \
+ implicit \
+ io \
+ linear \
+ material \
+ nonlinear \
+ parallel
dumuxdir = $(includedir)/dumux
diff --git a/dumux/boxmodels/1p/1pindices.hh b/dumux/boxmodels/1p/1pindices.hh
deleted file mode 100644
index 1e77e5c0f6..0000000000
--- a/dumux/boxmodels/1p/1pindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1pindices.hh instead.
-
-#include <dumux/implicit/1p/1pindices.hh>
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
deleted file mode 100644
index 3d67251f34..0000000000
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1plocalresidual.hh instead.
-
-#include <dumux/implicit/1p/1plocalresidual.hh>
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
deleted file mode 100644
index 7789e1723a..0000000000
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1pmodel.hh instead.
-
-#include <dumux/implicit/1p/1pmodel.hh>
diff --git a/dumux/boxmodels/1p/1pproperties.hh b/dumux/boxmodels/1p/1pproperties.hh
deleted file mode 100644
index 199501ceda..0000000000
--- a/dumux/boxmodels/1p/1pproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1pproperties.hh instead.
-
-#include <dumux/implicit/1p/1pproperties.hh>
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
deleted file mode 100644
index 11d855fb5f..0000000000
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1ppropertydefaults.hh instead.
-
-#include <dumux/implicit/1p/1ppropertydefaults.hh>
diff --git a/dumux/boxmodels/1p/1pvolumevariables.hh b/dumux/boxmodels/1p/1pvolumevariables.hh
deleted file mode 100644
index 72921b9f85..0000000000
--- a/dumux/boxmodels/1p/1pvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p/1pvolumevariables.hh instead.
-
-#include <dumux/implicit/1p/1pvolumevariables.hh>
diff --git a/dumux/boxmodels/1p/Makefile.am b/dumux/boxmodels/1p/Makefile.am
deleted file mode 100644
index 2dca3ed04d..0000000000
--- a/dumux/boxmodels/1p/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-1pdir = $(includedir)/dumux/boxmodels/1p
-1p_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
deleted file mode 100644
index f2bc12ec31..0000000000
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cfluxvariables.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cfluxvariables.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cindices.hh b/dumux/boxmodels/1p2c/1p2cindices.hh
deleted file mode 100644
index d380cea9ff..0000000000
--- a/dumux/boxmodels/1p2c/1p2cindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cindices.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cindices.hh>
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
deleted file mode 100644
index 4976a836bc..0000000000
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2clocalresidual.hh instead.
-
-#include <dumux/implicit/1p2c/1p2clocalresidual.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
deleted file mode 100644
index f11ef929fb..0000000000
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cmodel.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cmodel.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cproperties.hh b/dumux/boxmodels/1p2c/1p2cproperties.hh
deleted file mode 100644
index 1cb49916cf..0000000000
--- a/dumux/boxmodels/1p2c/1p2cproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cproperties.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cproperties.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
deleted file mode 100644
index 6926aa995f..0000000000
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cpropertydefaults.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cpropertydefaults.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
deleted file mode 100644
index 377fb44810..0000000000
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/1p2c/1p2cvolumevariables.hh instead.
-
-#include <dumux/implicit/1p2c/1p2cvolumevariables.hh>
diff --git a/dumux/boxmodels/1p2c/Makefile.am b/dumux/boxmodels/1p2c/Makefile.am
deleted file mode 100644
index 8a96579124..0000000000
--- a/dumux/boxmodels/1p2c/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-1p2cdir = $(includedir)/dumux/boxmodels/1p2c
-1p2c_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/2p/2pindices.hh b/dumux/boxmodels/2p/2pindices.hh
deleted file mode 100644
index b74414a46e..0000000000
--- a/dumux/boxmodels/2p/2pindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2pindices.hh instead.
-
-#include <dumux/implicit/2p/2pindices.hh>
diff --git a/dumux/boxmodels/2p/2plocalresidual.hh b/dumux/boxmodels/2p/2plocalresidual.hh
deleted file mode 100644
index 62290c56de..0000000000
--- a/dumux/boxmodels/2p/2plocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2plocalresidual.hh instead.
-
-#include <dumux/implicit/2p/2plocalresidual.hh>
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
deleted file mode 100644
index 817b276155..0000000000
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2pmodel.hh instead.
-
-#include <dumux/implicit/2p/2pmodel.hh>
diff --git a/dumux/boxmodels/2p/2pproperties.hh b/dumux/boxmodels/2p/2pproperties.hh
deleted file mode 100644
index 6221b178cb..0000000000
--- a/dumux/boxmodels/2p/2pproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2pproperties.hh instead.
-
-#include <dumux/implicit/2p/2pproperties.hh>
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
deleted file mode 100644
index 07738b3e7f..0000000000
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2ppropertydefaults.hh instead.
-
-#include <dumux/implicit/2p/2ppropertydefaults.hh>
diff --git a/dumux/boxmodels/2p/2pvolumevariables.hh b/dumux/boxmodels/2p/2pvolumevariables.hh
deleted file mode 100644
index 4bb3d42d0e..0000000000
--- a/dumux/boxmodels/2p/2pvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p/2pvolumevariables.hh instead.
-
-#include <dumux/implicit/2p/2pvolumevariables.hh>
diff --git a/dumux/boxmodels/2p/Makefile.am b/dumux/boxmodels/2p/Makefile.am
deleted file mode 100644
index 27994b7a07..0000000000
--- a/dumux/boxmodels/2p/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-2pdir = $(includedir)/dumux/boxmodels/2p
-2p_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
-
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
deleted file mode 100644
index 59a2b85300..0000000000
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cfluxvariables.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cfluxvariables.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
deleted file mode 100644
index 4d552c52b9..0000000000
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cindices.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cindices.hh>
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
deleted file mode 100644
index 4ba462a3d9..0000000000
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2clocalresidual.hh instead.
-
-#include <dumux/implicit/2p2c/2p2clocalresidual.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
deleted file mode 100644
index d4a14aaa67..0000000000
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cmodel.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cmodel.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
deleted file mode 100644
index d432f72a46..0000000000
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cnewtoncontroller.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cnewtoncontroller.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cproperties.hh b/dumux/boxmodels/2p2c/2p2cproperties.hh
deleted file mode 100644
index e220a2e971..0000000000
--- a/dumux/boxmodels/2p2c/2p2cproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cproperties.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cproperties.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
deleted file mode 100644
index 79d76668ea..0000000000
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cpropertydefaults.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cpropertydefaults.hh>
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
deleted file mode 100644
index e8b66cb1bb..0000000000
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2c/2p2cvolumevariables.hh instead.
-
-#include <dumux/implicit/2p2c/2p2cvolumevariables.hh>
diff --git a/dumux/boxmodels/2p2c/Makefile.am b/dumux/boxmodels/2p2c/Makefile.am
deleted file mode 100644
index f15c521752..0000000000
--- a/dumux/boxmodels/2p2c/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-2p2cdir = $(includedir)/dumux/boxmodels/2p2c
-2p2c_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
deleted file mode 100644
index c0857615e6..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cnifluxvariables.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cnifluxvariables.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cniindices.hh b/dumux/boxmodels/2p2cni/2p2cniindices.hh
deleted file mode 100644
index 9d204053be..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cniindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cniindices.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cniindices.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
deleted file mode 100644
index e214b9b5f4..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cnilocalresidual.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cnilocalresidual.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cnimodel.hh b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
deleted file mode 100644
index 38c9b72e68..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cnimodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cnimodel.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cnimodel.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cniproperties.hh b/dumux/boxmodels/2p2cni/2p2cniproperties.hh
deleted file mode 100644
index 188d9a2f58..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cniproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cniproperties.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cniproperties.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
deleted file mode 100644
index 119ecfe604..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cnipropertydefaults.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cnipropertydefaults.hh>
diff --git a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
deleted file mode 100644
index 0264914f88..0000000000
--- a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2p2cni/2p2cnivolumevariables.hh instead.
-
-#include <dumux/implicit/2p2cni/2p2cnivolumevariables.hh>
diff --git a/dumux/boxmodels/2p2cni/Makefile.am b/dumux/boxmodels/2p2cni/Makefile.am
deleted file mode 100644
index 79135402f3..0000000000
--- a/dumux/boxmodels/2p2cni/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-2p2cnidir = $(includedir)/dumux/boxmodels/2p2cni
-2p2cni_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/2pdfm/2pdfmfluxvariables.hh b/dumux/boxmodels/2pdfm/2pdfmfluxvariables.hh
deleted file mode 100644
index 87f8315089..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmfluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmfluxvariables.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmfluxvariables.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmindices.hh b/dumux/boxmodels/2pdfm/2pdfmindices.hh
deleted file mode 100644
index c0af545212..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmindices.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmindices.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmlocalresidual.hh b/dumux/boxmodels/2pdfm/2pdfmlocalresidual.hh
deleted file mode 100644
index 1bf4d53649..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmlocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmlocalresidual.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmlocalresidual.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmmodel.hh b/dumux/boxmodels/2pdfm/2pdfmmodel.hh
deleted file mode 100644
index 85973c3e85..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmmodel.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmmodel.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmproblem.hh b/dumux/boxmodels/2pdfm/2pdfmproblem.hh
deleted file mode 100644
index 55ec33b4c7..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmproblem.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmproblem.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmproblem.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmproperties.hh b/dumux/boxmodels/2pdfm/2pdfmproperties.hh
deleted file mode 100644
index 277d6411cd..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmproperties.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmproperties.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmpropertydefaults.hh b/dumux/boxmodels/2pdfm/2pdfmpropertydefaults.hh
deleted file mode 100644
index 609ae77881..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmpropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmpropertydefaults.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmpropertydefaults.hh>
diff --git a/dumux/boxmodels/2pdfm/2pdfmvolumevariables.hh b/dumux/boxmodels/2pdfm/2pdfmvolumevariables.hh
deleted file mode 100644
index 0967498503..0000000000
--- a/dumux/boxmodels/2pdfm/2pdfmvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pdfm/2pdfmvolumevariables.hh instead.
-
-#include <dumux/implicit/2pdfm/2pdfmvolumevariables.hh>
diff --git a/dumux/boxmodels/2pdfm/Makefile.am b/dumux/boxmodels/2pdfm/Makefile.am
deleted file mode 100644
index 117f16d6c2..0000000000
--- a/dumux/boxmodels/2pdfm/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-2pdfmdir = $(includedir)/dumux/boxmodels/2pdfm
-2pdfm_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
deleted file mode 100644
index fe60e69e55..0000000000
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pnifluxvariables.hh instead.
-
-#include <dumux/implicit/2pni/2pnifluxvariables.hh>
diff --git a/dumux/boxmodels/2pni/2pniindices.hh b/dumux/boxmodels/2pni/2pniindices.hh
deleted file mode 100644
index 0bf09c0904..0000000000
--- a/dumux/boxmodels/2pni/2pniindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pniindices.hh instead.
-
-#include <dumux/implicit/2pni/2pniindices.hh>
diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh
deleted file mode 100644
index f675534b0b..0000000000
--- a/dumux/boxmodels/2pni/2pnilocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pnilocalresidual.hh instead.
-
-#include <dumux/implicit/2pni/2pnilocalresidual.hh>
diff --git a/dumux/boxmodels/2pni/2pnimodel.hh b/dumux/boxmodels/2pni/2pnimodel.hh
deleted file mode 100644
index 33f26c05de..0000000000
--- a/dumux/boxmodels/2pni/2pnimodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pnimodel.hh instead.
-
-#include <dumux/implicit/2pni/2pnimodel.hh>
diff --git a/dumux/boxmodels/2pni/2pniproperties.hh b/dumux/boxmodels/2pni/2pniproperties.hh
deleted file mode 100644
index f647a9ad4b..0000000000
--- a/dumux/boxmodels/2pni/2pniproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pniproperties.hh instead.
-
-#include <dumux/implicit/2pni/2pniproperties.hh>
diff --git a/dumux/boxmodels/2pni/2pnipropertydefaults.hh b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
deleted file mode 100644
index bf13b70f50..0000000000
--- a/dumux/boxmodels/2pni/2pnipropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pnipropertydefaults.hh instead.
-
-#include <dumux/implicit/2pni/2pnipropertydefaults.hh>
diff --git a/dumux/boxmodels/2pni/2pnivolumevariables.hh b/dumux/boxmodels/2pni/2pnivolumevariables.hh
deleted file mode 100644
index aff5be90bb..0000000000
--- a/dumux/boxmodels/2pni/2pnivolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/2pni/2pnivolumevariables.hh instead.
-
-#include <dumux/implicit/2pni/2pnivolumevariables.hh>
diff --git a/dumux/boxmodels/2pni/Makefile.am b/dumux/boxmodels/2pni/Makefile.am
deleted file mode 100644
index 5e4f338ee1..0000000000
--- a/dumux/boxmodels/2pni/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-2pnidir = $(includedir)/dumux/boxmodels/2pni
-2pni_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
deleted file mode 100644
index 86d5929b66..0000000000
--- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cfluxvariables.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cfluxvariables.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cindices.hh b/dumux/boxmodels/3p3c/3p3cindices.hh
deleted file mode 100644
index e0c8e76c20..0000000000
--- a/dumux/boxmodels/3p3c/3p3cindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cindices.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cindices.hh>
diff --git a/dumux/boxmodels/3p3c/3p3clocalresidual.hh b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
deleted file mode 100644
index de91429f2b..0000000000
--- a/dumux/boxmodels/3p3c/3p3clocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3clocalresidual.hh instead.
-
-#include <dumux/implicit/3p3c/3p3clocalresidual.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
deleted file mode 100644
index 83dc5615ab..0000000000
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cmodel.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cmodel.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh b/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
deleted file mode 100644
index a4cc0227c4..0000000000
--- a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cnewtoncontroller.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cnewtoncontroller.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cproperties.hh b/dumux/boxmodels/3p3c/3p3cproperties.hh
deleted file mode 100644
index 41c8ce24f1..0000000000
--- a/dumux/boxmodels/3p3c/3p3cproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cproperties.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cproperties.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
deleted file mode 100644
index c51c601067..0000000000
--- a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cpropertydefaults.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cpropertydefaults.hh>
diff --git a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh b/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
deleted file mode 100644
index 1e0adf216d..0000000000
--- a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3c/3p3cvolumevariables.hh instead.
-
-#include <dumux/implicit/3p3c/3p3cvolumevariables.hh>
diff --git a/dumux/boxmodels/3p3c/Makefile.am b/dumux/boxmodels/3p3c/Makefile.am
deleted file mode 100644
index 561eac1db7..0000000000
--- a/dumux/boxmodels/3p3c/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-3p3cdir = $(includedir)/dumux/boxmodels/3p3c
-3p3c_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh b/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
deleted file mode 100644
index 00bd8ea391..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cnifluxvariables.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cnifluxvariables.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cniindices.hh b/dumux/boxmodels/3p3cni/3p3cniindices.hh
deleted file mode 100644
index 8b1d4d0e70..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cniindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cniindices.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cniindices.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
deleted file mode 100644
index 87b3f37492..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cnilocalresidual.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cnilocalresidual.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cnimodel.hh b/dumux/boxmodels/3p3cni/3p3cnimodel.hh
deleted file mode 100644
index 483d985a13..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cnimodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cnimodel.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cnimodel.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cniproperties.hh b/dumux/boxmodels/3p3cni/3p3cniproperties.hh
deleted file mode 100644
index be3d0ab1a8..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cniproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cniproperties.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cniproperties.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
deleted file mode 100644
index 976567084f..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cnipropertydefaults.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cnipropertydefaults.hh>
diff --git a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh b/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
deleted file mode 100644
index fb0c603660..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/3p3cni/3p3cnivolumevariables.hh instead.
-
-#include <dumux/implicit/3p3cni/3p3cnivolumevariables.hh>
diff --git a/dumux/boxmodels/3p3cni/Makefile.am b/dumux/boxmodels/3p3cni/Makefile.am
deleted file mode 100644
index 9045919660..0000000000
--- a/dumux/boxmodels/3p3cni/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-3p3cnidir = $(includedir)/dumux/boxmodels/3p3cni
-3p3cni_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/Makefile.am b/dumux/boxmodels/Makefile.am
deleted file mode 100644
index 0c3d2aaeab..0000000000
--- a/dumux/boxmodels/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = common co2 co2ni 1p 1p2c 2p 2p2c 2p2cni 2pni 2pdfm 3p3c 3p3cni mpnc richards
-
-boxmodelsdir = $(includedir)/dumux/boxmodels
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/co2/Makefile.am b/dumux/boxmodels/co2/Makefile.am
deleted file mode 100644
index 52b76eb57e..0000000000
--- a/dumux/boxmodels/co2/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-co2dir = $(includedir)/dumux/boxmodels/co2
-co2_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/co2/co2model.hh b/dumux/boxmodels/co2/co2model.hh
deleted file mode 100644
index 8757ae3500..0000000000
--- a/dumux/boxmodels/co2/co2model.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/co2/co2model.hh instead.
-
-#include <dumux/implicit/co2/co2model.hh>
diff --git a/dumux/boxmodels/co2/co2volumevariables.hh b/dumux/boxmodels/co2/co2volumevariables.hh
deleted file mode 100644
index c824b52610..0000000000
--- a/dumux/boxmodels/co2/co2volumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/co2/co2volumevariables.hh instead.
-
-#include <dumux/implicit/co2/co2volumevariables.hh>
diff --git a/dumux/boxmodels/co2ni/Makefile.am b/dumux/boxmodels/co2ni/Makefile.am
deleted file mode 100644
index e1f4e38102..0000000000
--- a/dumux/boxmodels/co2ni/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-co2nidir = $(includedir)/dumux/boxmodels/co2ni
-co2ni_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/co2ni/co2nimodel.hh b/dumux/boxmodels/co2ni/co2nimodel.hh
deleted file mode 100644
index 56e5758e51..0000000000
--- a/dumux/boxmodels/co2ni/co2nimodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/co2ni/co2nimodel.hh instead.
-
-#include <dumux/implicit/co2ni/co2nimodel.hh>
diff --git a/dumux/boxmodels/co2ni/co2nivolumevariables.hh b/dumux/boxmodels/co2ni/co2nivolumevariables.hh
deleted file mode 100644
index 69b7bcfdd4..0000000000
--- a/dumux/boxmodels/co2ni/co2nivolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/co2ni/co2nivolumevariables.hh instead.
-
-#include <dumux/implicit/co2ni/co2nivolumevariables.hh>
diff --git a/dumux/boxmodels/common/Makefile.am b/dumux/boxmodels/common/Makefile.am
deleted file mode 100644
index 2fd0a582d6..0000000000
--- a/dumux/boxmodels/common/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-commondir = $(includedir)/dumux/boxmodels/common
-common_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/common/boxdarcyfluxvariables.hh b/dumux/boxmodels/common/boxdarcyfluxvariables.hh
deleted file mode 100644
index c770729367..0000000000
--- a/dumux/boxmodels/common/boxdarcyfluxvariables.hh
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains the data which is required to calculate
- * all fluxes of fluid phases over a face of a finite volume.
- *
- * This means pressure and temperature gradients, phase densities at
- * the integration point, etc.
- */
-#ifndef DUMUX_BOX_DARCY_FLUX_VARIABLES_HH
-#define DUMUX_BOX_DARCY_FLUX_VARIABLES_HH
-
-#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup BoxModel
- * \ingroup BoxFluxVariables
- * \brief Evaluates the normal component of the Darcy velocity
- * on a (sub)control volume face.
- */
-template <class TypeTag>
-class BoxDarcyFluxVariables : public ImplicitDarcyFluxVariables<TypeTag>
-{
- typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
-public:
- /*
- * \brief The constructor
- *
- * \param problem The problem
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry in the box scheme
- * \param faceIdx The local index of the SCV (sub-control-volume) face
- * \param elemVolVars The volume variables of the current element
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- DUNE_DEPRECATED_MSG("Use ImplicitDarcyFluxVariables from "
- "dumux/implicit/common/implicitdarcyfluxvariables.hh.")
- BoxDarcyFluxVariables(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const int faceIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
- : ParentType(problem, element, fvGeometry, faceIdx, elemVolVars, onBoundary)
- {}
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/boxmodels/common/boxforchheimerfluxvariables.hh b/dumux/boxmodels/common/boxforchheimerfluxvariables.hh
deleted file mode 100644
index 422f53b933..0000000000
--- a/dumux/boxmodels/common/boxforchheimerfluxvariables.hh
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains the data which is required to calculate
- * all fluxes of fluid phases over a face of a finite volume,
- * according to the Forchheimer-relation between velocity and pressure.
- *
- */
-#ifndef DUMUX_BOX_FORCHHEIMER_FLUX_VARIABLES_HH
-#define DUMUX_BOX_FORCHHEIMER_FLUX_VARIABLES_HH
-
-#include <dumux/implicit/common/implicitforchheimerfluxvariables.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup BoxModel
- * \ingroup BoxFluxVariables
- * \brief Evaluates the normal component of the Forchheimer velocity
- * on a (sub)control volume face.
- *
- * The commonly used Darcy relation looses it's validity for \f$ Re < 1\f$.
- * If one encounters flow velocities in porous media above this Reynolds number,
- * the Forchheimer relation can be used. Like the Darcy relation, it relates
- * the gradient in potential to velocity.
- * However, this relation is not linear (as in the Darcy case) any more.
- *
- * Therefore, a Newton scheme is implemented in this class in order to calculate a
- * velocity from the current set of variables. This velocity can subsequently be used
- * e.g. by the localresidual.
- *
- * For Reynolds numbers above \f$ 500\f$ the (Standard) forchheimer relation also
- * looses it's validity.
- *
- * The Forchheimer equation looks as follows:
- * \f[ \nabla \left({p_\alpha + \rho_\alpha g z} \right)= - \frac{\mu_\alpha}{k_{r \alpha} K} \underline{v_\alpha} - \frac{c_F}{\eta_{\alpha r} \sqrt{K}} \rho_\alpha |\underline{v_\alpha}| \underline{v_\alpha} \f]
- *
- * For the formulation that is actually used in this class, see the documentation of the function calculating the residual.
- *
- * - This algorithm does not find a solution if the fluid is incompressible and the
- * initial pressure distribution is uniform.
- * - This algorithm assumes the relative passabilities to have the same functional
- * form as the relative permeabilities.
- */
-template <class TypeTag>
-class BoxForchheimerFluxVariables
- : public ImplicitForchheimerFluxVariables<TypeTag>
-{
- typedef ImplicitForchheimerFluxVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param problem The problem
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry in the box scheme
- * \param faceIdx The local index of the SCV (sub-control-volume) face
- * \param elemVolVars The volume variables of the current element
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- DUNE_DEPRECATED_MSG("Use ImplicitForchheimerFluxVariables from "
- "dumux/implicit/common/implicitforchheimerfluxvariables.hh.")
- BoxForchheimerFluxVariables(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const unsigned int faceIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
- : ParentType(problem, element, fvGeometry, faceIdx, elemVolVars, onBoundary)
- {}
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
deleted file mode 100644
index ae1da06f02..0000000000
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Caculates the Jacobian of the local residual for box models
- */
-#ifndef DUMUX_BOX_LOCAL_JACOBIAN_HH
-#define DUMUX_BOX_LOCAL_JACOBIAN_HH
-
-#include <dumux/implicit/common/implicitlocaljacobian.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup BoxModel
- * \ingroup BoxLocalJacobian
- * \brief Calculates the Jacobian of the local residual for box models
- *
- * The default behavior is to use numeric differentiation, i.e.
- * forward or backward differences (2nd order), or central
- * differences (3rd order). The method used is determined by the
- * "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- */
-template<class TypeTag>
-class BoxLocalJacobian : public ImplicitLocalJacobian<TypeTag>
-{
- typedef ImplicitLocalJacobian<TypeTag> ParentType;
-
- // copying a local jacobian is not a good idea
- BoxLocalJacobian(const BoxLocalJacobian &);
-
-public:
- DUNE_DEPRECATED_MSG("Use ImplicitLocalJacobian from dumux/implicit/common/implicitlocaljacobian.hh.")
- BoxLocalJacobian() : ParentType()
- { }
-};
-}
-
-#endif
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
deleted file mode 100644
index 5beaf2c43f..0000000000
--- a/dumux/boxmodels/common/boxmodel.hh
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for models using box discretization
- */
-#ifndef DUMUX_BOX_MODEL_HH
-#define DUMUX_BOX_MODEL_HH
-
-#include <dumux/implicit/common/implicitmodel.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup BoxModel
- *
- * \brief The base class for the vertex centered finite volume
- * discretization scheme.
- */
-template<class TypeTag>
-class BoxModel : public ImplicitModel<TypeTag>
-{
- typedef ImplicitModel<TypeTag> ParentType;
-
- // copying a model is not a good idea
- BoxModel(const BoxModel &);
-
-public:
- /*!
- * \brief The constructor.
- */
- DUNE_DEPRECATED_MSG("Use ImplicitModel from dumux/implicit/common/implicitmodel.hh instead.")
- BoxModel() : ParentType()
- {}
-};
-}
-
-#endif
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
deleted file mode 100644
index 7599784201..0000000000
--- a/dumux/boxmodels/common/boxproblem.hh
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for all problems which use the box scheme
- */
-#ifndef DUMUX_BOX_PROBLEM_HH
-#define DUMUX_BOX_PROBLEM_HH
-
-#include <dumux/implicit/common/implicitproblem.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup BoxModel
- * \ingroup BoxBaseProblems
- * \brief Base class for all problems which use the box scheme.
- *
- * \note All quantities are specified assuming a threedimensional
- * world. Problems discretized using 2D grids are assumed to be
- * extruded by \f$1 m\f$ and 1D grids are assumed to have a
- * cross section of \f$1m \times 1m\f$.
- */
-template<class TypeTag>
-class BoxProblem : public ImplicitProblem<TypeTag>
-{
- typedef ImplicitProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- // copying a problem is not a good idea
- BoxProblem(const BoxProblem &);
-
-public:
- /*!
- * \brief Constructor
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- DUNE_DEPRECATED_MSG("Use ImplicitProblem from dumux/implicit/common/implicitproblem.hh.")
- BoxProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {}
-};
-
-}
-
-#endif
diff --git a/dumux/boxmodels/common/boxvolumevariables.hh b/dumux/boxmodels/common/boxvolumevariables.hh
deleted file mode 100644
index d11f8d0c21..0000000000
--- a/dumux/boxmodels/common/boxvolumevariables.hh
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for the model specific class which provides
- * access to all volume averaged quantities.
- */
-#ifndef DUMUX_BOX_VOLUME_VARIABLES_HH
-#define DUMUX_BOX_VOLUME_VARIABLES_HH
-
-#include <dumux/implicit/common/implicitvolumevariables.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup BoxModel
- * \ingroup ImplicitVolumeVariables
- * \brief Base class for the model specific class which provides
- * access to all volume averaged quantities.
- */
-template <class TypeTag>
-class BoxVolumeVariables : public ImplicitVolumeVariables<TypeTag>
-{
- typedef ImplicitVolumeVariables<TypeTag> ParentType;
-
-public:
- DUNE_DEPRECATED_MSG("Use ImplicitVolumeVariables from "
- "dumux/implicit/common/implicitvolumevariables.hh.")
- BoxVolumeVariables() : ParentType() {}
-
- DUNE_DEPRECATED_MSG("Use ImplicitVolumeVariables from "
- "dumux/implicit/common/implicitvolumevariables.hh.")
- BoxVolumeVariables(const BoxVolumeVariables &v)
- : ParentType(v) {}
-};
-
-} // end namepace
-
-#endif
diff --git a/dumux/boxmodels/common/porousmediaboxproblem.hh b/dumux/boxmodels/common/porousmediaboxproblem.hh
deleted file mode 100644
index c86c92e6d4..0000000000
--- a/dumux/boxmodels/common/porousmediaboxproblem.hh
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for all problems which use the two-phase box model
- */
-#ifndef DUMUX_POROUS_MEDIA_BOX_PROBLEM_HH
-#define DUMUX_POROUS_MEDIA_BOX_PROBLEM_HH
-
-#include <dumux/implicit/common/implicitporousmediaproblem.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup BoxBaseProblems
- * \brief Base class for all porous media box problems
- */
-template<class TypeTag>
-class PorousMediaBoxProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- * \param verbose Turn verbosity on or off
- */
- DUNE_DEPRECATED_MSG("Use ImplicitPorousMediaProblem from dumux/implicit/common/implicitporousmediaproblem.hh.")
- PorousMediaBoxProblem(TimeManager &timeManager,
- const GridView &gridView,
- const bool verbose = true)
- : ParentType(timeManager, gridView)
- {}
-};
-
-}
-
-#endif
diff --git a/dumux/boxmodels/mpnc/Makefile.am b/dumux/boxmodels/mpnc/Makefile.am
deleted file mode 100644
index 30f151f003..0000000000
--- a/dumux/boxmodels/mpnc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = diffusion energy mass
-
-mpncdir = $(includedir)/dumux/boxmodels/mpnc
-mpnc_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/mpnc/diffusion/Makefile.am b/dumux/boxmodels/mpnc/diffusion/Makefile.am
deleted file mode 100644
index 53a44407d5..0000000000
--- a/dumux/boxmodels/mpnc/diffusion/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-diffusiondir = $(includedir)/dumux/boxmodels/mpnc/diffusion
-diffusion_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/mpnc/diffusion/diffusion.hh b/dumux/boxmodels/mpnc/diffusion/diffusion.hh
deleted file mode 100644
index 49acbfbbff..0000000000
--- a/dumux/boxmodels/mpnc/diffusion/diffusion.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/diffusion/diffusion.hh instead.
-
-#include <dumux/implicit/mpnc/diffusion/diffusion.hh>
diff --git a/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh b/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
deleted file mode 100644
index 2d58e9dba0..0000000000
--- a/dumux/boxmodels/mpnc/diffusion/fluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/diffusion/fluxvariables.hh instead.
-
-#include <dumux/implicit/mpnc/diffusion/fluxvariables.hh>
diff --git a/dumux/boxmodels/mpnc/diffusion/volumevariables.hh b/dumux/boxmodels/mpnc/diffusion/volumevariables.hh
deleted file mode 100644
index d74791045b..0000000000
--- a/dumux/boxmodels/mpnc/diffusion/volumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/diffusion/volumevariables.hh instead.
-
-#include <dumux/implicit/mpnc/diffusion/volumevariables.hh>
diff --git a/dumux/boxmodels/mpnc/energy/Makefile.am b/dumux/boxmodels/mpnc/energy/Makefile.am
deleted file mode 100644
index 0f5e064a86..0000000000
--- a/dumux/boxmodels/mpnc/energy/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-energydir = $(includedir)/dumux/boxmodels/mpnc/energy
-energy_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
deleted file mode 100644
index d089bc72cf..0000000000
--- a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh instead.
-
-#include <dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh>
diff --git a/dumux/boxmodels/mpnc/energy/mpncindicesenergy.hh b/dumux/boxmodels/mpnc/energy/mpncindicesenergy.hh
deleted file mode 100644
index dc4baae63e..0000000000
--- a/dumux/boxmodels/mpnc/energy/mpncindicesenergy.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/energy/mpncindicesenergy.hh instead.
-
-#include <dumux/implicit/mpnc/energy/mpncindicesenergy.hh>
diff --git a/dumux/boxmodels/mpnc/energy/mpnclocalresidualenergy.hh b/dumux/boxmodels/mpnc/energy/mpnclocalresidualenergy.hh
deleted file mode 100644
index 7235c4c210..0000000000
--- a/dumux/boxmodels/mpnc/energy/mpnclocalresidualenergy.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh instead.
-
-#include <dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh>
diff --git a/dumux/boxmodels/mpnc/energy/mpncvolumevariablesenergy.hh b/dumux/boxmodels/mpnc/energy/mpncvolumevariablesenergy.hh
deleted file mode 100644
index 313e626806..0000000000
--- a/dumux/boxmodels/mpnc/energy/mpncvolumevariablesenergy.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh instead.
-
-#include <dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh>
diff --git a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
deleted file mode 100644
index a940d55d0c..0000000000
--- a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh instead.
-
-#include <dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh>
diff --git a/dumux/boxmodels/mpnc/mass/Makefile.am b/dumux/boxmodels/mpnc/mass/Makefile.am
deleted file mode 100644
index 01a0fc6234..0000000000
--- a/dumux/boxmodels/mpnc/mass/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-massdir = $(includedir)/dumux/boxmodels/mpnc/mass
-mass_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/mpnc/mass/mpncindicesmass.hh b/dumux/boxmodels/mpnc/mass/mpncindicesmass.hh
deleted file mode 100644
index dac05b32d3..0000000000
--- a/dumux/boxmodels/mpnc/mass/mpncindicesmass.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mass/mpncindicesmass.hh instead.
-
-#include <dumux/implicit/mpnc/mass/mpncindicesmass.hh>
diff --git a/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh b/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
deleted file mode 100644
index c53ca565ac..0000000000
--- a/dumux/boxmodels/mpnc/mass/mpnclocalresidualmass.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh instead.
-
-#include <dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh>
diff --git a/dumux/boxmodels/mpnc/mass/mpncvolumevariablesmass.hh b/dumux/boxmodels/mpnc/mass/mpncvolumevariablesmass.hh
deleted file mode 100644
index 9ee0b4ad43..0000000000
--- a/dumux/boxmodels/mpnc/mass/mpncvolumevariablesmass.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mass/mpncvolumevariablesmass.hh instead.
-
-#include <dumux/implicit/mpnc/mass/mpncvolumevariablesmass.hh>
diff --git a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
deleted file mode 100644
index dde019f92a..0000000000
--- a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mass/mpncvtkwritermass.hh instead.
-
-#include <dumux/implicit/mpnc/mass/mpncvtkwritermass.hh>
diff --git a/dumux/boxmodels/mpnc/mpncfluxvariables.hh b/dumux/boxmodels/mpnc/mpncfluxvariables.hh
deleted file mode 100644
index 3744272e48..0000000000
--- a/dumux/boxmodels/mpnc/mpncfluxvariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncfluxvariables.hh instead.
-
-#include <dumux/implicit/mpnc/mpncfluxvariables.hh>
diff --git a/dumux/boxmodels/mpnc/mpncindices.hh b/dumux/boxmodels/mpnc/mpncindices.hh
deleted file mode 100644
index cccd6b77eb..0000000000
--- a/dumux/boxmodels/mpnc/mpncindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncindices.hh instead.
-
-#include <dumux/implicit/mpnc/mpncindices.hh>
diff --git a/dumux/boxmodels/mpnc/mpnclocalresidual.hh b/dumux/boxmodels/mpnc/mpnclocalresidual.hh
deleted file mode 100644
index 8396b80e64..0000000000
--- a/dumux/boxmodels/mpnc/mpnclocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpnclocalresidual.hh instead.
-
-#include <dumux/implicit/mpnc/mpnclocalresidual.hh>
diff --git a/dumux/boxmodels/mpnc/mpncmodel.hh b/dumux/boxmodels/mpnc/mpncmodel.hh
deleted file mode 100644
index 499b345331..0000000000
--- a/dumux/boxmodels/mpnc/mpncmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncmodel.hh instead.
-
-#include <dumux/implicit/mpnc/mpncmodel.hh>
diff --git a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
deleted file mode 100644
index fc6caf8fc9..0000000000
--- a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncnewtoncontroller.hh instead.
-
-#include <dumux/implicit/mpnc/mpncnewtoncontroller.hh>
diff --git a/dumux/boxmodels/mpnc/mpncproperties.hh b/dumux/boxmodels/mpnc/mpncproperties.hh
deleted file mode 100644
index 54e0694f5a..0000000000
--- a/dumux/boxmodels/mpnc/mpncproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncproperties.hh instead.
-
-#include <dumux/implicit/mpnc/mpncproperties.hh>
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
deleted file mode 100644
index 00ff46142c..0000000000
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncpropertydefaults.hh instead.
-
-#include <dumux/implicit/mpnc/mpncpropertydefaults.hh>
diff --git a/dumux/boxmodels/mpnc/mpncvolumevariables.hh b/dumux/boxmodels/mpnc/mpncvolumevariables.hh
deleted file mode 100644
index 542d66e2e9..0000000000
--- a/dumux/boxmodels/mpnc/mpncvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncvolumevariables.hh instead.
-
-#include <dumux/implicit/mpnc/mpncvolumevariables.hh>
diff --git a/dumux/boxmodels/mpnc/mpncvolumevariablesia.hh b/dumux/boxmodels/mpnc/mpncvolumevariablesia.hh
deleted file mode 100644
index 7123f7441f..0000000000
--- a/dumux/boxmodels/mpnc/mpncvolumevariablesia.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncvolumevariablesia.hh instead.
-
-#include <dumux/implicit/mpnc/mpncvolumevariablesia.hh>
diff --git a/dumux/boxmodels/mpnc/mpncvtkwriter.hh b/dumux/boxmodels/mpnc/mpncvtkwriter.hh
deleted file mode 100644
index 0a97ddcdd2..0000000000
--- a/dumux/boxmodels/mpnc/mpncvtkwriter.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncvtkwriter.hh instead.
-
-#include <dumux/implicit/mpnc/mpncvtkwriter.hh>
diff --git a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
deleted file mode 100644
index d43da50121..0000000000
--- a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncvtkwritercommon.hh instead.
-
-#include <dumux/implicit/mpnc/mpncvtkwritercommon.hh>
diff --git a/dumux/boxmodels/mpnc/mpncvtkwritermodule.hh b/dumux/boxmodels/mpnc/mpncvtkwritermodule.hh
deleted file mode 100644
index 9befe9507e..0000000000
--- a/dumux/boxmodels/mpnc/mpncvtkwritermodule.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/mpnc/mpncvtkwritermodule.hh instead.
-
-#include <dumux/implicit/mpnc/mpncvtkwritermodule.hh>
diff --git a/dumux/boxmodels/richards/Makefile.am b/dumux/boxmodels/richards/Makefile.am
deleted file mode 100644
index 26a58204fb..0000000000
--- a/dumux/boxmodels/richards/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-richardsdir = $(includedir)/dumux/boxmodels/richards
-richards_HEADERS = *.hh
-
-include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/richards/richardsindices.hh b/dumux/boxmodels/richards/richardsindices.hh
deleted file mode 100644
index b7b43a3d80..0000000000
--- a/dumux/boxmodels/richards/richardsindices.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsindices.hh instead.
-
-#include <dumux/implicit/richards/richardsindices.hh>
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
deleted file mode 100644
index 6958456b08..0000000000
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardslocalresidual.hh instead.
-
-#include <dumux/implicit/richards/richardslocalresidual.hh>
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
deleted file mode 100644
index 285950bbbf..0000000000
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsmodel.hh instead.
-
-#include <dumux/implicit/richards/richardsmodel.hh>
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
deleted file mode 100644
index d953302216..0000000000
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsnewtoncontroller.hh instead.
-
-#include <dumux/implicit/richards/richardsnewtoncontroller.hh>
diff --git a/dumux/boxmodels/richards/richardsproblem.hh b/dumux/boxmodels/richards/richardsproblem.hh
deleted file mode 100644
index c057ef7856..0000000000
--- a/dumux/boxmodels/richards/richardsproblem.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsproblem.hh instead.
-
-#include <dumux/implicit/richards/richardsproblem.hh>
diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh
deleted file mode 100644
index f7c2bc20b7..0000000000
--- a/dumux/boxmodels/richards/richardsproperties.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsproperties.hh instead.
-
-#include <dumux/implicit/richards/richardsproperties.hh>
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
deleted file mode 100644
index 9ee08bf391..0000000000
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardspropertydefaults.hh instead.
-
-#include <dumux/implicit/richards/richardspropertydefaults.hh>
diff --git a/dumux/boxmodels/richards/richardsvolumevariables.hh b/dumux/boxmodels/richards/richardsvolumevariables.hh
deleted file mode 100644
index 374ef27bee..0000000000
--- a/dumux/boxmodels/richards/richardsvolumevariables.hh
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning This file is deprecated. Include dumux/implicit/richards/richardsvolumevariables.hh instead.
-
-#include <dumux/implicit/richards/richardsvolumevariables.hh>
--
GitLab