From d77f076cbee0555197ba9cf2012760f0df6fe95f Mon Sep 17 00:00:00 2001
From: Johannes Hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Tue, 6 Nov 2018 17:58:15 +0100
Subject: [PATCH] Cleanup/rename tracer tests
---
.../mpnc/implicit/kinetic/CMakeLists.txt | 2 +-
.../tracer/1ptracer/CMakeLists.txt | 26 ++++-----
.../1ptracer/{test_cctracer.cc => main.cc} | 4 +-
.../1ptracer/{tracer.input => params.input} | 0
.../{1ptestproblem.hh => problem_1p.hh} | 2 +-
...tracertestproblem.hh => problem_tracer.hh} | 2 +-
...stspatialparams.hh => spatialparams_1p.hh} | 0
...atialparams.hh => spatialparams_tracer.hh} | 0
.../tracer/constvel/CMakeLists.txt | 58 +++++++++----------
.../constvel/{test_tracer.cc => main.cc} | 2 +-
.../{test_tracer.input => params.input} | 0
.../{tracertestproblem.hh => problem.hh} | 2 +-
...rtestspatialparams.hh => spatialparams.hh} | 0
.../tracer/multicomp/CMakeLists.txt | 28 ++++-----
.../{test_tracer_maxwellstefan.cc => main.cc} | 2 +-
...racer_maxwellstefan.input => params.input} | 0
...maxwellstefantestproblem.hh => problem.hh} | 2 +-
...ntestspatialparams.hh => spatialparams.hh} | 0
...u => test_1ptracer_pressure-reference.vtu} | 0
... => test_1ptracer_transport-reference.vtu} | 0
...=> test_tracer_explicit_box-reference.vtu} | 0
...> test_tracer_explicit_tpfa-reference.vtu} | 0
...=> test_tracer_implicit_box-reference.vtu} | 0
...> test_tracer_implicit_tpfa-reference.vtu} | 0
...st_tracer_maxwellstefan_box-reference.vtu} | 0
...t_tracer_maxwellstefan_tpfa-reference.vtu} | 0
26 files changed, 66 insertions(+), 64 deletions(-)
rename test/porousmediumflow/tracer/1ptracer/{test_cctracer.cc => main.cc} (99%)
rename test/porousmediumflow/tracer/1ptracer/{tracer.input => params.input} (100%)
rename test/porousmediumflow/tracer/1ptracer/{1ptestproblem.hh => problem_1p.hh} (99%)
rename test/porousmediumflow/tracer/1ptracer/{tracertestproblem.hh => problem_tracer.hh} (99%)
rename test/porousmediumflow/tracer/1ptracer/{1ptestspatialparams.hh => spatialparams_1p.hh} (100%)
rename test/porousmediumflow/tracer/1ptracer/{tracertestspatialparams.hh => spatialparams_tracer.hh} (100%)
rename test/porousmediumflow/tracer/constvel/{test_tracer.cc => main.cc} (99%)
rename test/porousmediumflow/tracer/constvel/{test_tracer.input => params.input} (100%)
rename test/porousmediumflow/tracer/constvel/{tracertestproblem.hh => problem.hh} (99%)
rename test/porousmediumflow/tracer/constvel/{tracertestspatialparams.hh => spatialparams.hh} (100%)
rename test/porousmediumflow/tracer/multicomp/{test_tracer_maxwellstefan.cc => main.cc} (99%)
rename test/porousmediumflow/tracer/multicomp/{test_tracer_maxwellstefan.input => params.input} (100%)
rename test/porousmediumflow/tracer/multicomp/{maxwellstefantestproblem.hh => problem.hh} (99%)
rename test/porousmediumflow/tracer/multicomp/{maxwellstefantestspatialparams.hh => spatialparams.hh} (100%)
rename test/references/{tracer-sequential-pressure-reference.vtu => test_1ptracer_pressure-reference.vtu} (100%)
rename test/references/{tracer-sequential-transport-reference.vtu => test_1ptracer_transport-reference.vtu} (100%)
rename test/references/{tracer-constvel-explicit-box-reference.vtu => test_tracer_explicit_box-reference.vtu} (100%)
rename test/references/{tracer-constvel-explicit-cc-reference.vtu => test_tracer_explicit_tpfa-reference.vtu} (100%)
rename test/references/{tracer-constvel-implicit-box-reference.vtu => test_tracer_implicit_box-reference.vtu} (100%)
rename test/references/{tracer-constvel-implicit-cc-reference.vtu => test_tracer_implicit_tpfa-reference.vtu} (100%)
rename test/references/{boxtracermaxwellstefan-reference.vtu => test_tracer_maxwellstefan_box-reference.vtu} (100%)
rename test/references/{cctracermaxwellstefan-reference.vtu => test_tracer_maxwellstefan_tpfa-reference.vtu} (100%)
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
index 5186479437..ef8c5c7d10 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
# build target for the full kinetic test problem
dune_add_test(NAME test_mpnc_kinetic_box
SOURCES main.cc
- COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBoxTypeTag
+ COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_mpnc_kinetic_box-reference.vtu
diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
index de686fc4cf..b95d6be06a 100644
--- a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
@@ -1,22 +1,22 @@
-dune_symlink_to_source_files(FILES "tracer.input")
+dune_symlink_to_source_files(FILES "params.input")
-dune_add_test(NAME test_tracer_sequential
- SOURCES test_cctracer.cc
+dune_add_test(NAME test_1ptracer
+ SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-sequential-transport-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer-00010.vtu
- ${CMAKE_SOURCE_DIR}/test/references/tracer-sequential-pressure-reference.vtu
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_transport-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_1ptracer-00010.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/test_1ptracer_pressure-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_sequential tracer.input")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1ptracer params.input -Problem.Name test_1ptracer")
#install sources
install(FILES
-1ptestproblem.hh
-1ptestspatialparams.hh
-tracertestproblem.hh
-tracertestspatialparams.hh
-test_cctracer.cc
-tracer.input
+problem_1p.hh
+spatialparams_1p.hh
+problem_tracer.hh
+spatialparams_tracer.hh
+main.cc
+params.input
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/1ptracer)
diff --git a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc b/test/porousmediumflow/tracer/1ptracer/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
rename to test/porousmediumflow/tracer/1ptracer/main.cc
index 1af9c7ad18..86a587b6a0 100644
--- a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
+++ b/test/porousmediumflow/tracer/1ptracer/main.cc
@@ -23,8 +23,8 @@
*/
#include <config.h>
-#include "1ptestproblem.hh"
-#include "tracertestproblem.hh"
+#include "problem_1p.hh"
+#include "problem_tracer.hh"
#include <ctime>
#include <iostream>
diff --git a/test/porousmediumflow/tracer/1ptracer/tracer.input b/test/porousmediumflow/tracer/1ptracer/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/tracer.input
rename to test/porousmediumflow/tracer/1ptracer/params.input
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
rename to test/porousmediumflow/tracer/1ptracer/problem_1p.hh
index cb05dcc02b..7de7fa2ae6 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
@@ -33,7 +33,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
-#include "1ptestspatialparams.hh"
+#include "spatialparams_1p.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
similarity index 99%
rename from test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
rename to test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
index cf1c8db726..a292cb2292 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
@@ -32,7 +32,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/base.hh>
-#include "tracertestspatialparams.hh"
+#include "spatialparams_tracer.hh"
namespace Dumux {
/**
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
rename to test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
similarity index 100%
rename from test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
rename to test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
index 144fddfe01..e3f6934094 100644
--- a/test/porousmediumflow/tracer/constvel/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
@@ -1,72 +1,72 @@
-dune_symlink_to_source_files(FILES "test_tracer.input")
+dune_symlink_to_source_files(FILES "params.input")
# explicit tracer tests (mass fractions)
dune_add_test(NAME test_tracer_explicit_tpfa
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa params.input -Problem.Name test_tracer_explicit_tpfa")
dune_add_test(NAME test_tracer_explicit_box
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_box-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box params.input -Problem.Name test_tracer_explicit_box")
# explicit tracer tests (mole fractions, should yield same result)
dune_add_test(NAME test_tracer_explicit_tpfa_mol
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa_mol-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa_mol")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol params.input -Problem.Name test_tracer_explicit_tpfa_mol")
dune_add_test(NAME test_tracer_explicit_box_mol
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_box_mol-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box_mol")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_explicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box_mol-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box_mol params.input -Problem.Name test_tracer_explicit_box_mol")
# implicit tracer tests
dune_add_test(NAME test_tracer_implicit_tpfa
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-cc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_implicit_tpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa test_tracer.input -Problem.Name tracer_implicit_tpfa")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_implicit_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa params.input -Problem.Name test_tracer_implicit_tpfa")
dune_add_test(NAME test_tracer_implicit_box
- SOURCES test_tracer.cc
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-box-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/tracer_implicit_box-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box test_tracer.input -Problem.Name tracer_implicit_box")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_implicit_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_box params.input -Problem.Name test_tracer_implicit_box")
#install sources
install(FILES
-tracertestproblem.hh
-tracertestspatialparams.hh
-test_tracer.cc
-test_tracer.input
+problem.hh
+spatialparams.hh
+main.cc
+params.input
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/constvel)
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.cc b/test/porousmediumflow/tracer/constvel/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/constvel/test_tracer.cc
rename to test/porousmediumflow/tracer/constvel/main.cc
index ab2b378871..3f84df8b21 100644
--- a/test/porousmediumflow/tracer/constvel/test_tracer.cc
+++ b/test/porousmediumflow/tracer/constvel/main.cc
@@ -42,7 +42,7 @@
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/grid/gridmanager.hh>
-#include "tracertestproblem.hh"
+#include "problem.hh"
int main(int argc, char** argv) try
{
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.input b/test/porousmediumflow/tracer/constvel/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/constvel/test_tracer.input
rename to test/porousmediumflow/tracer/constvel/params.input
diff --git a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh b/test/porousmediumflow/tracer/constvel/problem.hh
similarity index 99%
rename from test/porousmediumflow/tracer/constvel/tracertestproblem.hh
rename to test/porousmediumflow/tracer/constvel/problem.hh
index 8ae67572ee..b2b221e0c5 100644
--- a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/constvel/problem.hh
@@ -34,7 +34,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/base.hh>
-#include "tracertestspatialparams.hh"
+#include "spatialparams.hh"
#ifndef USEMOLES // default to true if not set through CMake
#define USEMOLES true
diff --git a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh b/test/porousmediumflow/tracer/constvel/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
rename to test/porousmediumflow/tracer/constvel/spatialparams.hh
diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
index d9199c6339..fa36c75e98 100644
--- a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
@@ -1,25 +1,27 @@
add_input_file_links()
# tracer tests
-dune_add_test(NAME test_maxwellstefan_tpfa
- SOURCES test_tracer_maxwellstefan.cc
+dune_add_test(NAME test_tracer_maxwellstefan_tpfa
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCC
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/cctracermaxwellstefan-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_ccmaxwellstefan-00026.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_maxwellstefan_tpfa test_tracer_maxwellstefan.input -Problem.Name test_ccmaxwellstefan")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_maxwellstefan_tpfa-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa-00026.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa params.input -Problem.Name test_tracer_maxwellstefan_tpfa")
-dune_add_test(NAME test_maxwellstefan_box
- SOURCES test_tracer_maxwellstefan.cc
+dune_add_test(NAME test_tracer_maxwellstefan_box
+ SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/boxtracermaxwellstefan-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_boxmaxwellstefan-00026.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_maxwellstefan_box test_tracer_maxwellstefan.input -Problem.Name test_boxmaxwellstefan")
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_tracer_maxwellstefan_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_box-00026.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_box params.input -Problem.Name test_tracer_maxwellstefan_box")
#install sources
install(FILES
-maxwellstefantestproblem.hh
-maxwellstefantestspatialparams.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer)
+problem.hh
+spatialparams.hh
+main.cc
+params.input
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/multicomp)
diff --git a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc b/test/porousmediumflow/tracer/multicomp/main.cc
similarity index 99%
rename from test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc
rename to test/porousmediumflow/tracer/multicomp/main.cc
index 5e1374769c..39668c4280 100644
--- a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.cc
+++ b/test/porousmediumflow/tracer/multicomp/main.cc
@@ -32,7 +32,7 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-#include "maxwellstefantestproblem.hh"
+#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.input b/test/porousmediumflow/tracer/multicomp/params.input
similarity index 100%
rename from test/porousmediumflow/tracer/multicomp/test_tracer_maxwellstefan.input
rename to test/porousmediumflow/tracer/multicomp/params.input
diff --git a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
similarity index 99%
rename from test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
rename to test/porousmediumflow/tracer/multicomp/problem.hh
index 2485c89eb8..2cba9f75ab 100644
--- a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -34,7 +34,7 @@
#include <dumux/porousmediumflow/tracer/model.hh>
#include <dumux/porousmediumflow/problem.hh>
-#include "maxwellstefantestspatialparams.hh"
+#include "spatialparams.hh"
#include <dumux/discretization/maxwellstefanslaw.hh>
#include <dumux/io/gnuplotinterface.hh>
diff --git a/test/porousmediumflow/tracer/multicomp/maxwellstefantestspatialparams.hh b/test/porousmediumflow/tracer/multicomp/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/tracer/multicomp/maxwellstefantestspatialparams.hh
rename to test/porousmediumflow/tracer/multicomp/spatialparams.hh
diff --git a/test/references/tracer-sequential-pressure-reference.vtu b/test/references/test_1ptracer_pressure-reference.vtu
similarity index 100%
rename from test/references/tracer-sequential-pressure-reference.vtu
rename to test/references/test_1ptracer_pressure-reference.vtu
diff --git a/test/references/tracer-sequential-transport-reference.vtu b/test/references/test_1ptracer_transport-reference.vtu
similarity index 100%
rename from test/references/tracer-sequential-transport-reference.vtu
rename to test/references/test_1ptracer_transport-reference.vtu
diff --git a/test/references/tracer-constvel-explicit-box-reference.vtu b/test/references/test_tracer_explicit_box-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-explicit-box-reference.vtu
rename to test/references/test_tracer_explicit_box-reference.vtu
diff --git a/test/references/tracer-constvel-explicit-cc-reference.vtu b/test/references/test_tracer_explicit_tpfa-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-explicit-cc-reference.vtu
rename to test/references/test_tracer_explicit_tpfa-reference.vtu
diff --git a/test/references/tracer-constvel-implicit-box-reference.vtu b/test/references/test_tracer_implicit_box-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-implicit-box-reference.vtu
rename to test/references/test_tracer_implicit_box-reference.vtu
diff --git a/test/references/tracer-constvel-implicit-cc-reference.vtu b/test/references/test_tracer_implicit_tpfa-reference.vtu
similarity index 100%
rename from test/references/tracer-constvel-implicit-cc-reference.vtu
rename to test/references/test_tracer_implicit_tpfa-reference.vtu
diff --git a/test/references/boxtracermaxwellstefan-reference.vtu b/test/references/test_tracer_maxwellstefan_box-reference.vtu
similarity index 100%
rename from test/references/boxtracermaxwellstefan-reference.vtu
rename to test/references/test_tracer_maxwellstefan_box-reference.vtu
diff --git a/test/references/cctracermaxwellstefan-reference.vtu b/test/references/test_tracer_maxwellstefan_tpfa-reference.vtu
similarity index 100%
rename from test/references/cctracermaxwellstefan-reference.vtu
rename to test/references/test_tracer_maxwellstefan_tpfa-reference.vtu
--
GitLab