diff --git a/test/common/propertysystem/test_propertysystem.cc b/test/common/propertysystem/test_propertysystem.cc index 4a9226bfd21532e691923c579104f2d6324a88ab..eac026566cb820c19f32491addde3a5c317e38ef 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 1e67b73e0ba071f3dbacd5cb2dab72d60ea30602..250b484ff5843b88725fe397f65d99155e1d2380 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 2cce167e02338923a15e8365d49ed31e4311050b..95ad097da3f9ce5af7822d725c7b15a93d4c22e0 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 cf5ab4a23dfcf8a9a9c588bd0da69759229a567a..02188b793bc3a2814a0c9bb04442443582af1461 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 28eec4a2bbb7e3eeb4ac767b98bd970b0c0d43e3..bbb75716afc0ae3e5bbe7d53b9766999289c1961 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 c7cb58f5b7e909852cdb8c566235fd827a93ca53..e541556e9d32db7620131731e3c4848c2bd5687a 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 1321385759424ed61971b250f1122dc801ea298e..2ee38fd5bf0ca23d5cc5ddab4e17befdcf286e8e 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 c4fdf40a325eeff94775ccfb878e5c975156d02c..f6a3c02d0d2754751c30ce7dd08b39faecf289c0 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 ccf0b3ce2e7940c5e17a1d8178d6ff8149a7463e..0a4bb5c0f1a9692b0d5ac26f24cf22399a127274 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 087fce42d10b2ad7266d395f7f48e771aacc7e0b..816bdc9ecfae8468a5c2823c9bf6c9a7ed1f5860 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 890a7ee15cd82f302985e470a3844fd94dfd989e..51dc2e67a34b3ed2ded50b58845a1478f0dde7f8 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 10c8e66beb2d5a8c1c4043dd72c2c248fb9a47e3..4a48cf21f0a5b90b490481ee409f76d1be8fc33d 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 9e144faa29ad53955f325ef04d73005044bd64d3..f8dbb12f423ff3669c69c9e657e794fae36badf2 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 71f424fcb6da78b7808fa1c1ce01b301a4ab2a89..67e5ebeb9523a313ed425050551f5cfc8da2ef8c 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 3bb9db15fe5ab456c794a2a47b8f59cdad00d195..fa9b06a96e1ae01f2524d2d65866ad12730a190b 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 829bb307be560e70832f611b34338c3468881ea1..3d33bdf9b1649e5136a0c35833fd1b9fbba7d5dc 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 50854b012bfd032bf870bce0561f93c71cb55070..745f082e940c4beb0f3ecb392380c50384eab06d 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 ee4326be28e12e16bd2242fbb678b0e9bcd7f9da..85b68ee55df7a1a87d0fd24c1832407884677ee7 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 7ea05e9f70c3a8db1ea218dce9c8d7fb50f94ee2..d5b313c23b7860a0dc762856c2843e2f3f726ea3 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 f8bcf36e9ab7d8845ddb1c9447ae9e5cbeca45bc..86b28e07ad8287ce341c0b3c2d1a0e846dac46fa 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 c3be2c2f3c5b62316679e84af87210f6e715aa11..7bef199e27a64a9fedb8e488de6457b15bb9aca4 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 15becc03f3da1d00f49c5f6359a76f4bb2a94284..83b4c614f8cd67fb8b84230978c2e2b6979ef523 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 6606bf0163bd34cd85dd65fa9d59d7a05162a11c..76e972aca3ca52e97b0fc5a81fea5e4710342a4d 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 a0ebdd0332eb64174b865884c5d65be16853fb1c..40803b71e2ca04ee2943663fedfa4c2328712214 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 dd81e7f93ff38fa76eaddc68c72a6cbdb16d0f39..5eb49893abfb979d8e3bf764305014cb6988d607 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 a46a4dc46c7458ba03c90d8f09768775ba9bad2e..b1919d3871b5f1a6f8b00ea88070cfdc6e48a882 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 aca9e19be86c9ddef5ee247968f345bdc8470866..6b4cb7c5b078c0e5742f27197b00006beb52776f 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 3710a0bee5e40cc237f94cfd320bc1331086060e..dcfc91baf0c321b8dbb067a699a75f6ae21b8017 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 3e30275de19ab28bfd957d208d892b98b62dfd05..48cca469f1d1388ff0ef8b2cfe4956c32ce6bdd0 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>