diff --git a/dumux/porousmediumflow/3p/CMakeLists.txt b/dumux/porousmediumflow/3p/CMakeLists.txt index ba8341c614f1a2c797c95f5402f602025f1087b1..051356e5b04d2a83a737a24b4d7e10f8569a2eb6 100644 --- a/dumux/porousmediumflow/3p/CMakeLists.txt +++ b/dumux/porousmediumflow/3p/CMakeLists.txt @@ -1 +1,8 @@ -add_subdirectory("implicit") + +#install headers +install(FILES +indices.hh +model.hh +volumevariables.hh +vtkoutputfields.hh +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p) diff --git a/dumux/porousmediumflow/3p/implicit/CMakeLists.txt b/dumux/porousmediumflow/3p/implicit/CMakeLists.txt deleted file mode 100644 index 48f1bbb3758600a78248f419aaee6d68d76f4363..0000000000000000000000000000000000000000 --- a/dumux/porousmediumflow/3p/implicit/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ - -#install headers -install(FILES -indices.hh -model.hh -volumevariables.hh -vtkoutputfields.hh -DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p/implicit) diff --git a/dumux/porousmediumflow/3p/implicit/indices.hh b/dumux/porousmediumflow/3p/indices.hh similarity index 100% rename from dumux/porousmediumflow/3p/implicit/indices.hh rename to dumux/porousmediumflow/3p/indices.hh diff --git a/dumux/porousmediumflow/3p/implicit/model.hh b/dumux/porousmediumflow/3p/model.hh similarity index 100% rename from dumux/porousmediumflow/3p/implicit/model.hh rename to dumux/porousmediumflow/3p/model.hh diff --git a/dumux/porousmediumflow/3p/implicit/volumevariables.hh b/dumux/porousmediumflow/3p/volumevariables.hh similarity index 100% rename from dumux/porousmediumflow/3p/implicit/volumevariables.hh rename to dumux/porousmediumflow/3p/volumevariables.hh diff --git a/dumux/porousmediumflow/3p/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/3p/vtkoutputfields.hh similarity index 100% rename from dumux/porousmediumflow/3p/implicit/vtkoutputfields.hh rename to dumux/porousmediumflow/3p/vtkoutputfields.hh diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh index 48568447d9c5fa4074e43b1b27d8426d700b2d80..5656c03afddd0bb0a7d74ba0614579f8ab39ab84 100644 --- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh +++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh @@ -30,7 +30,7 @@ #include <dumux/discretization/cellcentered/mpfa/properties.hh> #include <dumux/discretization/box/properties.hh> #include <dumux/porousmediumflow/problem.hh> -#include <dumux/porousmediumflow/3p/implicit/model.hh> +#include <dumux/porousmediumflow/3p/model.hh> #include <dumux/material/fluidsystems/h2oairmesitylene.hh> #include <dumux/material/components/h2o.hh> #include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh> diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh index bed0617a8dd8d669840904deede0b08cf46aa4de..143dbd45a7bcbdcfdb7f786958ec252c23afdd4c 100644 --- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh +++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh @@ -30,7 +30,7 @@ #include <dumux/discretization/cellcentered/mpfa/properties.hh> #include <dumux/discretization/box/properties.hh> #include <dumux/porousmediumflow/problem.hh> -#include <dumux/porousmediumflow/3p/implicit/model.hh> +#include <dumux/porousmediumflow/3p/model.hh> #include <dumux/material/fluidsystems/h2oairmesitylene.hh> #include <dumux/material/components/h2o.hh> #include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh> diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh index 18a4f6c27a116724b125ebb068a26ab0fe98da88..c12c6c66d6be66b70b1aee7e5b301d3efe1e2eaf 100644 --- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh +++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh @@ -29,7 +29,7 @@ #include <dumux/discretization/box/properties.hh> #include <dumux/discretization/methods.hh> #include <dumux/porousmediumflow/problem.hh> -#include <dumux/porousmediumflow/3p/implicit/model.hh> +#include <dumux/porousmediumflow/3p/model.hh> #include <dumux/material/fluidsystems/h2oairmesitylene.hh> #include <dumux/linear/seqsolverbackend.hh>