diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh index 276f3ccbec81d8766c941e2e3dade5ece2684163..9e483829ade944566991f052555a1d3a644fc50e 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 4a1e9603443dd1950446c99aa46f0fd4ecad2e48..eb5c5a44fd9f962870160bfb835023752205e9c8 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 0f05fafd223be512bf0476a31cdf3118b9a1e307..414b4124b94c7778d60e1ab42f912cd50a8d530f 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 aa2c8a2c5d75e680dd96fff7ee81b03dc3c38ee4..23ef5326781de1e73852da230e17bb54e9417e2b 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 6c60375e50efee86f4141ceb406cc38208f7f77e..8b9f74954fb20bb8163788262cbae5f820f85d82 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 0e48d23560788095b46c641d55c64606f9ecf6d6..c20e9e42963d7f778a13a38b8414606bf6e9d259 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 2d3a84d25c4884441720cc2ad10b0ccb8ab7a4ab..0a9cd5f54e1f81694257ddf4d8f14347343a5fcc 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 48868247d7144519125c91c394e65052b63e7665..a89f4dae9c96dc618d76718eed070ce8781b8a7b 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 8fa4668bb2242da863787a3d420a8ccee6a38597..33950b28e6a080b8e7a31a6a632760c388a80725 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 d12f4bff34f3037b0d5a2e07c123305df58a181c..3cfe4bacafa1667607ce061713a0dfc77b8cac9f 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 2df7b24bb7c1738216e44d88a9fdfa9f7f4b8629..297aa3479178b28b77a2890161d6f4ec74fb514c 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 0b9e430821caf16a93c01d302deb7c0bb477a642..209e9f50def2618920204576d99f6c1c5b8128ad 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 7deacc49dfbc9395457f1baa37407d45b1421f4f..7f1d69c5b38ad9433de05a912b703e3b19ebf07c 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 6405549c23e7dde202bede31f298931a29aa81fd..f336029375bf8b5acfa01ebe3d267e6e9df92d5d 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 edb5d86d169e59806ac597c2c20bc1988b28e5e1..7ac8abb9365b2c5c88ac9d358055724bdddeb940 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 6625627e419ed3a18ae38b44f9d2b492c57f0650..4e20b2b4ee99ee208ced03c35946a5e7391e0a2c 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 3c24e6dad80b89cb893d424aa1efdbc14a2664a0..d7e6093a35f0d1bcc98c2a5addfe935ca4d93609 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 7a5c4baaa4cdcc2997ed77781f1ce5308f8718ef..d78c76f0ed0958c319724812d1008337de2f00ea 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 18ad042dfdb65cbfc9a61389f8a7084a21e34eed..b2d951bc2addbf1250f87ee8eba511827ed27a26 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 bd589d6303f95b7c9ba96b94102174af24c8a129..1b46ce77d818164c849de90f3855db0665c96775 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 b46b9f016779246548e535b5e08091ba0063c966..35eca3501a634d0a02561f12c3f5631c7fe659c0 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 f27c36b9e724ba3a404703dd6fc72879fad70591..d97bba89f2840c75ff08e55975c69a74b39f1b8a 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 02c89ce721a7449c89665b029c5577ddb3fc4994..b3300c8520242a1a4a26e91f0ff7fc12b51b40fd 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 616105a07af3245cb33c14c5036e8e8146e9bf52..325d555dd6466f9c83371cabf8c373c81640ebc0 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 7deacc49dfbc9395457f1baa37407d45b1421f4f..7f1d69c5b38ad9433de05a912b703e3b19ebf07c 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 d8a18ef951f6e5ec95f173def1a9b3bb4c1af163..1aae5fcb8c66a9d15039500ee4e94e63a9034cf4 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 2d10eb6354544a1c5ba57274e7bb0b29b186ccb7..f553316c5f5934bd917c3c7508c4b0b7730f5d74 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>