Commit f90aefce authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

implicit branch: replace boxmodels/model includes by implicit/model includes....

implicit branch: replace boxmodels/model includes by implicit/model includes. Everything compiles again without warnings.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/implicit@9684 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 205462e1
......@@ -29,9 +29,9 @@
#include <dumux/implicit/box/boxmodel.hh>
#include <dumux/boxmodels/1p2c/1p2cproperties.hh>
#include <dumux/boxmodels/1p2c/1p2cvolumevariables.hh>
#include <dumux/boxmodels/1p2c/1p2cfluxvariables.hh>
#include <dumux/implicit/1p2c/1p2cproperties.hh>
#include <dumux/implicit/1p2c/1p2cvolumevariables.hh>
#include <dumux/implicit/1p2c/1p2cfluxvariables.hh>
#include <dune/common/collectivecommunication.hh>
#include <vector>
......
......@@ -29,7 +29,7 @@
#define DUMUX_2P2CNI_FLUX_VARIABLES_HH
#include <dumux/common/math.hh>
#include <dumux/boxmodels/2p2c/2p2cfluxvariables.hh>
#include <dumux/implicit/2p2c/2p2cfluxvariables.hh>
namespace Dumux
{
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_2P2CNI_INDICES_HH
#define DUMUX_2P2CNI_INDICES_HH
#include <dumux/boxmodels/2p2c/2p2cindices.hh>
#include <dumux/implicit/2p2c/2p2cindices.hh>
namespace Dumux
{
......
......@@ -26,11 +26,11 @@
#ifndef DUMUX_NEW_2P2CNI_LOCAL_RESIDUAL_HH
#define DUMUX_NEW_2P2CNI_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/2p2c/2p2clocalresidual.hh>
#include <dumux/implicit/2p2c/2p2clocalresidual.hh>
#include <dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh>
#include <dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh>
#include <dumux/boxmodels/2p2cni/2p2cniproperties.hh>
#include <dumux/implicit/2p2cni/2p2cnivolumevariables.hh>
#include <dumux/implicit/2p2cni/2p2cnifluxvariables.hh>
#include <dumux/implicit/2p2cni/2p2cniproperties.hh>
namespace Dumux
{
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_NEW_2P2CNI_MODEL_HH
#define DUMUX_NEW_2P2CNI_MODEL_HH
#include <dumux/boxmodels/2p2c/2p2cmodel.hh>
#include <dumux/implicit/2p2c/2p2cmodel.hh>
namespace Dumux {
/*!
......
......@@ -28,7 +28,7 @@
#ifndef DUMUX_2P2CNI_PROPERTIES_HH
#define DUMUX_2P2CNI_PROPERTIES_HH
#include <dumux/boxmodels/2p2c/2p2cproperties.hh>
#include <dumux/implicit/2p2c/2p2cproperties.hh>
namespace Dumux
{
......
......@@ -28,7 +28,7 @@
#ifndef DUMUX_2P2CNI_PROPERTY_DEFAULTS_HH
#define DUMUX_2P2CNI_PROPERTY_DEFAULTS_HH
#include <dumux/boxmodels/2p2c/2p2cpropertydefaults.hh>
#include <dumux/implicit/2p2c/2p2cpropertydefaults.hh>
#include "2p2cnimodel.hh"
#include "2p2cniindices.hh"
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_2P2CNI_VOLUME_VARIABLES_HH
#define DUMUX_2P2CNI_VOLUME_VARIABLES_HH
#include <dumux/boxmodels/2p2c/2p2cvolumevariables.hh>
#include <dumux/implicit/2p2c/2p2cvolumevariables.hh>
namespace Dumux
{
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_BOXMODELS_2PDFM_INDICES_HH
#define DUMUX_BOXMODELS_2PDFM_INDICES_HH
#include<dumux/boxmodels/2p/2pindices.hh>
#include<dumux/implicit/2p/2pindices.hh>
namespace Dumux
{
......
......@@ -23,7 +23,7 @@
#ifndef DUMUX_BOXMODELS_2PDFM_LOCAL_RESIDUAL_HH
#define DUMUX_BOXMODELS_2PDFM_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/2p/2plocalresidual.hh>
#include <dumux/implicit/2p/2plocalresidual.hh>
#include "2pdfmproperties.hh"
namespace Dumux
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_BOXMODELS_2PDFM_MODEL_HH
#define DUMUX_BOXMODELS_2PDFM_MODEL_HH
#include <dumux/boxmodels/2p/2pmodel.hh>
#include <dumux/implicit/2p/2pmodel.hh>
#include "2pdfmproperties.hh"
#include "2pdfmlocalresidual.hh"
......
......@@ -25,7 +25,7 @@
#include <dune/common/fvector.hh>
#include <dumux/boxmodels/2p/2pvolumevariables.hh>
#include <dumux/implicit/2p/2pvolumevariables.hh>
#include "2pdfmproperties.hh"
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_2PNI_INDICES_HH
#define DUMUX_2PNI_INDICES_HH
#include <dumux/boxmodels/2p/2pindices.hh>
#include <dumux/implicit/2p/2pindices.hh>
namespace Dumux
{
......
......@@ -28,10 +28,10 @@
#include "2pniproperties.hh"
#include <dumux/boxmodels/2p/2plocalresidual.hh>
#include <dumux/implicit/2p/2plocalresidual.hh>
#include <dumux/boxmodels/2pni/2pnivolumevariables.hh>
#include <dumux/boxmodels/2pni/2pnifluxvariables.hh>
#include <dumux/implicit/2pni/2pnivolumevariables.hh>
#include <dumux/implicit/2pni/2pnifluxvariables.hh>
namespace Dumux
{
......
......@@ -24,7 +24,7 @@
#ifndef DUMUX_2PNI_MODEL_HH
#define DUMUX_2PNI_MODEL_HH
#include <dumux/boxmodels/2p/2pmodel.hh>
#include <dumux/implicit/2p/2pmodel.hh>
namespace Dumux {
......
......@@ -27,7 +27,7 @@
#ifndef DUMUX_2PNI_PROPERTIES_HH
#define DUMUX_2PNI_PROPERTIES_HH
#include <dumux/boxmodels/2p/2pproperties.hh>
#include <dumux/implicit/2p/2pproperties.hh>
namespace Dumux
{
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_2PNI_VOLUME_VARIABLES_HH
#define DUMUX_2PNI_VOLUME_VARIABLES_HH
#include <dumux/boxmodels/2p/2pvolumevariables.hh>
#include <dumux/implicit/2p/2pvolumevariables.hh>
namespace Dumux
{
......
......@@ -29,7 +29,7 @@
#define DUMUX_3P3CNI_FLUX_VARIABLES_HH
#include <dumux/common/math.hh>
#include <dumux/boxmodels/3p3c/3p3cfluxvariables.hh>
#include <dumux/implicit/3p3c/3p3cfluxvariables.hh>
namespace Dumux
{
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_3P3CNI_INDICES_HH
#define DUMUX_3P3CNI_INDICES_HH
#include <dumux/boxmodels/3p3c/3p3cindices.hh>
#include <dumux/implicit/3p3c/3p3cindices.hh>
namespace Dumux
{
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_NEW_3P3CNI_LOCAL_RESIDUAL_HH
#define DUMUX_NEW_3P3CNI_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/3p3c/3p3clocalresidual.hh>
#include <dumux/implicit/3p3c/3p3clocalresidual.hh>
#include "3p3cnivolumevariables.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