Commit 44ff6724 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

implicit branch: adapt includes and add forward declarations to pass make headercheck.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/implicit@9800 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 1017d52d
......@@ -25,9 +25,6 @@
#ifndef DUMUX_1P_LOCAL_RESIDUAL_HH
#define DUMUX_1P_LOCAL_RESIDUAL_HH
#include <dumux/implicit/box/boxlocalresidual.hh>
#include "1pvolumevariables.hh"
#include "1pproperties.hh"
namespace Dumux
......
......@@ -27,9 +27,7 @@
#ifndef DUMUX_1P_MODEL_HH
#define DUMUX_1P_MODEL_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include "1plocalresidual.hh"
#include "1pproperties.hh"
namespace Dumux
{
......
......@@ -32,7 +32,6 @@
#include "1pmodel.hh"
#include "1plocalresidual.hh"
#include "1pvolumevariables.hh"
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
#include "1pindices.hh"
#include <dumux/material/fluidsystems/gasphase.hh>
......@@ -40,6 +39,7 @@
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
namespace Dumux
{
......
......@@ -26,15 +26,7 @@
#ifndef DUMUX_ONEP_TWOC_LOCAL_RESIDUAL_HH
#define DUMUX_ONEP_TWOC_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/common/boxmodel.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>
#include <iostream>
#include "1p2cproperties.hh"
namespace Dumux
{
......
......@@ -28,9 +28,6 @@
#define DUMUX_ONEP_TWOC_MODEL_HH
#include "1p2cproperties.hh"
#include "1p2clocalresidual.hh"
#include <dumux/boxmodels/common/boxmodel.hh>
namespace Dumux
{
......
......@@ -24,8 +24,6 @@
#ifndef DUMUX_TWOP_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_TWOP_LOCAL_RESIDUAL_BASE_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include "2pproperties.hh"
namespace Dumux
......
......@@ -27,7 +27,6 @@
#define DUMUX_TWOP_MODEL_HH
#include "2pproperties.hh"
#include "2plocalresidual.hh"
namespace Dumux
{
......
......@@ -30,9 +30,9 @@
#include "2pmodel.hh"
#include "2pindices.hh"
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
#include "2pvolumevariables.hh"
#include "2pproperties.hh"
#include "2plocalresidual.hh"
#include <dumux/material/fluidsystems/gasphase.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
......@@ -40,6 +40,7 @@
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
namespace Dumux
{
......
......@@ -26,16 +26,7 @@
#ifndef DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
#define DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/common/math.hh>
#include "2p2cproperties.hh"
#include "2p2cvolumevariables.hh"
#include "2p2cfluxvariables.hh"
#include "2p2cnewtoncontroller.hh"
#include <iostream>
#include <vector>
namespace Dumux
{
......
......@@ -25,7 +25,7 @@
#define DUMUX_2P2C_MODEL_HH
#include "2p2cproperties.hh"
#include "2p2clocalresidual.hh"
#include "2p2cindices.hh"
namespace Dumux
{
......
......@@ -33,6 +33,7 @@
#include "2p2cfluxvariables.hh"
#include "2p2cvolumevariables.hh"
#include "2p2cproperties.hh"
#include "2p2clocalresidual.hh"
#include "2p2cnewtoncontroller.hh"
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
......
......@@ -26,12 +26,9 @@
#ifndef DUMUX_NEW_2P2CNI_LOCAL_RESIDUAL_HH
#define DUMUX_NEW_2P2CNI_LOCAL_RESIDUAL_HH
#include "2p2cniproperties.hh"
#include <dumux/implicit/2p2c/2p2clocalresidual.hh>
#include <dumux/implicit/2p2cni/2p2cnivolumevariables.hh>
#include <dumux/implicit/2p2cni/2p2cnifluxvariables.hh>
#include <dumux/implicit/2p2cni/2p2cniproperties.hh>
namespace Dumux
{
/*!
......
......@@ -26,10 +26,7 @@
#define DUMUX_BOXMODELS_2PDFM_MODEL_HH
#include <dumux/implicit/2p/2pmodel.hh>
#include "2pdfmproperties.hh"
#include "2pdfmlocalresidual.hh"
#include "2pdfmproblem.hh"
namespace Dumux
{
......
......@@ -41,6 +41,7 @@
#include "2pdfmfluxvariables.hh"
#include "2pdfmvolumevariables.hh"
#include "2pdfmproperties.hh"
#include "2pdfmlocalresidual.hh"
namespace Dumux
{
......
......@@ -27,12 +27,8 @@
#define DUMUX_NEW_2PNI_LOCAL_RESIDUAL_HH
#include "2pniproperties.hh"
#include <dumux/implicit/2p/2plocalresidual.hh>
#include <dumux/implicit/2pni/2pnivolumevariables.hh>
#include <dumux/implicit/2pni/2pnifluxvariables.hh>
namespace Dumux
{
/*!
......
......@@ -25,6 +25,7 @@
#define DUMUX_2PNI_MODEL_HH
#include <dumux/implicit/2p/2pmodel.hh>
#include "2pniproperties.hh"
namespace Dumux {
......
......@@ -25,20 +25,8 @@
#ifndef DUMUX_3P3C_LOCAL_RESIDUAL_HH
#define DUMUX_3P3C_LOCAL_RESIDUAL_HH
#include <dumux/boxmodels/common/boxmodel.hh>
#include <dumux/common/math.hh>
#include "3p3cproperties.hh"
#include "3p3cvolumevariables.hh"
#include "3p3cfluxvariables.hh"
#include "3p3cnewtoncontroller.hh"
#include "3p3cproperties.hh"
#include <iostream>
#include <vector>
//#define VELOCITY_OUTPUT 1 // uncomment this line if an output of the velocity is needed
namespace Dumux
{
/*!
......
......@@ -27,10 +27,7 @@
#ifndef DUMUX_3P3C_MODEL_HH
#define DUMUX_3P3C_MODEL_HH
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
#include "3p3cproperties.hh"
#include "3p3clocalresidual.hh"
namespace Dumux
{
......
......@@ -36,7 +36,7 @@
#include "3p3cvolumevariables.hh"
#include "3p3cproperties.hh"
#include "3p3cnewtoncontroller.hh"
// #include "3p3cboundaryvariables.hh"
#include "3p3clocalresidual.hh"
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh>
......
......@@ -26,13 +26,8 @@
#ifndef DUMUX_NEW_3P3CNI_LOCAL_RESIDUAL_HH
#define DUMUX_NEW_3P3CNI_LOCAL_RESIDUAL_HH
#include <dumux/implicit/3p3c/3p3clocalresidual.hh>
#include "3p3cnivolumevariables.hh"
#include "3p3cnifluxvariables.hh"
#include "3p3cniproperties.hh"
#include <dumux/implicit/3p3c/3p3clocalresidual.hh>
namespace Dumux
{
......
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