diff --git a/dumux/porousmediumflow/2p2c/CMakeLists.txt b/dumux/porousmediumflow/2p2c/CMakeLists.txt index fffa571735a25e9bb52347bd7e142ac034ac7c5d..fafacd7528c269971f92f47edfb001c54c1a09c9 100644 --- a/dumux/porousmediumflow/2p2c/CMakeLists.txt +++ b/dumux/porousmediumflow/2p2c/CMakeLists.txt @@ -1,2 +1,10 @@ -add_subdirectory("implicit") add_subdirectory("sequential") + +#install headers +install(FILES +indices.hh +model.hh +primaryvariableswitch.hh +volumevariables.hh +vtkoutputfields.hh +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/implicit) diff --git a/dumux/porousmediumflow/2p2c/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p2c/implicit/CMakeLists.txt deleted file mode 100644 index c82d27e1be81e846ad1687bc3769017f864cd74a..0000000000000000000000000000000000000000 --- a/dumux/porousmediumflow/2p2c/implicit/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -#install headers -install(FILES -indices.hh -model.hh -primaryvariableswitch.hh -volumevariables.hh -vtkoutputfields.hh -DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/implicit) diff --git a/dumux/porousmediumflow/2p2c/implicit/indices.hh b/dumux/porousmediumflow/2p2c/indices.hh similarity index 100% rename from dumux/porousmediumflow/2p2c/implicit/indices.hh rename to dumux/porousmediumflow/2p2c/indices.hh diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/model.hh similarity index 100% rename from dumux/porousmediumflow/2p2c/implicit/model.hh rename to dumux/porousmediumflow/2p2c/model.hh diff --git a/dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh similarity index 100% rename from dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh rename to dumux/porousmediumflow/2p2c/primaryvariableswitch.hh diff --git a/dumux/porousmediumflow/2p2c/implicit/volumevariables.hh b/dumux/porousmediumflow/2p2c/volumevariables.hh similarity index 100% rename from dumux/porousmediumflow/2p2c/implicit/volumevariables.hh rename to dumux/porousmediumflow/2p2c/volumevariables.hh diff --git a/dumux/porousmediumflow/2p2c/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p2c/vtkoutputfields.hh similarity index 100% rename from dumux/porousmediumflow/2p2c/implicit/vtkoutputfields.hh rename to dumux/porousmediumflow/2p2c/vtkoutputfields.hh diff --git a/dumux/porousmediumflow/co2/model.hh b/dumux/porousmediumflow/co2/model.hh index cfdf7213ba0d3843cef76cac6c534f4d901e74c6..3e1be29fa3c67f5f608cccb4d663f72bb5b55911 100644 --- a/dumux/porousmediumflow/co2/model.hh +++ b/dumux/porousmediumflow/co2/model.hh @@ -25,7 +25,7 @@ #define DUMUX_TWOP_TWOC_CO2_MODEL_HH #include <dumux/common/properties.hh> -#include <dumux/porousmediumflow/2p2c/implicit/model.hh> +#include <dumux/porousmediumflow/2p2c/model.hh> #include "primaryvariableswitch.hh" #include "volumevariables.hh" diff --git a/dumux/porousmediumflow/co2/volumevariables.hh b/dumux/porousmediumflow/co2/volumevariables.hh index 5b54678fbe486814c11ebec7125aeb120e17cc37..e6bcc145dcfc31ecc6e93da71c79b26066e6fab7 100644 --- a/dumux/porousmediumflow/co2/volumevariables.hh +++ b/dumux/porousmediumflow/co2/volumevariables.hh @@ -26,7 +26,7 @@ #define DUMUX_CO2_VOLUME_VARIABLES_HH #include <dumux/common/properties.hh> -#include <dumux/porousmediumflow/2p2c/implicit/volumevariables.hh> +#include <dumux/porousmediumflow/2p2c/volumevariables.hh> namespace Dumux { diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh index a0e186001552d26b96428de4559d5c7d4dc1f147..57d5c6a9995b9e6c5fd15c8f10180b938711996d 100644 --- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh +++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh @@ -29,7 +29,7 @@ #include <dumux/discretization/box/properties.hh> #include <dumux/porousmediumflow/problem.hh> -#include <dumux/porousmediumflow/2p2c/implicit/model.hh> +#include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/material/fluidsystems/h2on2.hh> #include "injectionspatialparams.hh" diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh index 0eb5459ada6b0fc8f80a78c687b67b5a3307e57b..8e19a4831b925773a692b5b4c8f3902104483fb6 100644 --- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh +++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh @@ -31,7 +31,7 @@ #include <dumux/material/components/n2.hh> #include <dumux/material/fluidsystems/h2on2.hh> -#include <dumux/porousmediumflow/2p2c/implicit/model.hh> +#include <dumux/porousmediumflow/2p2c/model.hh> #include <dumux/porousmediumflow/problem.hh> #include "waterairspatialparams.hh"