From 1539fe9d857084850254df1e1e7bea4eb3dba3a0 Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Tue, 12 Mar 2013 03:27:32 +0000 Subject: [PATCH] Don't include deprecated boxmodel headers in various implicit models. (reviewed by bernd) git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10387 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/freeflow/stokes/stokeslocalresidual.hh | 2 +- dumux/freeflow/stokes/stokesmodel.hh | 2 +- dumux/implicit/2p2c/2p2cvolumevariables.hh | 2 +- dumux/implicit/3p3c/3p3cvolumevariables.hh | 2 +- dumux/implicit/mpnc/mpncmodel.hh | 2 +- dumux/implicit/richards/richardsmodel.hh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh index f80e1b36cf..88e65096db 100644 --- a/dumux/freeflow/stokes/stokeslocalresidual.hh +++ b/dumux/freeflow/stokes/stokeslocalresidual.hh @@ -26,7 +26,7 @@ #ifndef DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH #define DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> //#include <dumux/implicit/box/boxcouplinglocalresidual.hh> #include "stokesproperties.hh" diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh index a60f4aba91..38dbaf4035 100644 --- a/dumux/freeflow/stokes/stokesmodel.hh +++ b/dumux/freeflow/stokes/stokesmodel.hh @@ -24,7 +24,7 @@ * \brief Base class for all models which use the Stokes box model. */ -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> #include "stokeslocalresidual.hh" #include "stokesnewtoncontroller.hh" diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh index 3785baaadd..cb7181bf29 100644 --- a/dumux/implicit/2p2c/2p2cvolumevariables.hh +++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_2P2C_VOLUME_VARIABLES_HH #define DUMUX_2P2C_VOLUME_VARIABLES_HH -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> #include <dumux/common/math.hh> #include <dune/common/collectivecommunication.hh> diff --git a/dumux/implicit/3p3c/3p3cvolumevariables.hh b/dumux/implicit/3p3c/3p3cvolumevariables.hh index 52f0a55448..28ad861e8b 100644 --- a/dumux/implicit/3p3c/3p3cvolumevariables.hh +++ b/dumux/implicit/3p3c/3p3cvolumevariables.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_3P3C_VOLUME_VARIABLES_HH #define DUMUX_3P3C_VOLUME_VARIABLES_HH -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> #include <dumux/common/math.hh> #include <dune/common/collectivecommunication.hh> diff --git a/dumux/implicit/mpnc/mpncmodel.hh b/dumux/implicit/mpnc/mpncmodel.hh index 577d8b48a1..e40b3e950c 100644 --- a/dumux/implicit/mpnc/mpncmodel.hh +++ b/dumux/implicit/mpnc/mpncmodel.hh @@ -29,7 +29,7 @@ #include "mpncproperties.hh" #include "mpncvtkwriter.hh" -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> namespace Dumux { diff --git a/dumux/implicit/richards/richardsmodel.hh b/dumux/implicit/richards/richardsmodel.hh index 7f305d3155..c7f1f9fff7 100644 --- a/dumux/implicit/richards/richardsmodel.hh +++ b/dumux/implicit/richards/richardsmodel.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_RICHARDS_MODEL_HH #define DUMUX_RICHARDS_MODEL_HH -#include <dumux/boxmodels/common/boxmodel.hh> +#include <dumux/implicit/common/implicitmodel.hh> #include "richardslocalresidual.hh" #include "richardsproblem.hh" -- GitLab