diff --git a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
index 132a88873a9f05214e178cc20bf2ebf4797782b3..0a67d62aa9e7efff4f70edc2ccffab7cab781075 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
@@ -1,49 +1,49 @@
-dune_symlink_to_source_files(FILES "test_2p_adaptive.input")
+dune_symlink_to_source_files(FILES "params.input")
dune_symlink_to_source_files(FILES "initialsolutioncc.txt")
dune_symlink_to_source_files(FILES "initialsolutionbox.txt")
# using tpfa
dune_add_test(NAME test_2p_adaptive_tpfa
- SOURCES test_2p_adaptive_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveTpfa
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensccadaptive-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_adaptive_tpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_tpfa test_2p_adaptive.input -Problem.Name 2p_adaptive_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_adaptive_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_tpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_tpfa params.input -Problem.Name test_2p_adaptive_tpfa")
# using tpfa and point source
-dune_add_test(NAME test_2p_adaptive_ps_tpfa
- SOURCES test_2p_adaptive_fv.cc
+dune_add_test(NAME test_2p_pointsource_adaptive_tpfa
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPAdaptivePointSource
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensccadaptivepointsource-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_adaptive_ps_tpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_ps_tpfa test_2p_adaptive.input -Problem.Name 2p_adaptive_ps_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_pointsource_adaptive_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive_tpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_pointsource_adaptive_tpfa params.input -Problem.Name test_2p_pointsource_adaptive_tpfa")
# using mpfa
dune_add_test(NAME test_2p_adaptive_mpfa
- SOURCES test_2p_adaptive_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveMpfa
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensccmpfaadaptive-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_adaptive_mpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_mpfa test_2p_adaptive.input -Problem.Name 2p_adaptive_mpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_adaptive_mpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_mpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_mpfa params.input -Problem.Name test_2p_adaptive_mpfa")
# using box
dune_add_test(NAME test_2p_adaptive_box
- SOURCES test_2p_adaptive_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveBox
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensboxadaptive-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_adaptive_box-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_box test_2p_adaptive.input -Problem.Name 2p_adaptive_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_adaptive_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_box-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_adaptive_box params.input -Problem.Name test_2p_adaptive_box")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc b/test/porousmediumflow/2p/implicit/adaptive/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
rename to test/porousmediumflow/2p/implicit/adaptive/main.cc
diff --git a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive.input b/test/porousmediumflow/2p/implicit/adaptive/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive.input
rename to test/porousmediumflow/2p/implicit/adaptive/params.input
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
index 856f70cb3a922bd1431aeca0a4469851e112541c..9f0e6c4184772de665bb2dc0c214109194f6a8ad 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
@@ -1,82 +1,82 @@
-dune_symlink_to_source_files(FILES "test_2p.input" "grids")
+dune_symlink_to_source_files(FILES "params.input" "grids")
# quadrilaterals alu grid
-dune_add_test(NAME test_2pboxdfm_quads_alu
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_quads_alu
+ SOURCES main.cc
CMAKE_GUARD dune-alugrid_FOUND
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<1,2>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_2d_quads-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_quads_alu-00023.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_quads_alu test_2p.input -Problem.Name 2pboxdfm_quads_alu -Grid.File grids/quads_2d.msh")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_2d_quads-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_alu-00023.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_alu params.input -Problem.Name test_2p_boxdfm_quads_alu -Grid.File grids/quads_2d.msh")
# quadrilaterals ug grid
-dune_add_test(NAME test_2pboxdfm_quads_ug
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_quads_ug
+ SOURCES main.cc
CMAKE_GUARD dune-uggrid_FOUND
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<1,2>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_2d_quads-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_quads_ug-00023.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_quads_ug test_2p.input -Problem.Name 2pboxdfm_quads_ug -Grid.File grids/quads_2d.msh")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_2d_quads-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_ug-00023.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_quads_ug params.input -Problem.Name test_2p_boxdfm_quads_ug -Grid.File grids/quads_2d.msh")
# triangles alu
-dune_add_test(NAME test_2pboxdfm_trias_alu
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_trias_alu
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
CMAKE_GUARD dune-alugrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<1,2>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_2d_trias-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_trias_alu-00064.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_trias_alu test_2p.input -Problem.Name 2pboxdfm_trias_alu -Grid.File grids/durlofsky.msh")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_2d_trias-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_alu-00064.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_alu params.input -Problem.Name test_2p_boxdfm_trias_alu -Grid.File grids/durlofsky.msh")
# triangles ug
-dune_add_test(NAME test_2pboxdfm_trias_ug
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_trias_ug
+ SOURCES main.cc
CMAKE_GUARD dune-uggrid_FOUND
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<1,2>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_2d_trias-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_trias_ug-00064.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_trias_ug test_2p.input -Problem.Name 2pboxdfm_trias_ug -Grid.File grids/durlofsky.msh")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_2d_trias-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_ug-00064.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_trias_ug params.input -Problem.Name test_2p_boxdfm_trias_ug -Grid.File grids/durlofsky.msh")
# tetrahedra alu
-dune_add_test(NAME test_2pboxdfm_tets_alu
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_tets_alu
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
CMAKE_GUARD dune-alugrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<2,3>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_3d_tets-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_tets_alu-00013.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_tets_alu test_2p.input -Problem.Name 2pboxdfm_tets_alu -Grid.File grids/tets_3d.msh -TimeLoop.TEnd 450")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_3d_tets-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_tets_alu-00013.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_tets_alu params.input -Problem.Name test_2p_boxdfm_tets_alu -Grid.File grids/tets_3d.msh -TimeLoop.TEnd 450")
# tetrahedra ug
-dune_add_test(NAME test_2pboxdfm_tets_ug
- SOURCES test_2pboxdfm.cc
+dune_add_test(NAME test_2p_boxdfm_tets_ug
+ SOURCES main.cc
CMAKE_GUARD dune-uggrid_FOUND
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<3>
COMPILE_DEFINITIONS FRACTUREGRIDTYPE=Dune::FoamGrid<2,3>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/2pboxdfm_3d_tets-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2pboxdfm_tets_ug-00013.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pboxdfm_tets_ug test_2p.input -Problem.Name 2pboxdfm_tets_ug -Grid.File grids/tets_3d.msh -TimeLoop.TEnd 450")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_boxdfm_3d_tets-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_tets_ug-00013.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_boxdfm_tets_ug params.input -Problem.Name test_2p_boxdfm_tets_ug -Grid.File grids/tets_3d.msh -TimeLoop.TEnd 450")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/test_2pboxdfm.cc b/test/porousmediumflow/2p/implicit/boxdfm/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/test_2pboxdfm.cc
rename to test/porousmediumflow/2p/implicit/boxdfm/main.cc
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/test_2p.input b/test/porousmediumflow/2p/implicit/boxdfm/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/boxdfm/test_2p.input
rename to test/porousmediumflow/2p/implicit/boxdfm/params.input
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
index 6ad7ac5bbccbd2b8a63232956a3b6decd624dadf..cd26d23118bae71441d8f99ca513f4dcfae22c6b 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
@@ -1,15 +1,15 @@
-dune_symlink_to_source_files(FILES "test_2p_cornerpoint.input")
+dune_symlink_to_source_files(FILES "params.input")
dune_symlink_to_source_files(FILES grids)
dune_add_test(NAME test_2p_cornerpoint
- SOURCES test_2p_cornerpoint.cc
+ SOURCES main.cc
CMAKE_GUARD HAVE_OPM_GRID
COMPILE_DEFINITIONS HAVE_ECL_INPUT=1
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/cc2pcornerpoint-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cc2pcornerpoint-00005.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_cornerpoint -Problem.Name cc2pcornerpoint")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_cornerpoint-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_cornerpoint-00005.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_cornerpoint params.input -Problem.Name test_2p_cornerpoint")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/test_2p_cornerpoint.cc b/test/porousmediumflow/2p/implicit/cornerpoint/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/test_2p_cornerpoint.cc
rename to test/porousmediumflow/2p/implicit/cornerpoint/main.cc
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/test_2p_cornerpoint.input b/test/porousmediumflow/2p/implicit/cornerpoint/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/cornerpoint/test_2p_cornerpoint.input
rename to test/porousmediumflow/2p/implicit/cornerpoint/params.input
diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
index 288dc3cff3c2a274e66d88ee0c0601e5baac4502..2ad42d586bc44dcb5d21dd5b784a196a26da7fd8 100644
--- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
@@ -1,65 +1,65 @@
-dune_symlink_to_source_files(FILES "test_fracture.input" "grids")
+dune_symlink_to_source_files(FILES "params.input" "grids")
dune_add_test(NAME test_2p_fracture_box
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturebox2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturebox-00023.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box test_fracture.input -Problem.Name fracturebox")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box-00023.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_box")
dune_add_test(NAME test_2p_fracture_tpfa
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturecc2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturetpfa-00029.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa test_fracture.input -Problem.Name fracturetpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa-00029.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_tpfa")
dune_add_test(NAME test_2p_fracture_mpfa
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fractureccmpfa2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturempfa-00031.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa test_fracture.input -Problem.Name fracturempfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_mpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa-00031.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_mpfa")
# tests with gravity
dune_add_test(NAME test_2p_fracture_gravity_box
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturebox2p_gravity-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturebox_gravity-00028.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box test_fracture.input -Problem.Name fracturebox_gravity -Problem.EnableGravity true")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_box-00028.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_gravity_box -Problem.EnableGravity true")
dune_add_test(NAME test_2p_fracture_gravity_tpfa
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturecc2p_gravity-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturetpfa_gravity-00042.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa test_fracture.input -Problem.Name fracturetpfa_gravity -Problem.EnableGravity true")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_tpfa-00042.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_gravity_tpfa -Problem.EnableGravity true")
dune_add_test(NAME test_2p_fracture_gravity_mpfa
- SOURCES test_2p_fracture_fv.cc
+ SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fractureccmpfa2p_gravity-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturempfa_gravity-00042.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa test_fracture.input -Problem.Name fracturempfa_gravity -Problem.EnableGravity true")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_mpfa-00042.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_gravity_mpfa -Problem.EnableGravity true")
set(CMAKE_BUILD_TYPE Release)
@@ -67,5 +67,5 @@ set(CMAKE_BUILD_TYPE Release)
install(FILES
problem.hh
spatialparams.hh
-test_2p_fracture_fv.cc
+main.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/fracture)
diff --git a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc b/test/porousmediumflow/2p/implicit/fracture/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc
rename to test/porousmediumflow/2p/implicit/fracture/main.cc
diff --git a/test/porousmediumflow/2p/implicit/fracture/test_fracture.input b/test/porousmediumflow/2p/implicit/fracture/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/fracture/test_fracture.input
rename to test/porousmediumflow/2p/implicit/fracture/params.input
diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
index f1398583cdd355f9180f905f906561e65566d3f6..e0fd4deaf58aee131c847881b61a8cd0d24b4d29 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
@@ -1,74 +1,74 @@
-dune_symlink_to_source_files(FILES "test_2p.input")
+dune_symlink_to_source_files(FILES "params.input")
# using tpfa
-add_executable(test_2p_incompressible_tpfa EXCLUDE_FROM_ALL test_2p_fv.cc)
+add_executable(test_2p_incompressible_tpfa EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_2p_incompressible_tpfa PUBLIC TYPETAG=TwoPIncompressibleTpfa)
dune_add_test(NAME test_2p_incompressible_tpfa
TARGET test_2p_incompressible_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa params.input -Problem.Name test_2p_incompressible_tpfa")
# using tpfa
dune_add_test(NAME test_2p_incompressible_tpfa_restart
TARGET test_2p_incompressible_tpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa_restart-00003.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa_restart -TimeLoop.DtInitial 526.62 -Restart.Time 1859.95 -Restart.File 2p_tpfa-00005.vtu")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa_restart-00003.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa params.input -Problem.Name test_2p_incompressible_tpfa_restart -TimeLoop.DtInitial 526.62 -Restart.Time 1859.95 -Restart.File test_2p_incompressible_tpfa-00005.vtu")
# the restart test has to run after the test that produces the corresponding vtu file
set_tests_properties(test_2p_incompressible_tpfa_restart PROPERTIES DEPENDS test_2p_incompressible_tpfa)
# using box
dune_add_test(NAME test_2p_incompressible_box
- SOURCES test_2p_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_box-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box test_2p.input -Problem.Name 2p_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box-00007.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box params.input -Problem.Name test_2p_incompressible_box")
# using box with interface solver
dune_add_test(NAME test_2p_incompressible_box_ifsolver
- SOURCES test_2p_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensbox_ifsolver-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_box_ifsolver-00018.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box_ifsolver test_2p.input
- -Problem.Name 2p_box_ifsolver
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_box_ifsolver-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box_ifsolver-00018.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box_ifsolver params.input
+ -Problem.Name test_2p_incompressible_box_ifsolver
-Problem.UseNonConformingOutput true")
# using tpfa with an oil-wet lens
dune_add_test(NAME test_2p_incompressible_tpfa_oilwet
- SOURCES test_2p_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lenscc_oilwet-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa_oilwet-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa_oilwet test_2p.input
- -Problem.Name 2p_tpfa_oilwet
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_tpfa_oilwet-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa_oilwet-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa_oilwet params.input
+ -Problem.Name test_2p_incompressible_tpfa_oilwet
-Problem.EnableGravity false
-SpatialParams.LensIsOilWet true")
# using mpfa
dune_add_test(NAME test_2p_incompressible_mpfa
- SOURCES test_2p_fv.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p_mpfa-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa test_2p.input -Problem.Name 2p_mpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa params.input -Problem.Name test_2p_incompressible_mpfa")
set(CMAKE_BUILD_TYPE Release)
@@ -76,5 +76,5 @@ set(CMAKE_BUILD_TYPE Release)
install(FILES
problem.hh
spatialparams.hh
-test_2p_fv.cc
+main.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/incompressible)
diff --git a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc b/test/porousmediumflow/2p/implicit/incompressible/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
rename to test/porousmediumflow/2p/implicit/incompressible/main.cc
diff --git a/test/porousmediumflow/2p/implicit/incompressible/test_2p.input b/test/porousmediumflow/2p/implicit/incompressible/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/incompressible/test_2p.input
rename to test/porousmediumflow/2p/implicit/incompressible/params.input
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
index 1dde4bd2627b1827df8298c482c0b2e9db368d71..6f59a912f3b2451d819f21ff31ec38a030e119d0 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
@@ -1,46 +1,46 @@
-dune_symlink_to_source_files(FILES "test_2pni.input")
+dune_symlink_to_source_files(FILES "params.input")
-dune_add_test(SOURCES test_2pni_fv.cc
- NAME test_2pni_box_simplex
+dune_add_test(NAME test_2pni_box_simplex
+ SOURCES main.cc
CMAKE_GUARD dune-uggrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2pni_box_simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex test_2pni.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex params.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
-dune_add_test(SOURCES test_2pni_fv.cc
- NAME test_2pni_box_cube
+dune_add_test(NAME test_2pni_box_cube
+ SOURCES main.cc
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2pni_box_cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube test_2pni.input -Problem.Name test_2pni_box_cube")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube params.input -Problem.Name test_2pni_box_cube")
-dune_add_test(SOURCES test_2pni_fv.cc
- NAME test_2pni_tpfa_simplex
+dune_add_test(NAME test_2pni_tpfa_simplex
+ SOURCES main.cc
CMAKE_GUARD dune-alugrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>
COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2pni_tpfa_simplex-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex test_2pni.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex params.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
-dune_add_test(SOURCES test_2pni_fv.cc
- NAME test_2pni_tpfa_cube
+dune_add_test(NAME test_2pni_tpfa_cube
+ SOURCES main.cc
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_2pni_tpfa_cube-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube test_2pni.input -Problem.Name test_2pni_tpfa_cube")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube params.input -Problem.Name test_2pni_tpfa_cube")
set(CMAKE_BUILD_TYPE Release)
@@ -48,6 +48,5 @@ set(CMAKE_BUILD_TYPE Release)
#install sources
install(FILES
problem.hh
-spatialparams.hh
-test_2pni_fv.cc
+main.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/nonisothermal)
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc b/test/porousmediumflow/2p/implicit/nonisothermal/main.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc
rename to test/porousmediumflow/2p/implicit/nonisothermal/main.cc
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni.input b/test/porousmediumflow/2p/implicit/nonisothermal/params.input
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/test_2pni.input
rename to test/porousmediumflow/2p/implicit/nonisothermal/params.input
diff --git a/test/references/lensboxadaptive-reference.vtu b/test/references/test_2p_adaptive_box-reference.vtu
similarity index 100%
rename from test/references/lensboxadaptive-reference.vtu
rename to test/references/test_2p_adaptive_box-reference.vtu
diff --git a/test/references/lensccmpfaadaptive-reference.vtu b/test/references/test_2p_adaptive_mpfa-reference.vtu
similarity index 100%
rename from test/references/lensccmpfaadaptive-reference.vtu
rename to test/references/test_2p_adaptive_mpfa-reference.vtu
diff --git a/test/references/lensccadaptive-reference.vtu b/test/references/test_2p_adaptive_tpfa-reference.vtu
similarity index 100%
rename from test/references/lensccadaptive-reference.vtu
rename to test/references/test_2p_adaptive_tpfa-reference.vtu
diff --git a/test/references/2pboxdfm_2d_quads-reference.vtu b/test/references/test_2p_boxdfm_2d_quads-reference.vtu
similarity index 100%
rename from test/references/2pboxdfm_2d_quads-reference.vtu
rename to test/references/test_2p_boxdfm_2d_quads-reference.vtu
diff --git a/test/references/2pboxdfm_2d_trias-reference.vtu b/test/references/test_2p_boxdfm_2d_trias-reference.vtu
similarity index 100%
rename from test/references/2pboxdfm_2d_trias-reference.vtu
rename to test/references/test_2p_boxdfm_2d_trias-reference.vtu
diff --git a/test/references/2pboxdfm_3d_tets-reference.vtu b/test/references/test_2p_boxdfm_3d_tets-reference.vtu
similarity index 100%
rename from test/references/2pboxdfm_3d_tets-reference.vtu
rename to test/references/test_2p_boxdfm_3d_tets-reference.vtu
diff --git a/test/references/cc2pcornerpoint-reference.vtu b/test/references/test_2p_cornerpoint-reference.vtu
similarity index 100%
rename from test/references/cc2pcornerpoint-reference.vtu
rename to test/references/test_2p_cornerpoint-reference.vtu
diff --git a/test/references/fracturebox2p-reference.vtu b/test/references/test_2p_fracture_box-reference.vtu
similarity index 100%
rename from test/references/fracturebox2p-reference.vtu
rename to test/references/test_2p_fracture_box-reference.vtu
diff --git a/test/references/fracturebox2p_gravity-reference.vtu b/test/references/test_2p_fracture_gravity_box-reference.vtu
similarity index 100%
rename from test/references/fracturebox2p_gravity-reference.vtu
rename to test/references/test_2p_fracture_gravity_box-reference.vtu
diff --git a/test/references/fractureccmpfa2p_gravity-reference.vtu b/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
similarity index 100%
rename from test/references/fractureccmpfa2p_gravity-reference.vtu
rename to test/references/test_2p_fracture_gravity_mpfa-reference.vtu
diff --git a/test/references/fracturecc2p_gravity-reference.vtu b/test/references/test_2p_fracture_gravity_tpfa-reference.vtu
similarity index 100%
rename from test/references/fracturecc2p_gravity-reference.vtu
rename to test/references/test_2p_fracture_gravity_tpfa-reference.vtu
diff --git a/test/references/fractureccmpfa2p-reference.vtu b/test/references/test_2p_fracture_mpfa-reference.vtu
similarity index 100%
rename from test/references/fractureccmpfa2p-reference.vtu
rename to test/references/test_2p_fracture_mpfa-reference.vtu
diff --git a/test/references/fracturecc2p-reference.vtu b/test/references/test_2p_fracture_tpfa-reference.vtu
similarity index 100%
rename from test/references/fracturecc2p-reference.vtu
rename to test/references/test_2p_fracture_tpfa-reference.vtu
diff --git a/test/references/lensbox-reference.vtu b/test/references/test_2p_incompressible_box-reference.vtu
similarity index 100%
rename from test/references/lensbox-reference.vtu
rename to test/references/test_2p_incompressible_box-reference.vtu
diff --git a/test/references/lensbox_ifsolver-reference.vtu b/test/references/test_2p_incompressible_box_ifsolver-reference.vtu
similarity index 100%
rename from test/references/lensbox_ifsolver-reference.vtu
rename to test/references/test_2p_incompressible_box_ifsolver-reference.vtu
diff --git a/test/references/lenscc-reference.vtu b/test/references/test_2p_incompressible_cc-reference.vtu
similarity index 100%
rename from test/references/lenscc-reference.vtu
rename to test/references/test_2p_incompressible_cc-reference.vtu
diff --git a/test/references/lenscc_oilwet-reference.vtu b/test/references/test_2p_incompressible_tpfa_oilwet-reference.vtu
similarity index 100%
rename from test/references/lenscc_oilwet-reference.vtu
rename to test/references/test_2p_incompressible_tpfa_oilwet-reference.vtu
diff --git a/test/references/lensccadaptivepointsource-reference.vtu b/test/references/test_2p_pointsource_adaptive_tpfa-reference.vtu
similarity index 100%
rename from test/references/lensccadaptivepointsource-reference.vtu
rename to test/references/test_2p_pointsource_adaptive_tpfa-reference.vtu
diff --git a/test/references/injection2pnibox-cube-reference.vtu b/test/references/test_2pni_box_cube-reference.vtu
similarity index 100%
rename from test/references/injection2pnibox-cube-reference.vtu
rename to test/references/test_2pni_box_cube-reference.vtu
diff --git a/test/references/injection2pnibox-simplex-reference.vtu b/test/references/test_2pni_box_simplex-reference.vtu
similarity index 100%
rename from test/references/injection2pnibox-simplex-reference.vtu
rename to test/references/test_2pni_box_simplex-reference.vtu
diff --git a/test/references/injection2pnicc-cube-reference.vtu b/test/references/test_2pni_tpfa_cube-reference.vtu
similarity index 100%
rename from test/references/injection2pnicc-cube-reference.vtu
rename to test/references/test_2pni_tpfa_cube-reference.vtu
diff --git a/test/references/injection2pnicc-simplex-reference.vtu b/test/references/test_2pni_tpfa_simplex-reference.vtu
similarity index 100%
rename from test/references/injection2pnicc-simplex-reference.vtu
rename to test/references/test_2pni_tpfa_simplex-reference.vtu