From 2e3a23c6e900b10ad81c1bf080a68a62d9537fce Mon Sep 17 00:00:00 2001 From: Felix Weinhardt <felixw@picard.iws.uni-stuttgart.de> Date: Wed, 5 Dec 2018 15:29:50 +0100 Subject: [PATCH] [updated include discretization file names] changed to box.hh cctpfa.hh ccmpfa.hh --- exercises/exercise-basic/injection2p2cproblem.hh | 2 +- exercises/exercise-basic/injection2pniproblem.hh | 2 +- exercises/exercise-basic/injection2pproblem.hh | 2 +- exercises/exercise-biomineralization/biominproblem.hh | 2 +- .../interface/ex_interface_pmproblem.hh | 2 +- .../exercise-coupling-ff-pm/models/ex_models_pmproblem.hh | 2 +- .../turbulence/ex_turbulence_pmproblem.hh | 2 +- exercises/exercise-fluidsystem/2p2cproblem.hh | 2 +- exercises/exercise-fluidsystem/2pproblem.hh | 2 +- exercises/exercise-fluidsystem/README.md | 2 +- exercises/exercise-fractures/fractureproblem.hh | 2 +- exercises/exercise-grids/injection2pproblem.hh | 2 +- exercises/exercise-mainfile/1pproblem.hh | 6 +++--- exercises/exercise-properties/problem.hh | 6 +++--- exercises/exercise-runtimeparams/injection2pproblem.hh | 2 +- exercises/solution/exercise-basic/injection2pniproblem.hh | 2 +- .../solution/exercise-biomineralization/biominproblem.hh | 2 +- .../interface/ex_interface_pmproblem.hh | 2 +- .../exercise-coupling-ff-pm/models/ex_models_pmproblem.hh | 2 +- .../turbulence/ex_turbulence_pmproblem.hh | 2 +- exercises/solution/exercise-fluidsystem/2p2cproblem.hh | 2 +- exercises/solution/exercise-fluidsystem/2pproblem.hh | 2 +- exercises/solution/exercise-fractures/fractureproblem.hh | 2 +- exercises/solution/exercise-grids/injection2pproblem.hh | 2 +- exercises/solution/exercise-mainfile/1pproblem.hh | 6 +++--- exercises/solution/exercise-properties/problem.hh | 6 +++--- .../solution/exercise-runtimeparams/injection2pproblem.hh | 2 +- 27 files changed, 35 insertions(+), 35 deletions(-) diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh index 276f3ccb..9e483829 100644 --- a/exercises/exercise-basic/injection2p2cproblem.hh +++ b/exercises/exercise-basic/injection2p2cproblem.hh @@ -24,7 +24,7 @@ #ifndef DUMUX_EX_BASIC_PROBLEM_2P2C_HH #define DUMUX_EX_BASIC_PROBLEM_2P2C_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh index 4a1e9603..eb5c5a44 100644 --- a/exercises/exercise-basic/injection2pniproblem.hh +++ b/exercises/exercise-basic/injection2pniproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh index 0f05fafd..414b4124 100644 --- a/exercises/exercise-basic/injection2pproblem.hh +++ b/exercises/exercise-basic/injection2pproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EX_BASIC_PROBLEM_2P_HH #define DUMUX_EX_BASIC_PROBLEM_2P_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh index aa2c8a2c..23ef5326 100644 --- a/exercises/exercise-biomineralization/biominproblem.hh +++ b/exercises/exercise-biomineralization/biominproblem.hh @@ -24,7 +24,7 @@ #ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH #define DUMUX_EXERCISE_FOUR_PROBLEM_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2pncmin/model.hh> #include <dumux/porousmediumflow/problem.hh> #include "solidsystems/biominsolidphase.hh" // The biomineralization solid system diff --git a/exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh b/exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh index 6c60375e..8b9f7495 100644 --- a/exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh +++ b/exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh @@ -29,7 +29,7 @@ //****** uncomment for the last exercise *****// // #include <dumux/io/grid/subgridgridcreator.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh b/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh index 0e48d235..c20e9e42 100644 --- a/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh +++ b/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh @@ -26,7 +26,7 @@ #include <dune/grid/yaspgrid.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/io/gnuplotinterface.hh> #include <dumux/material/fluidsystems/1padapter.hh> #include <dumux/material/fluidsystems/h2oair.hh> diff --git a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh index 2d3a84d2..0a9cd5f5 100644 --- a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh +++ b/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh @@ -26,7 +26,7 @@ #include <dune/grid/yaspgrid.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/exercise-fluidsystem/2p2cproblem.hh b/exercises/exercise-fluidsystem/2p2cproblem.hh index 48868247..a89f4dae 100644 --- a/exercises/exercise-fluidsystem/2p2cproblem.hh +++ b/exercises/exercise-fluidsystem/2p2cproblem.hh @@ -28,7 +28,7 @@ #include <dumux/porousmediumflow/2p2c/model.hh> // The box discretization -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/box.hh> // The base porous media box problem #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh index 8fa4668b..33950b28 100644 --- a/exercises/exercise-fluidsystem/2pproblem.hh +++ b/exercises/exercise-fluidsystem/2pproblem.hh @@ -28,7 +28,7 @@ #include <dumux/porousmediumflow/2p/model.hh> // The box discretization -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/box.hh> // The grid managers #if HAVE_DUNE_ALUGRID diff --git a/exercises/exercise-fluidsystem/README.md b/exercises/exercise-fluidsystem/README.md index d12f4bff..3cfe4bac 100644 --- a/exercises/exercise-fluidsystem/README.md +++ b/exercises/exercise-fluidsystem/README.md @@ -57,7 +57,7 @@ while the `BoxModel` _TypeTag_ can be found in the `box/properties.hh` header: ```c++ // The box discretization -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/box.hh> ``` For a cell-centered scheme, you could derive from `CCTpfaModel` or `CCMpfaModel` instead (and, of course, include the right headers). diff --git a/exercises/exercise-fractures/fractureproblem.hh b/exercises/exercise-fractures/fractureproblem.hh index 2df7b24b..297aa347 100644 --- a/exercises/exercise-fractures/fractureproblem.hh +++ b/exercises/exercise-fractures/fractureproblem.hh @@ -34,7 +34,7 @@ #include <dumux/material/fluidsystems/h2on2.hh> // we use a cell-centered finite volume scheme with tpfa here -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> // include the base problem and the model we inherit from #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/exercise-grids/injection2pproblem.hh b/exercises/exercise-grids/injection2pproblem.hh index 0b9e4308..209e9f50 100644 --- a/exercises/exercise-grids/injection2pproblem.hh +++ b/exercises/exercise-grids/injection2pproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/exercise-mainfile/1pproblem.hh b/exercises/exercise-mainfile/1pproblem.hh index 7deacc49..7f1d69c5 100644 --- a/exercises/exercise-mainfile/1pproblem.hh +++ b/exercises/exercise-mainfile/1pproblem.hh @@ -31,9 +31,9 @@ #include <dumux/material/components/tabulatedcomponent.hh> #include <dumux/material/fluidsystems/1pliquid.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> -#include <dumux/discretization/cellcentered/mpfa/properties.hh> -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/cctpfa.hh> +#include <dumux/discretization/ccmpfa.hh> +#include <dumux/discretization/box.hh> // TODO: dumux-course-task diff --git a/exercises/exercise-properties/problem.hh b/exercises/exercise-properties/problem.hh index 6405549c..f3360293 100644 --- a/exercises/exercise-properties/problem.hh +++ b/exercises/exercise-properties/problem.hh @@ -25,9 +25,9 @@ #include <dune/grid/yaspgrid.hh> -#include <dumux/discretization/box/properties.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> -#include <dumux/discretization/cellcentered/mpfa/properties.hh> +#include <dumux/discretization/box.hh> +#include <dumux/discretization/cctpfa.hh> +#include <dumux/discretization/ccmpfa.hh> #include <dumux/material/components/trichloroethene.hh> #include <dumux/material/components/simpleh2o.hh> diff --git a/exercises/exercise-runtimeparams/injection2pproblem.hh b/exercises/exercise-runtimeparams/injection2pproblem.hh index edb5d86d..7ac8abb9 100644 --- a/exercises/exercise-runtimeparams/injection2pproblem.hh +++ b/exercises/exercise-runtimeparams/injection2pproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh index 6625627e..4e20b2b4 100644 --- a/exercises/solution/exercise-basic/injection2pniproblem.hh +++ b/exercises/solution/exercise-basic/injection2pniproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh index 3c24e6da..d7e6093a 100644 --- a/exercises/solution/exercise-biomineralization/biominproblem.hh +++ b/exercises/solution/exercise-biomineralization/biominproblem.hh @@ -24,7 +24,7 @@ #ifndef DUMUX_EXERCISE_FOUR_PROBLEM_HH #define DUMUX_EXERCISE_FOUR_PROBLEM_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2pncmin/model.hh> #include <dumux/porousmediumflow/problem.hh> #include "solidsystems/biominsolidphase.hh" // The biomineralization solid system diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh index 7a5c4baa..d78c76f0 100644 --- a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh +++ b/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh @@ -30,7 +30,7 @@ #include <dumux/io/grid/subgridgridcreator.hh> #endif -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh index 18ad042d..b2d951bc 100644 --- a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh +++ b/exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh @@ -27,7 +27,7 @@ #include <dune/grid/yaspgrid.hh> #include <dumux/material/fluidsystems/1padapter.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/io/gnuplotinterface.hh> #include <dumux/material/fluidsystems/h2oair.hh> #include <dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh> diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh index bd589d63..1b46ce77 100644 --- a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh +++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh @@ -26,7 +26,7 @@ #include <dune/grid/yaspgrid.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh index b46b9f01..35eca350 100644 --- a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh +++ b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh @@ -28,7 +28,7 @@ #include <dumux/porousmediumflow/2p2c/model.hh> // The box discretization -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/box.hh> // The base porous media box problem #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/solution/exercise-fluidsystem/2pproblem.hh b/exercises/solution/exercise-fluidsystem/2pproblem.hh index f27c36b9..d97bba89 100644 --- a/exercises/solution/exercise-fluidsystem/2pproblem.hh +++ b/exercises/solution/exercise-fluidsystem/2pproblem.hh @@ -28,7 +28,7 @@ #include <dumux/porousmediumflow/2p/model.hh> // The box discretization -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/box.hh> // The grid managers #if HAVE_DUNE_ALUGRID diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh index 02c89ce7..b3300c85 100644 --- a/exercises/solution/exercise-fractures/fractureproblem.hh +++ b/exercises/solution/exercise-fractures/fractureproblem.hh @@ -34,7 +34,7 @@ #include <dumux/material/fluidsystems/h2on2.hh> // we use a cell-centered finite volume scheme with tpfa here -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> // include the base problem and the model we inherit from #include <dumux/porousmediumflow/problem.hh> diff --git a/exercises/solution/exercise-grids/injection2pproblem.hh b/exercises/solution/exercise-grids/injection2pproblem.hh index 616105a0..325d555d 100644 --- a/exercises/solution/exercise-grids/injection2pproblem.hh +++ b/exercises/solution/exercise-grids/injection2pproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXGRIDS_INJECTION_PROBLEM_2P_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/exercises/solution/exercise-mainfile/1pproblem.hh b/exercises/solution/exercise-mainfile/1pproblem.hh index 7deacc49..7f1d69c5 100644 --- a/exercises/solution/exercise-mainfile/1pproblem.hh +++ b/exercises/solution/exercise-mainfile/1pproblem.hh @@ -31,9 +31,9 @@ #include <dumux/material/components/tabulatedcomponent.hh> #include <dumux/material/fluidsystems/1pliquid.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> -#include <dumux/discretization/cellcentered/mpfa/properties.hh> -#include <dumux/discretization/box/properties.hh> +#include <dumux/discretization/cctpfa.hh> +#include <dumux/discretization/ccmpfa.hh> +#include <dumux/discretization/box.hh> // TODO: dumux-course-task diff --git a/exercises/solution/exercise-properties/problem.hh b/exercises/solution/exercise-properties/problem.hh index d8a18ef9..1aae5fcb 100644 --- a/exercises/solution/exercise-properties/problem.hh +++ b/exercises/solution/exercise-properties/problem.hh @@ -25,9 +25,9 @@ #include <dune/grid/yaspgrid.hh> -#include <dumux/discretization/box/properties.hh> -#include <dumux/discretization/cellcentered/tpfa/properties.hh> -#include <dumux/discretization/cellcentered/mpfa/properties.hh> +#include <dumux/discretization/box.hh> +#include <dumux/discretization/cctpfa.hh> +#include <dumux/discretization/ccmpfa.hh> #include <dumux/material/components/trichloroethene.hh> #include <dumux/material/components/simpleh2o.hh> diff --git a/exercises/solution/exercise-runtimeparams/injection2pproblem.hh b/exercises/solution/exercise-runtimeparams/injection2pproblem.hh index 2d10eb63..f553316c 100644 --- a/exercises/solution/exercise-runtimeparams/injection2pproblem.hh +++ b/exercises/solution/exercise-runtimeparams/injection2pproblem.hh @@ -25,7 +25,7 @@ #ifndef DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH -#include <dumux/discretization/cellcentered/tpfa/properties.hh> +#include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/h2on2.hh> -- GitLab