From 3a3e0d9eb47d35884700886015fce32d2353360a Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Fri, 15 Dec 2017 12:07:23 +0100 Subject: [PATCH] [2pncmin] Remove implicit folder level --- dumux/porousmediumflow/2pncmin/CMakeLists.txt | 6 +++++- dumux/porousmediumflow/2pncmin/implicit/CMakeLists.txt | 5 ----- dumux/porousmediumflow/2pncmin/{implicit => }/model.hh | 0 .../porousmediumflow/2pncmin/implicit/dissolutionproblem.hh | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 dumux/porousmediumflow/2pncmin/implicit/CMakeLists.txt rename dumux/porousmediumflow/2pncmin/{implicit => }/model.hh (100%) diff --git a/dumux/porousmediumflow/2pncmin/CMakeLists.txt b/dumux/porousmediumflow/2pncmin/CMakeLists.txt index ba8341c614..674234de90 100644 --- a/dumux/porousmediumflow/2pncmin/CMakeLists.txt +++ b/dumux/porousmediumflow/2pncmin/CMakeLists.txt @@ -1 +1,5 @@ -add_subdirectory("implicit") + +#install headers +install(FILES +model.hh +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pncmin) diff --git a/dumux/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/dumux/porousmediumflow/2pncmin/implicit/CMakeLists.txt deleted file mode 100644 index 46ffae2a1d..0000000000 --- a/dumux/porousmediumflow/2pncmin/implicit/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -#install headers -install(FILES -model.hh -DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pncmin/implicit) diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/model.hh similarity index 100% rename from dumux/porousmediumflow/2pncmin/implicit/model.hh rename to dumux/porousmediumflow/2pncmin/model.hh diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh index 840a9f66c5..a901fe2fbe 100644 --- a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh +++ b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh @@ -27,7 +27,7 @@ #include <dumux/discretization/methods.hh> #include <dumux/discretization/cellcentered/tpfa/properties.hh> #include <dumux/discretization/box/properties.hh> -#include <dumux/porousmediumflow/2pncmin/implicit/model.hh> +#include <dumux/porousmediumflow/2pncmin/model.hh> #include <dumux/porousmediumflow/problem.hh> #include <dumux/material/fluidsystems/brineair.hh> -- GitLab