From d537d1ec1dfde108152f8aff2a917bfdfaab0817 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 12:19:49 +0100
Subject: [PATCH] [3p] Remove implicit folder layer

---
 dumux/porousmediumflow/3p/CMakeLists.txt                 | 9 ++++++++-
 dumux/porousmediumflow/3p/implicit/CMakeLists.txt        | 8 --------
 dumux/porousmediumflow/3p/{implicit => }/indices.hh      | 0
 dumux/porousmediumflow/3p/{implicit => }/model.hh        | 0
 .../3p/{implicit => }/volumevariables.hh                 | 0
 .../3p/{implicit => }/vtkoutputfields.hh                 | 0
 .../3p/implicit/3pniconductionproblem.hh                 | 2 +-
 .../3p/implicit/3pniconvectionproblem.hh                 | 2 +-
 .../3p/implicit/infiltration3pproblem.hh                 | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 dumux/porousmediumflow/3p/implicit/CMakeLists.txt
 rename dumux/porousmediumflow/3p/{implicit => }/indices.hh (100%)
 rename dumux/porousmediumflow/3p/{implicit => }/model.hh (100%)
 rename dumux/porousmediumflow/3p/{implicit => }/volumevariables.hh (100%)
 rename dumux/porousmediumflow/3p/{implicit => }/vtkoutputfields.hh (100%)

diff --git a/dumux/porousmediumflow/3p/CMakeLists.txt b/dumux/porousmediumflow/3p/CMakeLists.txt
index ba8341c614..051356e5b0 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 48f1bbb375..0000000000
--- 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 48568447d9..5656c03afd 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 bed0617a8d..143dbd45a7 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 18a4f6c27a..c12c6c66d6 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>
 
-- 
GitLab