[disc] Rename disc/../properties.hh to disc/{box/cctpfa/ccmpfa/staggered}.hh

dumux/discretization/box/properties.hh → dumux/discretization/box.hh

@@ -23,8 +23,8 @@
  * \brief Defines a type tag and some properties for models using the box scheme.
  */
 
-#ifndef DUMUX_BOX_PROPERTIES_HH
-#define DUMUX_BOX_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZTAION_BOX_HH
+#define DUMUX_DISCRETIZTAION_BOX_HH
 
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>

dumux/discretization/cellcentered/mpfa/properties.hh → dumux/discretization/ccmpfa.hh

@@ -18,12 +18,12 @@
  *****************************************************************************/
 /*!
  * \file
- * \ingroup CCMpfaDiscretization
+ * \ingroup Discretization
  * \brief Properties for all models using cell-centered finite volume scheme with mpfa
  * \note Inherit from these properties to use a cell-centered finite volume scheme with mpfa
  */
-#ifndef DUMUX_CC_MPFA_PROPERTIES_HH
-#define DUMUX_CC_MPFA_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_CC_MPFA_HH
+#define DUMUX_DISCRETIZATION_CC_MPFA_HH
 
 #include <dune/common/reservedvector.hh>
 

dumux/discretization/cellcentered/tpfa/properties.hh → dumux/discretization/cctpfa.hh

@@ -18,13 +18,13 @@
  *****************************************************************************/
 /*!
  * \file
- * \ingroup CCTpfaDiscretization
+ * \ingroup Discretization
  * \brief Properties for all models using cell-centered finite volume scheme with TPFA
  * \note Inherit from these properties to use a cell-centered finite volume scheme with TPFA
  */
 
-#ifndef DUMUX_CC_TPFA_PROPERTIES_HH
-#define DUMUX_CC_TPFA_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_CC_TPFA_HH
+#define DUMUX_DISCRETIZATION_CC_TPFA_HH
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/boundaryflag.hh>

dumux/discretization/staggered/properties.hh → dumux/discretization/staggered.hh

@@ -17,16 +17,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \ingroup StaggeredDiscretization
  * \file
- *
+ * \ingroup Discretization
  * \brief Defines a type tag and some properties for models using the staggered scheme.
           This scheme features degrees of freedom at the elements' centers and intersections (faces).
  * TODO: detailed documentation and figures
  */
 
-#ifndef DUMUX_STAGGERD_PROPERTIES_HH
-#define DUMUX_STAGGERD_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_STAGGERD_HH
+#define DUMUX_DISCRETIZATION_STAGGERD_HH
 
 #include <dumux/common/properties.hh>
 

dumux/discretization/staggered/freeflow/properties.hh

@@ -32,7 +32,7 @@
 #include <dumux/common/intersectionmapper.hh>
 #include <dumux/common/defaultmappertraits.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/discretization/staggered.hh>
 #include <dumux/discretization/staggered/fvgridgeometry.hh>
 #include <dumux/freeflow/properties.hh>
 

dumux/multidomain/facet/box/properties.hh

@@ -30,7 +30,7 @@
 #define DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/multidomain/facet/box/darcyslaw.hh>
 #include <dumux/multidomain/facet/box/elementboundarytypes.hh>

dumux/multidomain/facet/cellcentered/tpfa/properties.hh

@@ -30,7 +30,7 @@
 #define DUMUX_FACETCOUPLING_CC_TPFA_PROPERTIES_HH
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/multidomain/facet/cellcentered/upwindscheme.hh>
 #include <dumux/multidomain/facet/cellcentered/localresidual.hh>
 #include <dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh>

dumux/porousmediumflow/boxdfm/model.hh

@@ -26,7 +26,7 @@
 #ifndef DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
 #define DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include "fvgridgeometry.hh"
 #include "fluxvariablescache.hh"

test/geomechanics/elastic/problem.hh

@@ -26,7 +26,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/elastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 

test/geomechanics/poroelastic/problem.hh

@@ -26,7 +26,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/poroelastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 

test/multidomain/boundary/darcydarcy/1p_1p/main.cc

@@ -43,7 +43,7 @@
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
 
 #include <dumux/multidomain/traits.hh>

test/multidomain/boundary/darcydarcy/1p_2p/main.cc

@@ -47,7 +47,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidsystems/2pimmiscible.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
 
 #include <dumux/multidomain/traits.hh>

test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh

@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>

test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.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/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>

test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh

@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 #include <dumux/porousmediumflow/2p2c/model.hh>

test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh

@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>

test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.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/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>

test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.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/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>

test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh

@@ -29,7 +29,7 @@
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>

test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh

@@ -34,7 +34,7 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/richardsnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>