From e3a17cc456549657a142fd23232f69217af0de12 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 12:03:23 +0100
Subject: [PATCH] [2pnc] Remove implicit folder level

---
 dumux/porousmediumflow/2pnc/CMakeLists.txt            | 11 ++++++++++-
 dumux/porousmediumflow/2pnc/implicit/CMakeLists.txt   | 10 ----------
 dumux/porousmediumflow/2pnc/{implicit => }/indices.hh |  0
 dumux/porousmediumflow/2pnc/{implicit => }/model.hh   |  0
 .../2pnc/{implicit => }/primaryvariableswitch.hh      |  0
 .../2pnc/{implicit => }/volumevariables.hh            |  0
 .../2pnc/{implicit => }/vtkoutputfields.hh            |  0
 dumux/porousmediumflow/2pncmin/implicit/model.hh      |  2 +-
 .../porousmediumflow/2pnc/implicit/fuelcellproblem.hh |  2 +-
 .../2pnc/implicit/fuelcellspatialparams.hh            |  1 -
 10 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 dumux/porousmediumflow/2pnc/implicit/CMakeLists.txt
 rename dumux/porousmediumflow/2pnc/{implicit => }/indices.hh (100%)
 rename dumux/porousmediumflow/2pnc/{implicit => }/model.hh (100%)
 rename dumux/porousmediumflow/2pnc/{implicit => }/primaryvariableswitch.hh (100%)
 rename dumux/porousmediumflow/2pnc/{implicit => }/volumevariables.hh (100%)
 rename dumux/porousmediumflow/2pnc/{implicit => }/vtkoutputfields.hh (100%)

diff --git a/dumux/porousmediumflow/2pnc/CMakeLists.txt b/dumux/porousmediumflow/2pnc/CMakeLists.txt
index ba8341c614..612765aa72 100644
--- a/dumux/porousmediumflow/2pnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pnc/CMakeLists.txt
@@ -1 +1,10 @@
-add_subdirectory("implicit")
+
+#install headers
+install(FILES
+indices.hh
+model.hh
+newtoncontroller.hh
+primaryvariableswitch.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pnc)
diff --git a/dumux/porousmediumflow/2pnc/implicit/CMakeLists.txt b/dumux/porousmediumflow/2pnc/implicit/CMakeLists.txt
deleted file mode 100644
index 42ee6246fa..0000000000
--- a/dumux/porousmediumflow/2pnc/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#install headers
-install(FILES
-indices.hh
-model.hh
-newtoncontroller.hh
-primaryvariableswitch.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pnc/implicit)
diff --git a/dumux/porousmediumflow/2pnc/implicit/indices.hh b/dumux/porousmediumflow/2pnc/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/2pnc/implicit/indices.hh
rename to dumux/porousmediumflow/2pnc/indices.hh
diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/model.hh
similarity index 100%
rename from dumux/porousmediumflow/2pnc/implicit/model.hh
rename to dumux/porousmediumflow/2pnc/model.hh
diff --git a/dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
similarity index 100%
rename from dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh
rename to dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh b/dumux/porousmediumflow/2pnc/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
rename to dumux/porousmediumflow/2pnc/volumevariables.hh
diff --git a/dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/2pnc/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index 57f0062548..3086a9cd10 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -92,7 +92,7 @@
 #ifndef DUMUX_2PNCMIN_MODEL_HH
 #define DUMUX_2PNCMIN_MODEL_HH
 
-#include <dumux/porousmediumflow/2pnc/implicit/model.hh>
+#include <dumux/porousmediumflow/2pnc/model.hh>
 #include <dumux/porousmediumflow/mineralization/model.hh>
 
 namespace Dumux
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index 232cf172f3..c1a1c67755 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -26,7 +26,7 @@
 
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
-#include <dumux/porousmediumflow/2pnc/implicit/model.hh>
+#include <dumux/porousmediumflow/2pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/h2on2o2.hh>
 #include <dumux/material/chemistry/electrochemistry/electrochemistry.hh>
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index 255da0f8e9..f5bda20671 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -31,7 +31,6 @@
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh>
-#include <dumux/porousmediumflow/2pnc/implicit/model.hh>
 
 namespace Dumux
 {
-- 
GitLab