Commit 205462e1 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

implicit branch: replace boxmodels/common includes by implicit/box includes.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/implicit@9683 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent a72d2f51
......@@ -25,7 +25,7 @@
#include <dune/istl/matrix.hh>
#include "stokesproperties.hh"
#include <dumux/boxmodels/common/boxlocaljacobian.hh>
#include <dumux/implicit/box/boxlocaljacobian.hh>
namespace Dumux
{
......
......@@ -26,8 +26,8 @@
#ifndef DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH
#include <dumux/boxmodels/common/boxmodel.hh>
//#include <dumux/boxmodels/common/boxcouplinglocalresidual.hh>
#include <dumux/implicit/box/boxmodel.hh>
//#include <dumux/implicit/box/boxcouplinglocalresidual.hh>
#include "stokesproperties.hh"
#include "stokesvolumevariables.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/box/boxmodel.hh>
#include "stokeslocalresidual.hh"
#include "stokesnewtoncontroller.hh"
......
......@@ -23,7 +23,7 @@
#ifndef DUMUX_STOKES_PROBLEM_HH
#define DUMUX_STOKES_PROBLEM_HH
#include <dumux/boxmodels/common/boxproblem.hh>
#include <dumux/implicit/box/boxproblem.hh>
#include "stokesproperties.hh"
......
......@@ -29,7 +29,7 @@
#ifndef DUMUX_STOKESPROPERTIES_HH
#define DUMUX_STOKESPROPERTIES_HH
#include <dumux/boxmodels/common/boxproperties.hh>
#include <dumux/implicit/box/boxproperties.hh>
namespace Dumux
{
......
......@@ -26,7 +26,7 @@
#define DUMUX_STOKES_VOLUME_VARIABLES_HH
#include "stokesproperties.hh"
#include "dumux/boxmodels/common/boxvolumevariables.hh"
#include "dumux/implicit/box/boxvolumevariables.hh"
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_1P_LOCAL_RESIDUAL_HH
#define DUMUX_1P_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/common/boxlocalresidual.hh>
#include <dumux/implicit/box/boxlocalresidual.hh>
#include "1pvolumevariables.hh"
#include "1pproperties.hh"
......
......@@ -27,7 +27,7 @@
#ifndef DUMUX_1P_MODEL_HH
#define DUMUX_1P_MODEL_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/implicit/box/boxmodel.hh>
#include "1plocalresidual.hh"
......
......@@ -27,7 +27,7 @@
#ifndef DUMUX_1P_PROPERTIES_DATA_HH
#define DUMUX_1P_PROPERTIES_DATA_HH
#include <dumux/boxmodels/common/boxproperties.hh>
#include <dumux/implicit/box/boxproperties.hh>
namespace Dumux
{
......
......@@ -27,12 +27,12 @@
#ifndef DUMUX_1P_PROPERTY_DEFAULTS_HH
#define DUMUX_1P_PROPERTY_DEFAULTS_HH
#include <dumux/boxmodels/common/boxproperties.hh>
#include <dumux/implicit/box/boxproperties.hh>
#include "1pmodel.hh"
#include "1plocalresidual.hh"
#include "1pvolumevariables.hh"
#include <dumux/boxmodels/common/boxdarcyfluxvariables.hh>
#include <dumux/implicit/box/boxdarcyfluxvariables.hh>
#include "1pindices.hh"
#include <dumux/material/fluidsystems/gasphase.hh>
......
......@@ -25,7 +25,7 @@
#define DUMUX_1P_VOLUME_VARIABLES_HH
#include "1pproperties.hh"
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/implicit/box/boxvolumevariables.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
......
......@@ -27,7 +27,7 @@
#define DUMUX_ONEP_TWOC_LOCAL_RESIDUAL_HH
#define VELOCITY_OUTPUT 1 //1 turns velocity output on, 0 turns it off
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/implicit/box/boxmodel.hh>
#include <dumux/boxmodels/1p2c/1p2cproperties.hh>
#include <dumux/boxmodels/1p2c/1p2cvolumevariables.hh>
......
......@@ -30,7 +30,7 @@
#include "1p2cproperties.hh"
#include "1p2clocalresidual.hh"
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/implicit/box/boxmodel.hh>
namespace Dumux
{
......
......@@ -30,7 +30,7 @@
#define DUMUX_1P2C_PROPERTIES_HH
#include<dumux/boxmodels/common/boxproperties.hh>
#include<dumux/implicit/box/boxproperties.hh>
namespace Dumux
{
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_1P2C_VOLUME_VARIABLES_HH
#define DUMUX_1P2C_VOLUME_VARIABLES_HH
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/implicit/box/boxvolumevariables.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
#include "1p2cproperties.hh"
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_TWOP_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_TWOP_LOCAL_RESIDUAL_BASE_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/implicit/box/boxmodel.hh>
#include "2pproperties.hh"
......
......@@ -30,7 +30,7 @@
#ifndef DUMUX_2P_PROPERTIES_HH
#define DUMUX_2P_PROPERTIES_HH
#include <dumux/boxmodels/common/boxproperties.hh>
#include <dumux/implicit/box/boxproperties.hh>
namespace Dumux
{
......
......@@ -30,7 +30,7 @@
#include "2pmodel.hh"
#include "2pindices.hh"
#include <dumux/boxmodels/common/boxdarcyfluxvariables.hh>
#include <dumux/implicit/box/boxdarcyfluxvariables.hh>
#include "2pvolumevariables.hh"
#include "2pproperties.hh"
......
......@@ -27,7 +27,7 @@
#include "2pproperties.hh"
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/implicit/box/boxvolumevariables.hh>
#include <dune/common/fvector.hh>
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/implicit/box/boxmodel.hh>
#include <dumux/common/math.hh>
#include "2p2cproperties.hh"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment