[updated include discretization file names]

changed to box.hh cctpfa.hh ccmpfa.hh

[updated include discretization file names]
changed to box.hh cctpfa.hh ccmpfa.hh
2e3a23c6 · Felix Weinhardt · 8f4ca1eb · 2e3a23c6 · 2e3a23c6 · 2e3a23c6
Commit 2e3a23c6 authored Dec 05, 2018 by Felix Weinhardt
--- 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>

--- 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>

--- 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>

--- 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

--- 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>

--- 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>

--- 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>

--- 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>

--- 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

--- 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).

--- 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>

--- 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>

--- 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

--- 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>

--- 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>

--- 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>

--- 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

--- 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>

--- 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>

--- 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>