From 380a3adb0cfd60f3ee1b7c124d1842dc020115b1 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 13:46:45 +0100
Subject: [PATCH] [3p3c] Remove implicit folder level

---
 dumux/porousmediumflow/3p3c/CMakeLists.txt            | 11 ++++++++++-
 dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt   | 10 ----------
 dumux/porousmediumflow/3p3c/{implicit => }/indices.hh |  0
 .../3p3c/{implicit => }/localresidual.hh              |  0
 dumux/porousmediumflow/3p3c/{implicit => }/model.hh   |  0
 .../3p3c/{implicit => }/primaryvariableswitch.hh      |  0
 .../3p3c/{implicit => }/volumevariables.hh            |  0
 .../3p3c/{implicit => }/vtkoutputfields.hh            |  0
 dumux/porousmediumflow/3pwateroil/localresidual.hh    |  2 +-
 .../3p3c/implicit/columnxylolproblem.hh               |  2 +-
 .../3p3c/implicit/infiltration3p3cproblem.hh          |  2 +-
 .../porousmediumflow/3p3c/implicit/kuevetteproblem.hh |  2 +-
 .../3p3c/implicit/kuevettespatialparams.hh            |  1 -
 13 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt
 rename dumux/porousmediumflow/3p3c/{implicit => }/indices.hh (100%)
 rename dumux/porousmediumflow/3p3c/{implicit => }/localresidual.hh (100%)
 rename dumux/porousmediumflow/3p3c/{implicit => }/model.hh (100%)
 rename dumux/porousmediumflow/3p3c/{implicit => }/primaryvariableswitch.hh (100%)
 rename dumux/porousmediumflow/3p3c/{implicit => }/volumevariables.hh (100%)
 rename dumux/porousmediumflow/3p3c/{implicit => }/vtkoutputfields.hh (100%)

diff --git a/dumux/porousmediumflow/3p3c/CMakeLists.txt b/dumux/porousmediumflow/3p3c/CMakeLists.txt
index ba8341c614..71205887e3 100644
--- a/dumux/porousmediumflow/3p3c/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p3c/CMakeLists.txt
@@ -1 +1,10 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+indices.hh
+localresidual.hh
+model.hh
+primaryvariableswitch.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p3c)
diff --git a/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt b/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt
deleted file mode 100644
index 296992e3c5..0000000000
--- a/dumux/porousmediumflow/3p3c/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#install headers
-install(FILES
-indices.hh
-localresidual.hh
-model.hh
-primaryvariableswitch.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/3p3c/implicit)
diff --git a/dumux/porousmediumflow/3p3c/implicit/indices.hh b/dumux/porousmediumflow/3p3c/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/indices.hh
rename to dumux/porousmediumflow/3p3c/indices.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/localresidual.hh
rename to dumux/porousmediumflow/3p3c/localresidual.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/model.hh b/dumux/porousmediumflow/3p3c/model.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/model.hh
rename to dumux/porousmediumflow/3p3c/model.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/primaryvariableswitch.hh
rename to dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/volumevariables.hh b/dumux/porousmediumflow/3p3c/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/volumevariables.hh
rename to dumux/porousmediumflow/3p3c/volumevariables.hh
diff --git a/dumux/porousmediumflow/3p3c/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/3p3c/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/3p3c/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 38453d6000..a105a2ea3e 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -26,7 +26,7 @@
 #define DUMUX_3P2CNI_LOCAL_RESIDUAL_HH
 
 #include "properties.hh"
-#include <dumux/porousmediumflow/3p3c/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/3p3c/localresidual.hh>
 
 namespace Dumux
 {
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index 04d8d72321..59048496ef 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/material/fluidsystems/h2oairxylene.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include "columnxylolspatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
index c000069609..8ef587d804 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
@@ -28,7 +28,7 @@
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 
 #include "infiltration3p3cspatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index 4d06688987..1a506398c0 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
-#include <dumux/porousmediumflow/3p3c/implicit/model.hh>
+#include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include "kuevettespatialparams.hh"
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index 316810e456..363ed81161 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -26,7 +26,6 @@
 
 #include <dune/common/float_cmp.hh>
 
-#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
-- 
GitLab