From 89dbce3eba1bbc9b06216c199b891bf7e55a628d Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 16 Jan 2021 14:40:34 +0100
Subject: [PATCH] [test][2p] Dissolve implicit folder
---
test/porousmediumflow/2p/CMakeLists.txt | 8 +++++++-
.../2p/{implicit => }/adaptive/CMakeLists.txt | 0
.../{implicit => }/adaptive/initialsolutionbox.txt | 0
.../{implicit => }/adaptive/initialsolutioncc.txt | 0
.../2p/{implicit => }/adaptive/main.cc | 2 +-
.../2p/{implicit => }/adaptive/params.input | 0
.../{implicit => }/adaptive/pointsourceproblem.hh | 0
.../2p/{implicit => }/adaptive/problem.hh | 0
.../2p/{implicit => }/boxdfm/CMakeLists.txt | 0
.../2p/{implicit => }/boxdfm/grids/durlofsky.geo | 0
.../2p/{implicit => }/boxdfm/grids/durlofsky.msh | 0
.../2p/{implicit => }/boxdfm/grids/quads_2d.geo | 0
.../2p/{implicit => }/boxdfm/grids/quads_2d.msh | 0
.../2p/{implicit => }/boxdfm/grids/tets_3d.geo | 0
.../2p/{implicit => }/boxdfm/grids/tets_3d.msh | 0
.../2p/{implicit => }/boxdfm/main.cc | 0
.../2p/{implicit => }/boxdfm/params.input | 0
.../2p/{implicit => }/boxdfm/problem.hh | 0
.../2p/{implicit => }/boxdfm/spatialparams.hh | 0
.../2p/{implicit => }/cornerpoint/CMakeLists.txt | 0
.../cornerpoint/grids/hardsmall.grdecl | 0
.../2p/{implicit => }/cornerpoint/main.cc | 0
.../2p/{implicit => }/cornerpoint/params.input | 0
.../2p/{implicit => }/cornerpoint/problem.hh | 0
.../2p/{implicit => }/cornerpoint/spatialparams.hh | 0
.../2p/{implicit => }/fracture/CMakeLists.txt | 0
.../dt/test_2p_fracture_box_dt-reference.dat | 0
.../test_2p_fracture_gravity_box_dt-reference.dat | 0
.../test_2p_fracture_gravity_mpfa_dt-reference.dat | 0
.../test_2p_fracture_gravity_tpfa_dt-reference.dat | 0
.../dt/test_2p_fracture_mpfa_dt-reference.dat | 0
.../dt/test_2p_fracture_tpfa_dt-reference.dat | 0
.../2p/{implicit => }/fracture/grids/fracture.geo | 0
.../2p/{implicit => }/fracture/grids/fracture.msh | 0
.../2p/{implicit => }/fracture/main.cc | 0
.../2p/{implicit => }/fracture/params.input | 0
.../2p/{implicit => }/fracture/problem.hh | 0
.../2p/{implicit => }/fracture/spatialparams.hh | 0
test/porousmediumflow/2p/implicit/CMakeLists.txt | 7 -------
.../2p/{implicit => }/incompressible/CMakeLists.txt | 0
.../2p/{implicit => }/incompressible/main.cc | 0
.../2p/{implicit => }/incompressible/params.input | 0
.../2p/{implicit => }/incompressible/problem.hh | 0
.../{implicit => }/incompressible/spatialparams.hh | 0
.../2p/{implicit => }/nonisothermal/CMakeLists.txt | 0
.../2p/{implicit => }/nonisothermal/main.cc | 0
.../2p/{implicit => }/nonisothermal/params.input | 0
.../2p/{implicit => }/nonisothermal/problem.hh | 2 +-
.../{implicit => }/rotationsymmetry/CMakeLists.txt | 0
.../2p/{implicit => }/rotationsymmetry/dome.geo | 0
.../2p/{implicit => }/rotationsymmetry/dome.msh | 0
.../2p/{implicit => }/rotationsymmetry/main.cc | 0
.../2p/{implicit => }/rotationsymmetry/params.input | 0
.../2p/{implicit => }/rotationsymmetry/problem.hh | 0
.../{implicit => }/rotationsymmetry/properties.hh | 0
.../2p/{implicit => }/rotationsymmetry/solution.png | Bin
.../rotationsymmetry/spatialparams.hh | 0
test/porousmediumflow/tracer/2ptracer/main.cc | 2 +-
58 files changed, 10 insertions(+), 11 deletions(-)
rename test/porousmediumflow/2p/{implicit => }/adaptive/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/initialsolutionbox.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/initialsolutioncc.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/main.cc (99%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/pointsourceproblem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/adaptive/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/durlofsky.geo (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/durlofsky.msh (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/quads_2d.geo (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/quads_2d.msh (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/tets_3d.geo (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/grids/tets_3d.msh (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/boxdfm/spatialparams.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/grids/hardsmall.grdecl (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/cornerpoint/spatialparams.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_box_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/grids/fracture.geo (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/grids/fracture.msh (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/fracture/spatialparams.hh (100%)
delete mode 100644 test/porousmediumflow/2p/implicit/CMakeLists.txt
rename test/porousmediumflow/2p/{implicit => }/incompressible/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/incompressible/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/incompressible/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/incompressible/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/incompressible/spatialparams.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/nonisothermal/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/nonisothermal/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/nonisothermal/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/nonisothermal/problem.hh (99%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/CMakeLists.txt (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/dome.geo (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/dome.msh (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/main.cc (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/params.input (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/problem.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/properties.hh (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/solution.png (100%)
rename test/porousmediumflow/2p/{implicit => }/rotationsymmetry/spatialparams.hh (100%)
diff --git a/test/porousmediumflow/2p/CMakeLists.txt b/test/porousmediumflow/2p/CMakeLists.txt
index 52318c8c08..8b02698b0c 100644
--- a/test/porousmediumflow/2p/CMakeLists.txt
+++ b/test/porousmediumflow/2p/CMakeLists.txt
@@ -1 +1,7 @@
-add_subdirectory(implicit)
+add_subdirectory(adaptive)
+add_subdirectory(boxdfm)
+add_subdirectory(cornerpoint)
+add_subdirectory(fracture)
+add_subdirectory(incompressible)
+add_subdirectory(nonisothermal)
+add_subdirectory(rotationsymmetry)
diff --git a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt b/test/porousmediumflow/2p/adaptive/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
rename to test/porousmediumflow/2p/adaptive/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/adaptive/initialsolutionbox.txt b/test/porousmediumflow/2p/adaptive/initialsolutionbox.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/initialsolutionbox.txt
rename to test/porousmediumflow/2p/adaptive/initialsolutionbox.txt
diff --git a/test/porousmediumflow/2p/implicit/adaptive/initialsolutioncc.txt b/test/porousmediumflow/2p/adaptive/initialsolutioncc.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/initialsolutioncc.txt
rename to test/porousmediumflow/2p/adaptive/initialsolutioncc.txt
diff --git a/test/porousmediumflow/2p/implicit/adaptive/main.cc b/test/porousmediumflow/2p/adaptive/main.cc
similarity index 99%
rename from test/porousmediumflow/2p/implicit/adaptive/main.cc
rename to test/porousmediumflow/2p/adaptive/main.cc
index bf92c55626..4069ce9b4b 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/main.cc
+++ b/test/porousmediumflow/2p/adaptive/main.cc
@@ -56,7 +56,7 @@
#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>
+#include <test/porousmediumflow/2p/incompressible/problem.hh>
#include "pointsourceproblem.hh"
#include "problem.hh"
diff --git a/test/porousmediumflow/2p/implicit/adaptive/params.input b/test/porousmediumflow/2p/adaptive/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/params.input
rename to test/porousmediumflow/2p/adaptive/params.input
diff --git a/test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh b/test/porousmediumflow/2p/adaptive/pointsourceproblem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh
rename to test/porousmediumflow/2p/adaptive/pointsourceproblem.hh
diff --git a/test/porousmediumflow/2p/implicit/adaptive/problem.hh b/test/porousmediumflow/2p/adaptive/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/problem.hh
rename to test/porousmediumflow/2p/adaptive/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/boxdfm/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
rename to test/porousmediumflow/2p/boxdfm/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/durlofsky.geo b/test/porousmediumflow/2p/boxdfm/grids/durlofsky.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/durlofsky.geo
rename to test/porousmediumflow/2p/boxdfm/grids/durlofsky.geo
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/durlofsky.msh b/test/porousmediumflow/2p/boxdfm/grids/durlofsky.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/durlofsky.msh
rename to test/porousmediumflow/2p/boxdfm/grids/durlofsky.msh
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/quads_2d.geo b/test/porousmediumflow/2p/boxdfm/grids/quads_2d.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/quads_2d.geo
rename to test/porousmediumflow/2p/boxdfm/grids/quads_2d.geo
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/quads_2d.msh b/test/porousmediumflow/2p/boxdfm/grids/quads_2d.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/quads_2d.msh
rename to test/porousmediumflow/2p/boxdfm/grids/quads_2d.msh
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/tets_3d.geo b/test/porousmediumflow/2p/boxdfm/grids/tets_3d.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/tets_3d.geo
rename to test/porousmediumflow/2p/boxdfm/grids/tets_3d.geo
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/grids/tets_3d.msh b/test/porousmediumflow/2p/boxdfm/grids/tets_3d.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/grids/tets_3d.msh
rename to test/porousmediumflow/2p/boxdfm/grids/tets_3d.msh
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/main.cc b/test/porousmediumflow/2p/boxdfm/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/main.cc
rename to test/porousmediumflow/2p/boxdfm/main.cc
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/params.input b/test/porousmediumflow/2p/boxdfm/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/params.input
rename to test/porousmediumflow/2p/boxdfm/params.input
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh b/test/porousmediumflow/2p/boxdfm/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/problem.hh
rename to test/porousmediumflow/2p/boxdfm/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh b/test/porousmediumflow/2p/boxdfm/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
rename to test/porousmediumflow/2p/boxdfm/spatialparams.hh
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt b/test/porousmediumflow/2p/cornerpoint/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
rename to test/porousmediumflow/2p/cornerpoint/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/grids/hardsmall.grdecl b/test/porousmediumflow/2p/cornerpoint/grids/hardsmall.grdecl
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/grids/hardsmall.grdecl
rename to test/porousmediumflow/2p/cornerpoint/grids/hardsmall.grdecl
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/main.cc b/test/porousmediumflow/2p/cornerpoint/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/main.cc
rename to test/porousmediumflow/2p/cornerpoint/main.cc
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/params.input b/test/porousmediumflow/2p/cornerpoint/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/params.input
rename to test/porousmediumflow/2p/cornerpoint/params.input
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh b/test/porousmediumflow/2p/cornerpoint/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
rename to test/porousmediumflow/2p/cornerpoint/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/cornerpoint/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
rename to test/porousmediumflow/2p/cornerpoint/spatialparams.hh
diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/fracture/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
rename to test/porousmediumflow/2p/fracture/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_box_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_box_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_box_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_box_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat b/test/porousmediumflow/2p/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat
rename to test/porousmediumflow/2p/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat
diff --git a/test/porousmediumflow/2p/implicit/fracture/grids/fracture.geo b/test/porousmediumflow/2p/fracture/grids/fracture.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/grids/fracture.geo
rename to test/porousmediumflow/2p/fracture/grids/fracture.geo
diff --git a/test/porousmediumflow/2p/implicit/fracture/grids/fracture.msh b/test/porousmediumflow/2p/fracture/grids/fracture.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/grids/fracture.msh
rename to test/porousmediumflow/2p/fracture/grids/fracture.msh
diff --git a/test/porousmediumflow/2p/implicit/fracture/main.cc b/test/porousmediumflow/2p/fracture/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/main.cc
rename to test/porousmediumflow/2p/fracture/main.cc
diff --git a/test/porousmediumflow/2p/implicit/fracture/params.input b/test/porousmediumflow/2p/fracture/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/params.input
rename to test/porousmediumflow/2p/fracture/params.input
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/fracture/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/problem.hh
rename to test/porousmediumflow/2p/fracture/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/fracture/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
rename to test/porousmediumflow/2p/fracture/spatialparams.hh
diff --git a/test/porousmediumflow/2p/implicit/CMakeLists.txt b/test/porousmediumflow/2p/implicit/CMakeLists.txt
deleted file mode 100644
index 8b02698b0c..0000000000
--- a/test/porousmediumflow/2p/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_subdirectory(adaptive)
-add_subdirectory(boxdfm)
-add_subdirectory(cornerpoint)
-add_subdirectory(fracture)
-add_subdirectory(incompressible)
-add_subdirectory(nonisothermal)
-add_subdirectory(rotationsymmetry)
diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/incompressible/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
rename to test/porousmediumflow/2p/incompressible/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/incompressible/main.cc b/test/porousmediumflow/2p/incompressible/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/main.cc
rename to test/porousmediumflow/2p/incompressible/main.cc
diff --git a/test/porousmediumflow/2p/implicit/incompressible/params.input b/test/porousmediumflow/2p/incompressible/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/params.input
rename to test/porousmediumflow/2p/incompressible/params.input
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/incompressible/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/problem.hh
rename to test/porousmediumflow/2p/incompressible/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/incompressible/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
rename to test/porousmediumflow/2p/incompressible/spatialparams.hh
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/nonisothermal/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
rename to test/porousmediumflow/2p/nonisothermal/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/main.cc b/test/porousmediumflow/2p/nonisothermal/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/main.cc
rename to test/porousmediumflow/2p/nonisothermal/main.cc
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/params.input b/test/porousmediumflow/2p/nonisothermal/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/params.input
rename to test/porousmediumflow/2p/nonisothermal/params.input
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/nonisothermal/problem.hh
similarity index 99%
rename from test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
rename to test/porousmediumflow/2p/nonisothermal/problem.hh
index 9999dade59..60aafefa56 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/nonisothermal/problem.hh
@@ -49,7 +49,7 @@
#include <dumux/material/components/n2.hh>
// use the spatial parameters as the injection problem of the 2p2c test program
-#include <test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh>
+#include <test/porousmediumflow/2p2c/injection/spatialparams.hh>
#ifndef GRIDTYPE // default to yasp grid if not provided by CMake
#define GRIDTYPE Dune::YaspGrid<2>
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/CMakeLists.txt b/test/porousmediumflow/2p/rotationsymmetry/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/CMakeLists.txt
rename to test/porousmediumflow/2p/rotationsymmetry/CMakeLists.txt
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/dome.geo b/test/porousmediumflow/2p/rotationsymmetry/dome.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/dome.geo
rename to test/porousmediumflow/2p/rotationsymmetry/dome.geo
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/dome.msh b/test/porousmediumflow/2p/rotationsymmetry/dome.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/dome.msh
rename to test/porousmediumflow/2p/rotationsymmetry/dome.msh
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/main.cc b/test/porousmediumflow/2p/rotationsymmetry/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/main.cc
rename to test/porousmediumflow/2p/rotationsymmetry/main.cc
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/params.input b/test/porousmediumflow/2p/rotationsymmetry/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/params.input
rename to test/porousmediumflow/2p/rotationsymmetry/params.input
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/problem.hh b/test/porousmediumflow/2p/rotationsymmetry/problem.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/problem.hh
rename to test/porousmediumflow/2p/rotationsymmetry/problem.hh
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/properties.hh b/test/porousmediumflow/2p/rotationsymmetry/properties.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/properties.hh
rename to test/porousmediumflow/2p/rotationsymmetry/properties.hh
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/solution.png b/test/porousmediumflow/2p/rotationsymmetry/solution.png
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/solution.png
rename to test/porousmediumflow/2p/rotationsymmetry/solution.png
diff --git a/test/porousmediumflow/2p/implicit/rotationsymmetry/spatialparams.hh b/test/porousmediumflow/2p/rotationsymmetry/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/rotationsymmetry/spatialparams.hh
rename to test/porousmediumflow/2p/rotationsymmetry/spatialparams.hh
diff --git a/test/porousmediumflow/tracer/2ptracer/main.cc b/test/porousmediumflow/tracer/2ptracer/main.cc
index cb08ccc40a..fdc17277fc 100644
--- a/test/porousmediumflow/tracer/2ptracer/main.cc
+++ b/test/porousmediumflow/tracer/2ptracer/main.cc
@@ -30,7 +30,7 @@
#include <dune/common/timer.hh>
#include <dune/grid/io/file/vtk.hh>
-#include <test/porousmediumflow/2p/implicit/incompressible/problem.hh>
+#include <test/porousmediumflow/2p/incompressible/problem.hh>
#include "problem_tracer.hh"
#include <dumux/common/properties.hh>
--
GitLab