From 96cecb7292c72de4d1daf7c475a384ea84c6ad5f Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sat, 16 Jan 2021 14:35:09 +0100 Subject: [PATCH] [test][1p] Dissolve implicit folder --- test/porousmediumflow/1p/CMakeLists.txt | 12 +++++++++++- .../1p/{implicit => }/compressible/CMakeLists.txt | 0 .../compressible/instationary/CMakeLists.txt | 0 .../{implicit => }/compressible/instationary/main.cc | 0 .../compressible/instationary/params.input | 0 .../compressible/instationary/problem.hh | 0 .../compressible/instationary/spatialparams.hh | 0 .../compressible/stationary/CMakeLists.txt | 0 .../{implicit => }/compressible/stationary/main.cc | 0 .../compressible/stationary/params.input | 0 .../compressible/stationary/problem.hh | 0 .../compressible/stationary/spatialparams.hh | 0 .../1p/{implicit => }/convergence/CMakeLists.txt | 0 .../convergence/analyticsolution/CMakeLists.txt | 0 .../convergence/analyticsolution/convergencetest.py | 0 .../convergence/analyticsolution/main.cc | 0 .../convergence/analyticsolution/params.input | 0 .../convergence/analyticsolution/problem.hh | 0 .../convergence/analyticsolution/properties.hh | 0 .../convergence/analyticsolution/spatialparams.hh | 0 .../convergence/discretesolution/CMakeLists.txt | 0 .../convergence/discretesolution/main.cc | 0 .../convergence/discretesolution/params.input | 0 .../convergence/discretesolution/problem.hh | 0 .../convergence/discretesolution/solver.hh | 0 .../convergence/discretesolution/spatialparams.hh | 0 .../1p/{implicit => }/fracture2d3d/CMakeLists.txt | 0 .../fracture2d3d/grids/fracture2d3d.msh | 0 .../1p/{implicit => }/fracture2d3d/main.cc | 0 .../1p/{implicit => }/fracture2d3d/params.input | 0 .../1p/{implicit => }/fracture2d3d/problem.hh | 0 .../1p/{implicit => }/fracture2d3d/spatialparams.hh | 0 test/porousmediumflow/1p/implicit/CMakeLists.txt | 11 ----------- .../1p/{implicit => }/incompressible/CMakeLists.txt | 0 .../incompressible/grids/randomlydistorted.dgf | 0 .../1p/{implicit => }/incompressible/main.cc | 0 .../1p/{implicit => }/incompressible/params.input | 0 .../1p/{implicit => }/incompressible/problem.hh | 0 .../{implicit => }/incompressible/spatialparams.hh | 0 .../{implicit => }/internaldirichlet/CMakeLists.txt | 8 ++++---- .../1p/{implicit => }/internaldirichlet/problem.hh | 2 +- .../1p/{implicit => }/isothermal/CMakeLists.txt | 0 .../1p/{implicit => }/isothermal/control.gstat | 0 .../1p/{implicit => }/isothermal/main.cc | 0 .../1p/{implicit => }/isothermal/params.input | 0 .../isothermal/params_forchheimer.input | 0 .../1p/{implicit => }/isothermal/params_gstat.input | 0 .../1p/{implicit => }/isothermal/problem.hh | 0 .../1p/{implicit => }/isothermal/spatialparams.hh | 0 .../1p/{implicit => }/network1d3d/CMakeLists.txt | 0 .../1p/{implicit => }/network1d3d/convergencetest.py | 0 .../{implicit => }/network1d3d/grids/network1d3d.msh | 0 .../1p/{implicit => }/network1d3d/main.cc | 0 .../1p/{implicit => }/network1d3d/params.input | 0 .../1p/{implicit => }/network1d3d/problem.hh | 0 .../1p/{implicit => }/network1d3d/spatialparams.hh | 0 .../1p/{implicit => }/nonisothermal/CMakeLists.txt | 0 .../1p/{implicit => }/nonisothermal/main.cc | 0 .../nonisothermal/params_conduction.input | 0 .../nonisothermal/params_convection.input | 0 .../nonisothermal/problem_conduction.hh | 0 .../nonisothermal/problem_convection.hh | 0 .../1p/{implicit => }/nonisothermal/spatialparams.hh | 0 .../1p/{implicit => }/periodicbc/CMakeLists.txt | 0 .../1p/{implicit => }/periodicbc/main.cc | 0 .../1p/{implicit => }/periodicbc/params.input | 0 .../1p/{implicit => }/periodicbc/periodic.dgf | 0 .../1p/{implicit => }/periodicbc/problem.hh | 0 .../1p/{implicit => }/periodicbc/spatialparams.hh | 0 .../1p/{implicit => }/pointsources/CMakeLists.txt | 0 .../pointsources/timedependent/CMakeLists.txt | 0 .../pointsources/timedependent/main.cc | 0 .../pointsources/timedependent/params.input | 0 .../pointsources/timedependent/problem.hh | 0 .../pointsources/timeindependent/CMakeLists.txt | 7 ------- .../timeindependent/grids/well_prism.msh | 0 .../pointsources/timeindependent/main.cc | 0 .../pointsources/timeindependent/params.input | 0 .../pointsources/timeindependent/problem.hh | 0 .../1p/{implicit => }/rootbenchmark/CMakeLists.txt | 0 .../{implicit => }/rootbenchmark/convergencetest.py | 0 .../1p/{implicit => }/rootbenchmark/main.cc | 0 .../1p/{implicit => }/rootbenchmark/params.input | 0 .../1p/{implicit => }/rootbenchmark/problem.hh | 0 .../1p/{implicit => }/rootbenchmark/properties.hh | 0 .../1p/{implicit => }/rootbenchmark/spatialparams.hh | 0 86 files changed, 16 insertions(+), 24 deletions(-) rename test/porousmediumflow/1p/{implicit => }/compressible/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/instationary/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/instationary/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/instationary/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/instationary/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/instationary/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/stationary/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/stationary/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/stationary/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/stationary/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/compressible/stationary/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/convergencetest.py (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/properties.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/analyticsolution/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/solver.hh (100%) rename test/porousmediumflow/1p/{implicit => }/convergence/discretesolution/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/grids/fracture2d3d.msh (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/fracture2d3d/spatialparams.hh (100%) delete mode 100644 test/porousmediumflow/1p/implicit/CMakeLists.txt rename test/porousmediumflow/1p/{implicit => }/incompressible/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/incompressible/grids/randomlydistorted.dgf (100%) rename test/porousmediumflow/1p/{implicit => }/incompressible/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/incompressible/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/incompressible/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/incompressible/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/internaldirichlet/CMakeLists.txt (82%) rename test/porousmediumflow/1p/{implicit => }/internaldirichlet/problem.hh (98%) rename test/porousmediumflow/1p/{implicit => }/isothermal/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/control.gstat (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/params_forchheimer.input (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/params_gstat.input (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/isothermal/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/convergencetest.py (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/grids/network1d3d.msh (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/network1d3d/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/params_conduction.input (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/params_convection.input (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/problem_conduction.hh (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/problem_convection.hh (100%) rename test/porousmediumflow/1p/{implicit => }/nonisothermal/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/periodic.dgf (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/periodicbc/spatialparams.hh (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timedependent/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timedependent/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timedependent/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timedependent/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timeindependent/CMakeLists.txt (95%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timeindependent/grids/well_prism.msh (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timeindependent/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timeindependent/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/pointsources/timeindependent/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/CMakeLists.txt (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/convergencetest.py (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/main.cc (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/params.input (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/problem.hh (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/properties.hh (100%) rename test/porousmediumflow/1p/{implicit => }/rootbenchmark/spatialparams.hh (100%) diff --git a/test/porousmediumflow/1p/CMakeLists.txt b/test/porousmediumflow/1p/CMakeLists.txt index 52318c8c08..4b66f73a77 100644 --- a/test/porousmediumflow/1p/CMakeLists.txt +++ b/test/porousmediumflow/1p/CMakeLists.txt @@ -1 +1,11 @@ -add_subdirectory(implicit) +add_subdirectory(convergence) +add_subdirectory(pointsources) +add_subdirectory(incompressible) +add_subdirectory(internaldirichlet) +add_subdirectory(compressible) +add_subdirectory(periodicbc) +add_subdirectory(fracture2d3d) +add_subdirectory(isothermal) +add_subdirectory(nonisothermal) +add_subdirectory(network1d3d) +add_subdirectory(rootbenchmark) diff --git a/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt b/test/porousmediumflow/1p/compressible/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt rename to test/porousmediumflow/1p/compressible/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt b/test/porousmediumflow/1p/compressible/instationary/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt rename to test/porousmediumflow/1p/compressible/instationary/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc b/test/porousmediumflow/1p/compressible/instationary/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/instationary/main.cc rename to test/porousmediumflow/1p/compressible/instationary/main.cc diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/params.input b/test/porousmediumflow/1p/compressible/instationary/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/instationary/params.input rename to test/porousmediumflow/1p/compressible/instationary/params.input diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh b/test/porousmediumflow/1p/compressible/instationary/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh rename to test/porousmediumflow/1p/compressible/instationary/problem.hh diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh b/test/porousmediumflow/1p/compressible/instationary/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh rename to test/porousmediumflow/1p/compressible/instationary/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt b/test/porousmediumflow/1p/compressible/stationary/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt rename to test/porousmediumflow/1p/compressible/stationary/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc b/test/porousmediumflow/1p/compressible/stationary/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/stationary/main.cc rename to test/porousmediumflow/1p/compressible/stationary/main.cc diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/params.input b/test/porousmediumflow/1p/compressible/stationary/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/stationary/params.input rename to test/porousmediumflow/1p/compressible/stationary/params.input diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh b/test/porousmediumflow/1p/compressible/stationary/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh rename to test/porousmediumflow/1p/compressible/stationary/problem.hh diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh b/test/porousmediumflow/1p/compressible/stationary/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh rename to test/porousmediumflow/1p/compressible/stationary/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt b/test/porousmediumflow/1p/convergence/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/CMakeLists.txt rename to test/porousmediumflow/1p/convergence/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/CMakeLists.txt b/test/porousmediumflow/1p/convergence/analyticsolution/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/CMakeLists.txt rename to test/porousmediumflow/1p/convergence/analyticsolution/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/convergencetest.py b/test/porousmediumflow/1p/convergence/analyticsolution/convergencetest.py similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/convergencetest.py rename to test/porousmediumflow/1p/convergence/analyticsolution/convergencetest.py diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/main.cc b/test/porousmediumflow/1p/convergence/analyticsolution/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/main.cc rename to test/porousmediumflow/1p/convergence/analyticsolution/main.cc diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/params.input b/test/porousmediumflow/1p/convergence/analyticsolution/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/params.input rename to test/porousmediumflow/1p/convergence/analyticsolution/params.input diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/problem.hh b/test/porousmediumflow/1p/convergence/analyticsolution/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/problem.hh rename to test/porousmediumflow/1p/convergence/analyticsolution/problem.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/properties.hh b/test/porousmediumflow/1p/convergence/analyticsolution/properties.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/properties.hh rename to test/porousmediumflow/1p/convergence/analyticsolution/properties.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh b/test/porousmediumflow/1p/convergence/analyticsolution/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh rename to test/porousmediumflow/1p/convergence/analyticsolution/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/CMakeLists.txt b/test/porousmediumflow/1p/convergence/discretesolution/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/CMakeLists.txt rename to test/porousmediumflow/1p/convergence/discretesolution/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/main.cc b/test/porousmediumflow/1p/convergence/discretesolution/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/main.cc rename to test/porousmediumflow/1p/convergence/discretesolution/main.cc diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/params.input b/test/porousmediumflow/1p/convergence/discretesolution/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/params.input rename to test/porousmediumflow/1p/convergence/discretesolution/params.input diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/problem.hh b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/problem.hh rename to test/porousmediumflow/1p/convergence/discretesolution/problem.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/solver.hh b/test/porousmediumflow/1p/convergence/discretesolution/solver.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/solver.hh rename to test/porousmediumflow/1p/convergence/discretesolution/solver.hh diff --git a/test/porousmediumflow/1p/implicit/convergence/discretesolution/spatialparams.hh b/test/porousmediumflow/1p/convergence/discretesolution/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/convergence/discretesolution/spatialparams.hh rename to test/porousmediumflow/1p/convergence/discretesolution/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt b/test/porousmediumflow/1p/fracture2d3d/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt rename to test/porousmediumflow/1p/fracture2d3d/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/grids/fracture2d3d.msh b/test/porousmediumflow/1p/fracture2d3d/grids/fracture2d3d.msh similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/grids/fracture2d3d.msh rename to test/porousmediumflow/1p/fracture2d3d/grids/fracture2d3d.msh diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc b/test/porousmediumflow/1p/fracture2d3d/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/main.cc rename to test/porousmediumflow/1p/fracture2d3d/main.cc diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/params.input b/test/porousmediumflow/1p/fracture2d3d/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/params.input rename to test/porousmediumflow/1p/fracture2d3d/params.input diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh b/test/porousmediumflow/1p/fracture2d3d/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh rename to test/porousmediumflow/1p/fracture2d3d/problem.hh diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh b/test/porousmediumflow/1p/fracture2d3d/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh rename to test/porousmediumflow/1p/fracture2d3d/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt deleted file mode 100644 index 4b66f73a77..0000000000 --- a/test/porousmediumflow/1p/implicit/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_subdirectory(convergence) -add_subdirectory(pointsources) -add_subdirectory(incompressible) -add_subdirectory(internaldirichlet) -add_subdirectory(compressible) -add_subdirectory(periodicbc) -add_subdirectory(fracture2d3d) -add_subdirectory(isothermal) -add_subdirectory(nonisothermal) -add_subdirectory(network1d3d) -add_subdirectory(rootbenchmark) diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/incompressible/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt rename to test/porousmediumflow/1p/incompressible/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/incompressible/grids/randomlydistorted.dgf b/test/porousmediumflow/1p/incompressible/grids/randomlydistorted.dgf similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/grids/randomlydistorted.dgf rename to test/porousmediumflow/1p/incompressible/grids/randomlydistorted.dgf diff --git a/test/porousmediumflow/1p/implicit/incompressible/main.cc b/test/porousmediumflow/1p/incompressible/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/main.cc rename to test/porousmediumflow/1p/incompressible/main.cc diff --git a/test/porousmediumflow/1p/implicit/incompressible/params.input b/test/porousmediumflow/1p/incompressible/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/params.input rename to test/porousmediumflow/1p/incompressible/params.input diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/incompressible/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/problem.hh rename to test/porousmediumflow/1p/incompressible/problem.hh diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/incompressible/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh rename to test/porousmediumflow/1p/incompressible/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt b/test/porousmediumflow/1p/internaldirichlet/CMakeLists.txt similarity index 82% rename from test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt rename to test/porousmediumflow/1p/internaldirichlet/CMakeLists.txt index a206bda3ea..18f73857cb 100644 --- a/test/porousmediumflow/1p/implicit/internaldirichlet/CMakeLists.txt +++ b/test/porousmediumflow/1p/internaldirichlet/CMakeLists.txt @@ -1,6 +1,6 @@ dumux_add_test(NAME test_1p_internaldirichlet_tpfa - SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/main.cc + SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/incompressible/main.cc LABELS porousmediumflow 1p COMPILE_DEFINITIONS TYPETAG=OnePInternalDirichletTpfa COMPILE_DEFINITIONS NUMDIFFMETHOD=DiffMethod::analytic @@ -8,10 +8,10 @@ dumux_add_test(NAME test_1p_internaldirichlet_tpfa CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_internaldirichlet_tpfa-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_tpfa-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_tpfa ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/params.input -Problem.Name test_1p_internaldirichlet_tpfa -Problem.EnableGravity false") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_tpfa ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/incompressible/params.input -Problem.Name test_1p_internaldirichlet_tpfa -Problem.EnableGravity false") dumux_add_test(NAME test_1p_internaldirichlet_box - SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/main.cc + SOURCES ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/incompressible/main.cc LABELS porousmediumflow 1p COMPILE_DEFINITIONS TYPETAG=OnePInternalDirichletBox COMPILE_DEFINITIONS NUMDIFFMETHOD=DiffMethod::analytic @@ -19,4 +19,4 @@ dumux_add_test(NAME test_1p_internaldirichlet_box CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_internaldirichlet_box-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_box-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_box ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/implicit/incompressible/params.input -Problem.Name test_1p_internaldirichlet_box -Problem.EnableGravity false") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_internaldirichlet_box ${CMAKE_SOURCE_DIR}/test/porousmediumflow/1p/incompressible/params.input -Problem.Name test_1p_internaldirichlet_box -Problem.EnableGravity false") diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh b/test/porousmediumflow/1p/internaldirichlet/problem.hh similarity index 98% rename from test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh rename to test/porousmediumflow/1p/internaldirichlet/problem.hh index 864c32b0e0..5d925402e6 100644 --- a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh +++ b/test/porousmediumflow/1p/internaldirichlet/problem.hh @@ -27,7 +27,7 @@ #include <bitset> #include <dumux/common/boundarytypes.hh> -#include <test/porousmediumflow/1p/implicit/incompressible/problem.hh> +#include <test/porousmediumflow/1p/incompressible/problem.hh> namespace Dumux { // forward declarations diff --git a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/1p/isothermal/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt rename to test/porousmediumflow/1p/isothermal/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/isothermal/control.gstat b/test/porousmediumflow/1p/isothermal/control.gstat similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/control.gstat rename to test/porousmediumflow/1p/isothermal/control.gstat diff --git a/test/porousmediumflow/1p/implicit/isothermal/main.cc b/test/porousmediumflow/1p/isothermal/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/main.cc rename to test/porousmediumflow/1p/isothermal/main.cc diff --git a/test/porousmediumflow/1p/implicit/isothermal/params.input b/test/porousmediumflow/1p/isothermal/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/params.input rename to test/porousmediumflow/1p/isothermal/params.input diff --git a/test/porousmediumflow/1p/implicit/isothermal/params_forchheimer.input b/test/porousmediumflow/1p/isothermal/params_forchheimer.input similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/params_forchheimer.input rename to test/porousmediumflow/1p/isothermal/params_forchheimer.input diff --git a/test/porousmediumflow/1p/implicit/isothermal/params_gstat.input b/test/porousmediumflow/1p/isothermal/params_gstat.input similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/params_gstat.input rename to test/porousmediumflow/1p/isothermal/params_gstat.input diff --git a/test/porousmediumflow/1p/implicit/isothermal/problem.hh b/test/porousmediumflow/1p/isothermal/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/problem.hh rename to test/porousmediumflow/1p/isothermal/problem.hh diff --git a/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/1p/isothermal/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh rename to test/porousmediumflow/1p/isothermal/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt b/test/porousmediumflow/1p/network1d3d/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt rename to test/porousmediumflow/1p/network1d3d/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/network1d3d/convergencetest.py b/test/porousmediumflow/1p/network1d3d/convergencetest.py similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/convergencetest.py rename to test/porousmediumflow/1p/network1d3d/convergencetest.py diff --git a/test/porousmediumflow/1p/implicit/network1d3d/grids/network1d3d.msh b/test/porousmediumflow/1p/network1d3d/grids/network1d3d.msh similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/grids/network1d3d.msh rename to test/porousmediumflow/1p/network1d3d/grids/network1d3d.msh diff --git a/test/porousmediumflow/1p/implicit/network1d3d/main.cc b/test/porousmediumflow/1p/network1d3d/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/main.cc rename to test/porousmediumflow/1p/network1d3d/main.cc diff --git a/test/porousmediumflow/1p/implicit/network1d3d/params.input b/test/porousmediumflow/1p/network1d3d/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/params.input rename to test/porousmediumflow/1p/network1d3d/params.input diff --git a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh b/test/porousmediumflow/1p/network1d3d/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/problem.hh rename to test/porousmediumflow/1p/network1d3d/problem.hh diff --git a/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh b/test/porousmediumflow/1p/network1d3d/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh rename to test/porousmediumflow/1p/network1d3d/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1p/nonisothermal/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt rename to test/porousmediumflow/1p/nonisothermal/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/main.cc b/test/porousmediumflow/1p/nonisothermal/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/main.cc rename to test/porousmediumflow/1p/nonisothermal/main.cc diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/params_conduction.input b/test/porousmediumflow/1p/nonisothermal/params_conduction.input similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/params_conduction.input rename to test/porousmediumflow/1p/nonisothermal/params_conduction.input diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/params_convection.input b/test/porousmediumflow/1p/nonisothermal/params_convection.input similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/params_convection.input rename to test/porousmediumflow/1p/nonisothermal/params_convection.input diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/nonisothermal/problem_conduction.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh rename to test/porousmediumflow/1p/nonisothermal/problem_conduction.hh diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/nonisothermal/problem_convection.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh rename to test/porousmediumflow/1p/nonisothermal/problem_convection.hh diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/1p/nonisothermal/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh rename to test/porousmediumflow/1p/nonisothermal/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt b/test/porousmediumflow/1p/periodicbc/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt rename to test/porousmediumflow/1p/periodicbc/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/periodicbc/main.cc b/test/porousmediumflow/1p/periodicbc/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/main.cc rename to test/porousmediumflow/1p/periodicbc/main.cc diff --git a/test/porousmediumflow/1p/implicit/periodicbc/params.input b/test/porousmediumflow/1p/periodicbc/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/params.input rename to test/porousmediumflow/1p/periodicbc/params.input diff --git a/test/porousmediumflow/1p/implicit/periodicbc/periodic.dgf b/test/porousmediumflow/1p/periodicbc/periodic.dgf similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/periodic.dgf rename to test/porousmediumflow/1p/periodicbc/periodic.dgf diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/periodicbc/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/problem.hh rename to test/porousmediumflow/1p/periodicbc/problem.hh diff --git a/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh b/test/porousmediumflow/1p/periodicbc/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh rename to test/porousmediumflow/1p/periodicbc/spatialparams.hh diff --git a/test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt b/test/porousmediumflow/1p/pointsources/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt rename to test/porousmediumflow/1p/pointsources/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt b/test/porousmediumflow/1p/pointsources/timedependent/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt rename to test/porousmediumflow/1p/pointsources/timedependent/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc b/test/porousmediumflow/1p/pointsources/timedependent/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc rename to test/porousmediumflow/1p/pointsources/timedependent/main.cc diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/params.input b/test/porousmediumflow/1p/pointsources/timedependent/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timedependent/params.input rename to test/porousmediumflow/1p/pointsources/timedependent/params.input diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh b/test/porousmediumflow/1p/pointsources/timedependent/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh rename to test/porousmediumflow/1p/pointsources/timedependent/problem.hh diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt b/test/porousmediumflow/1p/pointsources/timeindependent/CMakeLists.txt similarity index 95% rename from test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt rename to test/porousmediumflow/1p/pointsources/timeindependent/CMakeLists.txt index 1d7ba985a2..e278897aaf 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt +++ b/test/porousmediumflow/1p/pointsources/timeindependent/CMakeLists.txt @@ -48,10 +48,3 @@ dumux_add_test(NAME test_1p_pointsources_timeindependent_box_prism --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_box_prism params.input -Problem.Name test_1p_pointsources_timeindependent_box_prism -Grid.File ./grids/well_prism.msh") - -#install sources -install(FILES -problem.hh -../spatialparams.hh -main.cc -DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/1p/implicit/pointsources) diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/grids/well_prism.msh b/test/porousmediumflow/1p/pointsources/timeindependent/grids/well_prism.msh similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timeindependent/grids/well_prism.msh rename to test/porousmediumflow/1p/pointsources/timeindependent/grids/well_prism.msh diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc b/test/porousmediumflow/1p/pointsources/timeindependent/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc rename to test/porousmediumflow/1p/pointsources/timeindependent/main.cc diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/params.input b/test/porousmediumflow/1p/pointsources/timeindependent/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timeindependent/params.input rename to test/porousmediumflow/1p/pointsources/timeindependent/params.input diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh b/test/porousmediumflow/1p/pointsources/timeindependent/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh rename to test/porousmediumflow/1p/pointsources/timeindependent/problem.hh diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/CMakeLists.txt b/test/porousmediumflow/1p/rootbenchmark/CMakeLists.txt similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/CMakeLists.txt rename to test/porousmediumflow/1p/rootbenchmark/CMakeLists.txt diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/convergencetest.py b/test/porousmediumflow/1p/rootbenchmark/convergencetest.py similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/convergencetest.py rename to test/porousmediumflow/1p/rootbenchmark/convergencetest.py diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/main.cc b/test/porousmediumflow/1p/rootbenchmark/main.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/main.cc rename to test/porousmediumflow/1p/rootbenchmark/main.cc diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/params.input b/test/porousmediumflow/1p/rootbenchmark/params.input similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/params.input rename to test/porousmediumflow/1p/rootbenchmark/params.input diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/problem.hh b/test/porousmediumflow/1p/rootbenchmark/problem.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/problem.hh rename to test/porousmediumflow/1p/rootbenchmark/problem.hh diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/properties.hh b/test/porousmediumflow/1p/rootbenchmark/properties.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/properties.hh rename to test/porousmediumflow/1p/rootbenchmark/properties.hh diff --git a/test/porousmediumflow/1p/implicit/rootbenchmark/spatialparams.hh b/test/porousmediumflow/1p/rootbenchmark/spatialparams.hh similarity index 100% rename from test/porousmediumflow/1p/implicit/rootbenchmark/spatialparams.hh rename to test/porousmediumflow/1p/rootbenchmark/spatialparams.hh -- GitLab