Commit 0fb20382 authored by Martin Schneider's avatar Martin Schneider
Browse files

Merge branch 'feature/new-folder-structure-fix-includes' into 'master'

[folderstructure] Alter includes to new folder structure in dumux

Removes deprecation warnings because of new folder structure in dumux

See merge request !7
parents 5cfc47c3 6a409898
......@@ -25,9 +25,9 @@
#ifndef DUMUX_LENS_1P2C_PROBLEM_HH
#define DUMUX_LENS_1P2C_PROBLEM_HH
#include <dumux/implicit/1p2c/1p2cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
#include "lens1p2cspatialparams.hh"
......
......@@ -19,8 +19,8 @@
#ifndef DUMUX_1P2C_SPATIALPARAMS_HH
#define DUMUX_1P2C_SPATIALPARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/implicit/1p2c/1p2cmodel.hh>
#include <dumux/material/spatialparams/implicit1p.hh>
#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
/**
* @file
......
......@@ -25,9 +25,9 @@
#ifndef DUMUX_LENS_2P2C_PROBLEM_HH
#define DUMUX_LENS_2P2C_PROBLEM_HH
#include <dumux/implicit/2p2c/2p2cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
#include "lens2pspatialparams.hh"
......
......@@ -25,13 +25,13 @@
#ifndef DUMUX_LENS2P_PROBLEM_HH
#define DUMUX_LENS2P_PROBLEM_HH
#include <dumux/implicit/2p/2pmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/2p/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/components/n2.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidsystems/gasphase.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidsystems/2pimmiscible.hh>
#include "lens2pspatialparams.hh"
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_LENS2P_SPATIALPARAMS_HH
#define DUMUX_LENS2P_SPATIALPARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
......
......@@ -25,9 +25,9 @@
#ifndef DUMUX_LENS_1P2C_PROBLEM_HH
#define DUMUX_LENS_1P2C_PROBLEM_HH
#include <dumux/implicit/1p2c/1p2cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh>
#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/fluidsystems/h2on2liquidphase.hh>
#include "../1p2c_2p_2p2c/lens1p2cspatialparams.hh"
......
......@@ -25,8 +25,8 @@
#ifndef DUMUX_LENS2P_PROBLEM_HH
#define DUMUX_LENS2P_PROBLEM_HH
#include <dumux/implicit/2p/2pmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/2p/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
......
......@@ -25,12 +25,12 @@
#ifndef DUMUX_LENS2P_PROBLEM_HH
#define DUMUX_LENS2P_PROBLEM_HH
#include <dumux/implicit/2p/2pmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/2p/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidsystems/2pimmiscible.hh>
#include "../1p2c_2p_2p2c/lens2pspatialparams.hh"
......
......@@ -24,9 +24,9 @@
#include <cmath>
#include <dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh>
#include <dumux/decoupled/1p/diffusion/diffusionproblem1p.hh>
#include <dumux/decoupled/common/fv/fvvelocity.hh>
#include <dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh>
#include <dumux/porousmediumflow/1p/sequential/diffusion/problem.hh>
#include <dumux/porousmediumflow/sequential/cellcentered/velocity.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <lecture/mm/buckleyleverett/pseudoh2o.hh>
......
......@@ -22,7 +22,7 @@
#ifndef DUMUX_LECTURE_MHS_GROUNDWATER_SPATIALPARAMS_HH
#define DUMUX_LECTURE_MHS_GROUNDWATER_SPATIALPARAMS_HH
#include <dumux/material/spatialparams/fvspatialparams1p.hh>
#include <dumux/material/spatialparams/fv1p.hh>
namespace Dumux
{
......
......@@ -19,7 +19,7 @@
#ifndef DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
#define DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
#include <dumux/decoupled/2p/2pproperties.hh>
#include <dumux/porousmediumflow/2p/sequential/properties.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
......
......@@ -22,10 +22,10 @@
#include <dune/common/exceptions.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
#include <dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
#include <dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh>
#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh>
#include <dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh>
#include <dumux/porousmediumflow/2p/sequential/impes/problem.hh>
//pseudo-oil and h2o have to be used to make viscosity and density input parameters
#include "pseudooil.hh"
......
......@@ -19,7 +19,7 @@
#ifndef BUCKLEYLEVERETT_SPATIALPARAMS_HH
#define BUCKLEYLEVERETT_SPATIALPARAMS_HH
#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
......
......@@ -28,11 +28,11 @@
//#define PI 3.14159
#include <dumux/implicit/co2/co2model.hh>
#include <dumux/implicit/co2/co2volumevariables.hh>
#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
#include <dumux/porousmediumflow/co2/implicit/model.hh>
#include <dumux/porousmediumflow/co2/implicit/volumevariables.hh>
#include <dumux/material/fluidsystems/brineco2.hh>
#include <dumux/material/components/co2.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/implicit/box/intersectiontovertexbc.hh>
......
......@@ -19,12 +19,12 @@
#ifndef CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
#define CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/implicit/co2/co2model.hh>
#include <dumux/porousmediumflow/co2/implicit/model.hh>
namespace Dumux
{
......
......@@ -26,10 +26,10 @@
#ifndef DUMUX_COLUMNXYLENEPROBLEM_HH
#define DUMUX_COLUMNXYLENEPROBLEM_HH
#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairxylene.hh>
#include <dumux/implicit/3p3c/3p3cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
//#include <dumux/common/deprecated.hh>
......
......@@ -29,10 +29,10 @@
#ifndef DUMUX_COLUMNXYLENEPROBLEM_HH
#define DUMUX_COLUMNXYLENEPROBLEM_HH
#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
#include <dumux/material/fluidsystems/h2oairxylene.hh>
#include <dumux/implicit/3p3c/3p3cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
//#include <dumux/common/deprecated.hh>
......
......@@ -24,8 +24,8 @@
#ifndef DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
#define DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
#include <dumux/implicit/3p3c/3p3cindices.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
......
......@@ -29,8 +29,8 @@
#ifndef DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
#define DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
#include <dumux/implicit/3p3c/3p3cindices.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
......
......@@ -19,10 +19,10 @@
#ifndef DUMUX_CONVECTIVE_MIXING_PROBLEM_HH
#define DUMUX_CONVECTIVE_MIXING_PROBLEM_HH
#include <dumux/implicit/1p2c/1p2cmodel.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/porousmediumflow/1p2c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
#include <dumux/material/fluidsystems/brineco2.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivityconstanttau.hh>
#include <dumux/material/binarycoefficients/brine_co2.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