diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt b/test/porousmediumflow/mpnc/2p2ccomparison/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt rename to test/porousmediumflow/mpnc/2p2ccomparison/CMakeLists.txt diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc b/test/porousmediumflow/mpnc/2p2ccomparison/main.cc similarity index 100% rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc rename to test/porousmediumflow/mpnc/2p2ccomparison/main.cc diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/params.input b/test/porousmediumflow/mpnc/2p2ccomparison/params.input similarity index 100% rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/params.input rename to test/porousmediumflow/mpnc/2p2ccomparison/params.input diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh similarity index 99% rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh rename to test/porousmediumflow/mpnc/2p2ccomparison/problem.hh index 14a844f864fefdf1737b1461e107eff33d4efde5..2c23375313bc18e779bc534c21c7f56020a0018a 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh +++ b/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh @@ -36,7 +36,7 @@ #include <dumux/porousmediumflow/mpnc/model.hh> #include <dumux/porousmediumflow/problem.hh> -#include <test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh> +#include <test/porousmediumflow/2p2c/mpnccomparison/iofields.hh> #include <dumux/material/fluidsystems/h2on2.hh> #include <dumux/material/fluidstates/compositional.hh> diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh b/test/porousmediumflow/mpnc/2p2ccomparison/spatialparams.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh rename to test/porousmediumflow/mpnc/2p2ccomparison/spatialparams.hh diff --git a/test/porousmediumflow/mpnc/CMakeLists.txt b/test/porousmediumflow/mpnc/CMakeLists.txt index 52318c8c0846044f9f8be3725616d8b529e77697..cad8693eea87fc037f6f4d82c1d595ac556d4426 100644 --- a/test/porousmediumflow/mpnc/CMakeLists.txt +++ b/test/porousmediumflow/mpnc/CMakeLists.txt @@ -1 +1,4 @@ -add_subdirectory(implicit) +add_subdirectory(2p2ccomparison) +add_subdirectory(kinetic) +add_subdirectory(obstacle) +add_subdirectory(thermalnonequilibrium) diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt deleted file mode 100644 index cad8693eea87fc037f6f4d82c1d595ac556d4426..0000000000000000000000000000000000000000 --- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(2p2ccomparison) -add_subdirectory(kinetic) -add_subdirectory(obstacle) -add_subdirectory(thermalnonequilibrium) diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/kinetic/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt rename to test/porousmediumflow/mpnc/kinetic/CMakeLists.txt diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc b/test/porousmediumflow/mpnc/kinetic/main.cc similarity index 100% rename from test/porousmediumflow/mpnc/implicit/kinetic/main.cc rename to test/porousmediumflow/mpnc/kinetic/main.cc diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/params.input b/test/porousmediumflow/mpnc/kinetic/params.input similarity index 100% rename from test/porousmediumflow/mpnc/implicit/kinetic/params.input rename to test/porousmediumflow/mpnc/kinetic/params.input diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh b/test/porousmediumflow/mpnc/kinetic/problem.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/kinetic/problem.hh rename to test/porousmediumflow/mpnc/kinetic/problem.hh diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/kinetic/spatialparams.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh rename to test/porousmediumflow/mpnc/kinetic/spatialparams.hh diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt b/test/porousmediumflow/mpnc/obstacle/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt rename to test/porousmediumflow/mpnc/obstacle/CMakeLists.txt diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/main.cc b/test/porousmediumflow/mpnc/obstacle/main.cc similarity index 100% rename from test/porousmediumflow/mpnc/implicit/obstacle/main.cc rename to test/porousmediumflow/mpnc/obstacle/main.cc diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/params.input b/test/porousmediumflow/mpnc/obstacle/params.input similarity index 100% rename from test/porousmediumflow/mpnc/implicit/obstacle/params.input rename to test/porousmediumflow/mpnc/obstacle/params.input diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/obstacle/problem.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/obstacle/problem.hh rename to test/porousmediumflow/mpnc/obstacle/problem.hh diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh b/test/porousmediumflow/mpnc/obstacle/spatialparams.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh rename to test/porousmediumflow/mpnc/obstacle/spatialparams.hh diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/mpnc/thermalnonequilibrium/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt rename to test/porousmediumflow/mpnc/thermalnonequilibrium/CMakeLists.txt diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionfluidsystem.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh rename to test/porousmediumflow/mpnc/thermalnonequilibrium/combustionfluidsystem.hh diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh rename to test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf b/test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf rename to test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX100LogNx100.dgf diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf b/test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf rename to test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX200LogNx200.dgf diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf b/test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf rename to test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX400LogNx400.dgf diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf b/test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf rename to test/porousmediumflow/mpnc/thermalnonequilibrium/grids/combustionOutflowGridLinNX40LogNx40.dgf diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc b/test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc rename to test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/params.input b/test/porousmediumflow/mpnc/thermalnonequilibrium/params.input similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/params.input rename to test/porousmediumflow/mpnc/thermalnonequilibrium/params.input diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh rename to test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/spatialparams.hh similarity index 100% rename from test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh rename to test/porousmediumflow/mpnc/thermalnonequilibrium/spatialparams.hh