From ccdcee561be6426316e751394d0ef16cd8c0929b Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de> Date: Tue, 5 Dec 2017 17:52:09 +0100 Subject: [PATCH] [test] Fix inlcudes * use dumux/common/properties.hh instead of dumux/common/propertysystem.hh --- test/common/propertysystem/test_propertysystem.cc | 2 +- test/material/fluidsystems/test_fluidsystems.cc | 2 +- test/porousmediumflow/1p/implicit/compressible/test_1p.cc | 2 +- .../1p/implicit/compressible/test_1p_stationary.cc | 2 +- test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc | 2 +- .../1p/implicit/pointsources/test_1pfv_pointsources.cc | 2 +- .../pointsources/test_1pfv_pointsources_timedependent.cc | 2 +- test/porousmediumflow/1p/implicit/test_1pfv.cc | 2 +- test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc | 2 +- test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc | 2 +- test/porousmediumflow/1p/implicit/test_1pnifv.cc | 2 +- test/porousmediumflow/1pnc/implicit/test_1p2c_fv.cc | 2 +- .../1pnc/implicit/test_1p2cni_conduction_fv.cc | 2 +- .../1pnc/implicit/test_1p2cni_convection_fv.cc | 2 +- .../2p/implicit/fracture/test_2p_fracture_fv.cc | 2 +- .../porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc | 2 +- .../2p/implicit/nonisothermal/test_2pni_fv.cc | 2 +- test/porousmediumflow/2pnc/implicit/test_2pnc_fv.cc | 4 +++- test/porousmediumflow/2pncmin/implicit/test_2pncmin_fv.cc | 2 +- test/porousmediumflow/3p/implicit/test_3p_fv.cc | 2 +- test/porousmediumflow/3p/implicit/test_3pni_fv_conduction.cc | 2 +- test/porousmediumflow/3p/implicit/test_3pni_fv_convection.cc | 2 +- test/porousmediumflow/mpnc/implicit/plotoverline2d.hh | 2 +- .../richards/implicit/test_ccrichardsanalytical.cc | 2 +- .../richards/implicit/test_richardslens_fv.cc | 2 +- .../richards/implicit/test_richardsniconduction_fv.cc | 2 +- .../richards/implicit/test_richardsniconvection_fv.cc | 2 +- .../richardsnc/implicit/test_richardsnc_fv.cc | 2 +- test/porousmediumflow/tracer/1ptracer/test_cctracer.cc | 2 +- 29 files changed, 31 insertions(+), 29 deletions(-) diff --git a/test/common/propertysystem/test_propertysystem.cc b/test/common/propertysystem/test_propertysystem.cc index 4a9226bfd2..eac026566c 100644 --- a/test/common/propertysystem/test_propertysystem.cc +++ b/test/common/propertysystem/test_propertysystem.cc @@ -27,7 +27,7 @@ */ #include <config.h> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties/propertysystem.hh> #include <iostream> diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc index 1e67b73e0b..250b484ff5 100644 --- a/test/material/fluidsystems/test_fluidsystems.cc +++ b/test/material/fluidsystems/test_fluidsystems.cc @@ -26,7 +26,7 @@ // include the property system just to make sure that all fluid system // type tag adapter behave nicely together -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include "checkfluidsystem.hh" diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p.cc b/test/porousmediumflow/1p/implicit/compressible/test_1p.cc index 2cce167e02..95ad097da3 100644 --- a/test/porousmediumflow/1p/implicit/compressible/test_1p.cc +++ b/test/porousmediumflow/1p/implicit/compressible/test_1p.cc @@ -36,7 +36,7 @@ #include <dumux/discretization/methods.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc index cf5ab4a23d..02188b793b 100644 --- a/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc +++ b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc b/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc index 28eec4a2bb..bbb75716af 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc +++ b/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc @@ -33,7 +33,7 @@ #include <dumux/linear/seqsolverbackend.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/nonlinear/newtonmethod.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc index c7cb58f5b7..e541556e9d 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc +++ b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc @@ -34,7 +34,7 @@ #include "1psingularityproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc index 1321385759..2ee38fd5bf 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc +++ b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc @@ -34,7 +34,7 @@ #include "1psingularityproblemtimedependent.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/test_1pfv.cc b/test/porousmediumflow/1p/implicit/test_1pfv.cc index c4fdf40a32..f6a3c02d0d 100644 --- a/test/porousmediumflow/1p/implicit/test_1pfv.cc +++ b/test/porousmediumflow/1p/implicit/test_1pfv.cc @@ -34,7 +34,7 @@ #include "1ptestproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc index ccf0b3ce2e..0a4bb5c0f1 100644 --- a/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc +++ b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc @@ -34,7 +34,7 @@ #include "fractureproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc index 087fce42d1..816bdc9ecf 100644 --- a/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc +++ b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc @@ -34,7 +34,7 @@ #include "tubesproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1p/implicit/test_1pnifv.cc b/test/porousmediumflow/1p/implicit/test_1pnifv.cc index 890a7ee15c..51dc2e67a3 100644 --- a/test/porousmediumflow/1p/implicit/test_1pnifv.cc +++ b/test/porousmediumflow/1p/implicit/test_1pnifv.cc @@ -35,7 +35,7 @@ #include "1pniconductionproblem.hh" #include "1pniconvectionproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1pnc/implicit/test_1p2c_fv.cc b/test/porousmediumflow/1pnc/implicit/test_1p2c_fv.cc index 10c8e66beb..4a48cf21f0 100644 --- a/test/porousmediumflow/1pnc/implicit/test_1p2c_fv.cc +++ b/test/porousmediumflow/1pnc/implicit/test_1p2c_fv.cc @@ -36,7 +36,7 @@ #include <dumux/discretization/methods.hh> - #include <dumux/common/propertysystem.hh> + #include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1pnc/implicit/test_1p2cni_conduction_fv.cc b/test/porousmediumflow/1pnc/implicit/test_1p2cni_conduction_fv.cc index 9e144faa29..f8dbb12f42 100644 --- a/test/porousmediumflow/1pnc/implicit/test_1p2cni_conduction_fv.cc +++ b/test/porousmediumflow/1pnc/implicit/test_1p2cni_conduction_fv.cc @@ -36,7 +36,7 @@ #include <dumux/discretization/methods.hh> - #include <dumux/common/propertysystem.hh> + #include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/1pnc/implicit/test_1p2cni_convection_fv.cc b/test/porousmediumflow/1pnc/implicit/test_1p2cni_convection_fv.cc index 71f424fcb6..67e5ebeb95 100644 --- a/test/porousmediumflow/1pnc/implicit/test_1p2cni_convection_fv.cc +++ b/test/porousmediumflow/1pnc/implicit/test_1p2cni_convection_fv.cc @@ -36,7 +36,7 @@ #include <dumux/discretization/methods.hh> - #include <dumux/common/propertysystem.hh> + #include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc index 3bb9db15fe..fa9b06a96e 100644 --- a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc +++ b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc @@ -34,7 +34,7 @@ #include "problem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc index 829bb307be..3d33bdf9b1 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc +++ b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc @@ -34,7 +34,7 @@ #include "problem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc index 50854b012b..745f082e94 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc +++ b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/2pnc/implicit/test_2pnc_fv.cc b/test/porousmediumflow/2pnc/implicit/test_2pnc_fv.cc index ee4326be28..85b68ee55d 100644 --- a/test/porousmediumflow/2pnc/implicit/test_2pnc_fv.cc +++ b/test/porousmediumflow/2pnc/implicit/test_2pnc_fv.cc @@ -32,7 +32,9 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include "fuelcellproblem.hh" + +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/2pncmin/implicit/test_2pncmin_fv.cc b/test/porousmediumflow/2pncmin/implicit/test_2pncmin_fv.cc index 7ea05e9f70..d5b313c23b 100644 --- a/test/porousmediumflow/2pncmin/implicit/test_2pncmin_fv.cc +++ b/test/porousmediumflow/2pncmin/implicit/test_2pncmin_fv.cc @@ -34,7 +34,7 @@ #include "dissolutionproblem.hh" -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/3p/implicit/test_3p_fv.cc b/test/porousmediumflow/3p/implicit/test_3p_fv.cc index f8bcf36e9a..86b28e07ad 100644 --- a/test/porousmediumflow/3p/implicit/test_3p_fv.cc +++ b/test/porousmediumflow/3p/implicit/test_3p_fv.cc @@ -32,7 +32,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/3p/implicit/test_3pni_fv_conduction.cc b/test/porousmediumflow/3p/implicit/test_3pni_fv_conduction.cc index c3be2c2f3c..7bef199e27 100644 --- a/test/porousmediumflow/3p/implicit/test_3pni_fv_conduction.cc +++ b/test/porousmediumflow/3p/implicit/test_3pni_fv_conduction.cc @@ -32,7 +32,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/3p/implicit/test_3pni_fv_convection.cc b/test/porousmediumflow/3p/implicit/test_3pni_fv_convection.cc index 15becc03f3..83b4c614f8 100644 --- a/test/porousmediumflow/3p/implicit/test_3pni_fv_convection.cc +++ b/test/porousmediumflow/3p/implicit/test_3pni_fv_convection.cc @@ -32,7 +32,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh index 6606bf0163..76e972aca3 100644 --- a/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh +++ b/test/porousmediumflow/mpnc/implicit/plotoverline2d.hh @@ -27,7 +27,7 @@ #define DUMUX_PLOTOVERLINE_2D_HH #include <dumux/common/valgrind.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dune/common/fvector.hh> #include <dune/common/fmatrix.hh> diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc index a0ebdd0332..40803b71e2 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc +++ b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc index dd81e7f93f..5eb49893ab 100644 --- a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc +++ b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc b/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc index a46a4dc46c..b1919d3871 100644 --- a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc +++ b/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc b/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc index aca9e19be8..6b4cb7c5b0 100644 --- a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc +++ b/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc b/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc index 3710a0bee5..dcfc91baf0 100644 --- a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc +++ b/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc @@ -34,7 +34,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> diff --git a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc index 3e30275de1..48cca469f1 100644 --- a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc +++ b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc @@ -35,7 +35,7 @@ #include <dune/grid/io/file/vtk.hh> #include <dune/istl/io.hh> -#include <dumux/common/propertysystem.hh> +#include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/valgrind.hh> #include <dumux/common/dumuxmessage.hh> -- GitLab