From 6c386da0677bfb524ae33c7f15ec06de1937cd67 Mon Sep 17 00:00:00 2001
From: DennisGlaeser <dennis.glaeser@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 16:32:14 +0100
Subject: [PATCH] [2p2c] remove implicit folder level

---
 dumux/porousmediumflow/2p2c/CMakeLists.txt             | 10 +++++++++-
 dumux/porousmediumflow/2p2c/implicit/CMakeLists.txt    |  9 ---------
 dumux/porousmediumflow/2p2c/{implicit => }/indices.hh  |  0
 dumux/porousmediumflow/2p2c/{implicit => }/model.hh    |  0
 .../2p2c/{implicit => }/primaryvariableswitch.hh       |  0
 .../2p2c/{implicit => }/volumevariables.hh             |  0
 .../2p2c/{implicit => }/vtkoutputfields.hh             |  0
 dumux/porousmediumflow/co2/model.hh                    |  2 +-
 dumux/porousmediumflow/co2/volumevariables.hh          |  2 +-
 .../porousmediumflow/2p2c/implicit/injectionproblem.hh |  2 +-
 test/porousmediumflow/2p2c/implicit/waterairproblem.hh |  2 +-
 11 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 dumux/porousmediumflow/2p2c/implicit/CMakeLists.txt
 rename dumux/porousmediumflow/2p2c/{implicit => }/indices.hh (100%)
 rename dumux/porousmediumflow/2p2c/{implicit => }/model.hh (100%)
 rename dumux/porousmediumflow/2p2c/{implicit => }/primaryvariableswitch.hh (100%)
 rename dumux/porousmediumflow/2p2c/{implicit => }/volumevariables.hh (100%)
 rename dumux/porousmediumflow/2p2c/{implicit => }/vtkoutputfields.hh (100%)

diff --git a/dumux/porousmediumflow/2p2c/CMakeLists.txt b/dumux/porousmediumflow/2p2c/CMakeLists.txt
index fffa571735..fafacd7528 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 c82d27e1be..0000000000
--- 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 cfdf7213ba..3e1be29fa3 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 5b54678fbe..e6bcc145dc 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 a0e1860015..57d5c6a999 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 0eb5459ada..8e19a4831b 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"
-- 
GitLab