From 43473a7dfdfb5877a662e87a2fb6b79abede5541 Mon Sep 17 00:00:00 2001
From: DennisGlaeser <dennis.glaeser@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 16:06:21 +0100
Subject: [PATCH] [2p] remove implicit folder layer
---
dumux/porousmediumflow/2p/CMakeLists.txt | 12 +++++++++++-
.../2p/{implicit => }/gridadaptindicator.hh | 0
.../2p/{implicit => }/griddatatransfer.hh | 0
dumux/porousmediumflow/2p/implicit/CMakeLists.txt | 11 -----------
.../2p/{implicit => }/incompressiblelocalresidual.hh | 0
dumux/porousmediumflow/2p/{implicit => }/indices.hh | 0
dumux/porousmediumflow/2p/{implicit => }/model.hh | 0
.../2p/{implicit => }/volumevariables.hh | 0
.../2p/{implicit => }/vtkoutputfields.hh | 0
.../2p/implicit/adaptive/test_2p_adaptive_fv.cc | 4 ++--
.../porousmediumflow/2p/implicit/fracture/problem.hh | 2 +-
.../2p/implicit/fracture/spatialparams.hh | 2 +-
.../2p/implicit/incompressible/problem.hh | 4 ++--
.../2p/implicit/nonisothermal/problem.hh | 2 +-
14 files changed, 18 insertions(+), 19 deletions(-)
rename dumux/porousmediumflow/2p/{implicit => }/gridadaptindicator.hh (100%)
rename dumux/porousmediumflow/2p/{implicit => }/griddatatransfer.hh (100%)
delete mode 100644 dumux/porousmediumflow/2p/implicit/CMakeLists.txt
rename dumux/porousmediumflow/2p/{implicit => }/incompressiblelocalresidual.hh (100%)
rename dumux/porousmediumflow/2p/{implicit => }/indices.hh (100%)
rename dumux/porousmediumflow/2p/{implicit => }/model.hh (100%)
rename dumux/porousmediumflow/2p/{implicit => }/volumevariables.hh (100%)
rename dumux/porousmediumflow/2p/{implicit => }/vtkoutputfields.hh (100%)
diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index fffa571735..eb9ba57fa2 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -1,2 +1,12 @@
-add_subdirectory("implicit")
add_subdirectory("sequential")
+
+#install headers
+install(FILES
+adaptionhelper.hh
+gridadaptindicator.hh
+indices.hh
+incompressiblelocalresidual.hh
+model.hh
+volumevariables.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/implicit)
diff --git a/dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh
rename to dumux/porousmediumflow/2p/gridadaptindicator.hh
diff --git a/dumux/porousmediumflow/2p/implicit/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/griddatatransfer.hh
rename to dumux/porousmediumflow/2p/griddatatransfer.hh
diff --git a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
deleted file mode 100644
index b2016e5eaf..0000000000
--- a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#install headers
-install(FILES
-adaptionhelper.hh
-gridadaptindicator.hh
-indices.hh
-incompressiblelocalresidual.hh
-model.hh
-volumevariables.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/implicit)
diff --git a/dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh
rename to dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
diff --git a/dumux/porousmediumflow/2p/implicit/indices.hh b/dumux/porousmediumflow/2p/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/indices.hh
rename to dumux/porousmediumflow/2p/indices.hh
diff --git a/dumux/porousmediumflow/2p/implicit/model.hh b/dumux/porousmediumflow/2p/model.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/model.hh
rename to dumux/porousmediumflow/2p/model.hh
diff --git a/dumux/porousmediumflow/2p/implicit/volumevariables.hh b/dumux/porousmediumflow/2p/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/volumevariables.hh
rename to dumux/porousmediumflow/2p/volumevariables.hh
diff --git a/dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/2p/vtkoutputfields.hh
diff --git a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
index c4cdb0d485..647253bb60 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
+++ b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
@@ -51,8 +51,8 @@
#include <dumux/adaptive/adapt.hh>
#include <dumux/adaptive/markelements.hh>
#include <dumux/adaptive/initializationindicator.hh>
-#include <dumux/porousmediumflow/2p/implicit/griddatatransfer.hh>
-#include <dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh>
+#include <dumux/porousmediumflow/2p/griddatatransfer.hh>
+#include <dumux/porousmediumflow/2p/gridadaptindicator.hh>
//! Use the incompressible or point source problem for this adaptive test
#include <test/porousmediumflow/2p/implicit/incompressible/problem.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 4cb0083d80..465f7b9266 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -30,7 +30,7 @@
#include <dumux/material/fluidsystems/2pimmiscible.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/discretization/cellcentered/tpfa/properties.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 18d8a3122c..7c74e7e578 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -30,7 +30,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
namespace Dumux
{
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 5acd0b3f31..37e3b3f7c7 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -33,8 +33,8 @@
#include <dumux/material/fluidsystems/2pimmiscible.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
-#include <dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
+#include <dumux/porousmediumflow/2p/incompressiblelocalresidual.hh>
#include "spatialparams.hh"
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index 36684c445f..2c96922741 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -28,7 +28,7 @@
#define DUMUX_INJECTION_PROBLEM_2PNI_HH
#include <dumux/common/properties.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/discretization/box/properties.hh>
--
GitLab