OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix includes

Browse Source 
most includes are now sorted by abstraction levels, with the most
abstract header first. also some system headers like <string> are now
explicitly included in every file where some of their classes are
used.
This commit is contained in:
Andreas Lauser
2012-03-20 11:13:22 +01:00
committed by Andreas Lauser
parent 7df261d46a
commit 7b3c8f18bb
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/tutorialproblem_coupled.hh
View File

@@ -31,20 +31,23 @@
// The numerical model
#include <dumux/boxmodels/2p/2pmodel.hh>
// The DUNE grid used
#include <dune/grid/yaspgrid.hh>
// Spatially dependent parameters
// The components that are used
#include <dumux/material/components/h2o.hh>
#include <dumux/material/components/oil.hh>
#include <dumux/common/cubegridcreator.hh>
// include material laws
// The material laws
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/material/fluidmatrixinteractions/mp/2padapter.hh>
// The DUNE grid used
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/cubegridcreator.hh>
// Dune::FieldVector and Dune::FieldMatrix
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
namespace Dumux {
// forward declaration of the problem class

16
examples/tutorialproblem_decoupled.hh
View File

@@ -29,19 +29,14 @@
#ifndef DUMUX_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian1}@*/
#define DUMUX_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian2}@*/
// the grid includes
#include <dune/grid/yaspgrid.hh>
#include <dumux/common/cubegridcreator.hh>
// assign parameters dependent on space (e.g. spatial parameters)
#include "tutorialspatialparameters_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
// dumux 2p-decoupled environment
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh> /*@\label{tutorial-decoupled:parent-problem}@*/
// assign parameters dependent on space (e.g. spatial parameters)
#include "tutorialspatialparameters_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
// include cfl-criterion after coats: more suitable if the problem is not advection dominated
#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
@@ -49,6 +44,13 @@
#include <dumux/material/components/h2o.hh>
#include <dumux/material/components/oil.hh>
// the grid includes
#include <dumux/common/cubegridcreator.hh>
#include <dune/grid/yaspgrid.hh>
// provides Dune::FieldVector
#include <dune/common/fvector.hh>
namespace Dumux
{

4
examples/tutorialspatialparameters_decoupled.hh
View File

@@ -27,12 +27,14 @@
#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
#define DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
#include <dumux/material/spatialparameters/fvspatialparameters.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
namespace Dumux
{