From 76f9422b56f881fc6eaa1eafe9b0ca2a3755c63d Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sat, 16 Jan 2021 14:40:02 +0100 Subject: [PATCH] [test][1pnc] Dissolve implicit folder --- test/porousmediumflow/1pnc/{implicit => }/1p2c/CMakeLists.txt | 0 .../1pnc/{implicit => }/1p2c/isothermal/CMakeLists.txt | 0 .../1pnc/{implicit => }/1p2c/isothermal/main.cc | 0 .../1pnc/{implicit => }/1p2c/isothermal/params.input | 0 .../1pnc/{implicit => }/1p2c/isothermal/problem.hh | 0 .../1p2c/isothermal/saltwaterintrusion/CMakeLists.txt | 0 .../{implicit => }/1p2c/isothermal/saltwaterintrusion/main.cc | 0 .../1p2c/isothermal/saltwaterintrusion/params.input | 0 .../1p2c/isothermal/saltwaterintrusion/problem.hh | 0 .../test_1p2c_saltwaterintrusion_box_dt-reference.dat | 0 .../1pnc/{implicit => }/1p2c/nonisothermal/CMakeLists.txt | 0 .../1p2c/nonisothermal/conduction/CMakeLists.txt | 0 .../1pnc/{implicit => }/1p2c/nonisothermal/conduction/main.cc | 0 .../{implicit => }/1p2c/nonisothermal/conduction/params.input | 0 .../{implicit => }/1p2c/nonisothermal/conduction/problem.hh | 0 .../1p2c/nonisothermal/convection/CMakeLists.txt | 0 .../1pnc/{implicit => }/1p2c/nonisothermal/convection/main.cc | 0 .../{implicit => }/1p2c/nonisothermal/convection/params.input | 0 .../{implicit => }/1p2c/nonisothermal/convection/problem.hh | 0 .../1p2c/nonisothermal/transientbc/CMakeLists.txt | 0 .../{implicit => }/1p2c/nonisothermal/transientbc/main.cc | 0 .../1p2c/nonisothermal/transientbc/params.input | 0 .../{implicit => }/1p2c/nonisothermal/transientbc/problem.hh | 0 .../1pnc/{implicit => }/1p2c/spatialparams.hh | 0 test/porousmediumflow/1pnc/{implicit => }/1p3c/CMakeLists.txt | 0 test/porousmediumflow/1pnc/{implicit => }/1p3c/main.cc | 0 test/porousmediumflow/1pnc/{implicit => }/1p3c/params.input | 0 test/porousmediumflow/1pnc/{implicit => }/1p3c/problem.hh | 0 test/porousmediumflow/1pnc/CMakeLists.txt | 4 +++- test/porousmediumflow/1pnc/implicit/CMakeLists.txt | 3 --- .../1pnc/{implicit => }/nonequilibrium/CMakeLists.txt | 0 .../1pnc/{implicit => }/nonequilibrium/main.cc | 0 .../1pnc/{implicit => }/nonequilibrium/params.input | 0 .../1pnc/{implicit => }/nonequilibrium/problem.hh | 0 .../1pnc/{implicit => }/nonequilibrium/spatialparams.hh | 0 35 files changed, 3 insertions(+), 4 deletions(-) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/saltwaterintrusion/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/saltwaterintrusion/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/saltwaterintrusion/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/isothermal/saltwaterintrusion/test_1p2c_saltwaterintrusion_box_dt-reference.dat (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/conduction/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/conduction/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/conduction/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/conduction/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/convection/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/convection/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/convection/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/convection/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/transientbc/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/transientbc/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/transientbc/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/nonisothermal/transientbc/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p2c/spatialparams.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p3c/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p3c/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p3c/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/1p3c/problem.hh (100%) delete mode 100644 test/porousmediumflow/1pnc/implicit/CMakeLists.txt rename test/porousmediumflow/1pnc/{implicit => }/nonequilibrium/CMakeLists.txt (100%) rename test/porousmediumflow/1pnc/{implicit => }/nonequilibrium/main.cc (100%) rename test/porousmediumflow/1pnc/{implicit => }/nonequilibrium/params.input (100%) rename test/porousmediumflow/1pnc/{implicit => }/nonequilibrium/problem.hh (100%) rename test/porousmediumflow/1pnc/{implicit => }/nonequilibrium/spatialparams.hh (100%) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/isothermal/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/isothermal/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc b/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc rename to test/porousmediumflow/1pnc/1p2c/isothermal/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/params.input b/test/porousmediumflow/1pnc/1p2c/isothermal/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/params.input rename to test/porousmediumflow/1pnc/1p2c/isothermal/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh rename to test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc rename to test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/params.input b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/params.input rename to test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh rename to test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/test_1p2c_saltwaterintrusion_box_dt-reference.dat b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/test_1p2c_saltwaterintrusion_box_dt-reference.dat similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/test_1p2c_saltwaterintrusion_box_dt-reference.dat rename to test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/test_1p2c_saltwaterintrusion_box_dt-reference.dat diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/nonisothermal/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/params.input b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/params.input rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/params.input b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/params.input rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/params.input b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/params.input rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh rename to test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh b/test/porousmediumflow/1pnc/1p2c/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh rename to test/porousmediumflow/1pnc/1p2c/spatialparams.hh diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt b/test/porousmediumflow/1pnc/1p3c/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p3c/CMakeLists.txt rename to test/porousmediumflow/1pnc/1p3c/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/main.cc b/test/porousmediumflow/1pnc/1p3c/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p3c/main.cc rename to test/porousmediumflow/1pnc/1p3c/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/params.input b/test/porousmediumflow/1pnc/1p3c/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p3c/params.input rename to test/porousmediumflow/1pnc/1p3c/params.input diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh b/test/porousmediumflow/1pnc/1p3c/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/1p3c/problem.hh rename to test/porousmediumflow/1pnc/1p3c/problem.hh diff --git a/test/porousmediumflow/1pnc/CMakeLists.txt b/test/porousmediumflow/1pnc/CMakeLists.txt index 52318c8c08..5f6c0659d6 100644 --- a/test/porousmediumflow/1pnc/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/CMakeLists.txt @@ -1 +1,3 @@ -add_subdirectory(implicit) +add_subdirectory(1p2c) +add_subdirectory(nonequilibrium) +add_subdirectory(1p3c) diff --git a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt deleted file mode 100644 index 5f6c0659d6..0000000000 --- a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(1p2c) -add_subdirectory(nonequilibrium) -add_subdirectory(1p3c) diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/nonequilibrium/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt rename to test/porousmediumflow/1pnc/nonequilibrium/CMakeLists.txt diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc b/test/porousmediumflow/1pnc/nonequilibrium/main.cc similarity index 100% rename from test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc rename to test/porousmediumflow/1pnc/nonequilibrium/main.cc diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/params.input b/test/porousmediumflow/1pnc/nonequilibrium/params.input similarity index 100% rename from test/porousmediumflow/1pnc/implicit/nonequilibrium/params.input rename to test/porousmediumflow/1pnc/nonequilibrium/params.input diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/nonequilibrium/problem.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh rename to test/porousmediumflow/1pnc/nonequilibrium/problem.hh diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh b/test/porousmediumflow/1pnc/nonequilibrium/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh rename to test/porousmediumflow/1pnc/nonequilibrium/spatialparams.hh -- GitLab