diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebe73e21290191b5c8fa62b09452ec97a4d2d244..438b1648095daea575014707b4b9d1eb9fd6c34b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,7 +371,7 @@ file(COPY test/decoupled/2p/test_transport.input DESTINATION parameters)
file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_impes.input DESTINATION parameters)
file(COPY test/decoupled/2padaptive/test_2padaptive-reference.vtu DESTINATION references)
-file(COPY test/decoupled/2padaptive/test_impes_adaptive.input DESTINATION parameters)
+file(COPY test/decoupled/2padaptive/test_impesadaptive.input DESTINATION parameters)
file(COPY test/decoupled/2p2c/test_dec2p2c-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p2c/test_dec2p2c.input DESTINATION parameters)
file(COPY test/decoupled/2p2c/test_multiphysics2p2c-reference.vtu DESTINATION references)
@@ -414,7 +414,7 @@ add_test(test_diffusion bin/runTest.sh references/diffusion-reference.vtu m
add_test(test_dec1p bin/runTest.sh references/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p --parameter-file=test/decoupled/1p/test_1p.input)
add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport --parameter-file=parameters/test_transport.input -gridFile test/decoupled/2p/grids/test_transport.dgf)
add_test(test_impes bin/runTest.sh references/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes --parameter-file=parameters/test_impes.input)
-add_test(test_impes_adaptive bin/runTest.sh references/test_2padaptive-reference.vtu test_2padaptive-00007.vtu test/decoupled/2padaptive/test_impes_adaptive --parameter-file=parameters/test_impes_adaptive.input)
+add_test(test_impesadaptive bin/runTest.sh references/test_2padaptive-reference.vtu test_2padaptive-00007.vtu test/decoupled/2padaptive/test_impesadaptive --parameter-file=parameters/test_impesadaptive.input)
add_test(test_dec2p2c bin/runTest.sh references/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c --parameter-file=parameters/test_dec2p2c.input)
add_test(test_multiphysics2p2c bin/runTest.sh references/test_multiphysics2p2c-reference.vtu test_multiphysics2p2c-00021.vtu test/decoupled/2p2c/test_multiphysics2p2c)
diff --git a/dumux/common/boundaryconditions.hh b/dumux/common/boundaryconditions.hh
index 3264ac21345f72916f12687f6f2eb77ed45581fe..e7498aafd2f071eda1f48fec2e70342e07ba7534 100644
--- a/dumux/common/boundaryconditions.hh
+++ b/dumux/common/boundaryconditions.hh
@@ -29,7 +29,7 @@
namespace Dumux
{
/*!
- * \ingroup IMPETbc
+ * \ingroup
*/
/**
* @brief Define a class containing boundary condition flags
diff --git a/dumux/decoupled/2p/cellData2p_adaptive.hh b/dumux/decoupled/2p/cellData2padaptive.hh
similarity index 100%
rename from dumux/decoupled/2p/cellData2p_adaptive.hh
rename to dumux/decoupled/2p/cellData2padaptive.hh
diff --git a/dumux/decoupled/2p/impes/impesproperties2padaptive.hh b/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
index 752c8b48c97e6783b72e78069c275cd499f68a0f..52c890bd9d80377ff84393a668fef6dd108e9dd6 100644
--- a/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
+++ b/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
@@ -56,8 +56,8 @@ NEW_TYPE_TAG(IMPESTwoPAdaptive, INHERITS_FROM(IMPET, DecoupledTwoP));
}
}
-#include <dumux/decoupled/common/variableclass_adaptive.hh>
-#include <dumux/decoupled/2p/cellData2p_adaptive.hh>
+#include <dumux/decoupled/common/variableclassadaptive.hh>
+#include <dumux/decoupled/2p/cellData2padaptive.hh>
#include "gridadaptionindicator2p.hh"
namespace Dumux
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
similarity index 99%
rename from dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
rename to dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
index 3c485d8e39bfbc1d723dbc222c4b6ee86f0038ed..5f8f51d119db30b3f184c654a9c86a379fedbf39 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
@@ -28,7 +28,7 @@
* @author Markus Wolff
*/
-#include "evalcflflux_default.hh"
+#include "evalcflfluxdefault.hh"
namespace Dumux
{
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
similarity index 100%
rename from dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
rename to dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
diff --git a/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh b/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
index 38bdef8d95acc93736344dad9c7067dd8e7f7120..191a94780f0b19a7b50eeca0a40092a26cca8d13 100644
--- a/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
@@ -52,7 +52,7 @@ NEW_PROP_TAG( PrecomputedConstRels );//! < Bool property which tells the transpo
}
}
-#include "evalcflflux_default.hh"
+#include "evalcflfluxdefault.hh"
#include "dumux/decoupled/2p/transport/fv/diffusivepart.hh"
#include "dumux/decoupled/2p/transport/fv/convectivepart.hh"
#include <dumux/decoupled/2p/transport/fv/fvsaturation2p.hh>
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index eeb8c55c23c8de6552c892a5111a24cd23fb31c1..843af008f39a8cdd5de09f952e9428c8c8b6f571 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -30,7 +30,7 @@
#include "transportproperties2p.hh"
#include <dumux/decoupled/common/onemodelproblem.hh>
-#include <dumux/decoupled/common/fv/velocitydefault.hh>
+#include <dumux/decoupled/common/fv/fvvelocitydefault.hh>
namespace Dumux
{
diff --git a/dumux/decoupled/common/fv/fvvelocity.hh b/dumux/decoupled/common/fv/fvvelocity.hh
index 1edca1c712525b60efc272fcea21c1d66819bb47..addaf43218104e595f10782ec5f03660db0eb853 100644
--- a/dumux/decoupled/common/fv/fvvelocity.hh
+++ b/dumux/decoupled/common/fv/fvvelocity.hh
@@ -25,7 +25,7 @@
// dumux environment
#include "dumux/common/math.hh"
#include <dumux/decoupled/common/pressureproperties.hh>
-#include "velocitydefault.hh"
+#include "fvvelocitydefault.hh"
/**
* @file
diff --git a/dumux/decoupled/common/fv/velocitydefault.hh b/dumux/decoupled/common/fv/fvvelocitydefault.hh
similarity index 100%
rename from dumux/decoupled/common/fv/velocitydefault.hh
rename to dumux/decoupled/common/fv/fvvelocitydefault.hh
diff --git a/dumux/decoupled/common/pressureproperties.hh b/dumux/decoupled/common/pressureproperties.hh
index 054e07636c95b0918368c12d7d799fac8dd7ab63..0c3dd2fb6fe7bf16e314cdc7cfe181aa225731ab 100644
--- a/dumux/decoupled/common/pressureproperties.hh
+++ b/dumux/decoupled/common/pressureproperties.hh
@@ -72,7 +72,7 @@ NEW_PROP_TAG(Velocity);
}
}
-#include <dumux/decoupled/common/fv/velocitydefault.hh>
+#include <dumux/decoupled/common/fv/fvvelocitydefault.hh>
namespace Dumux
{
diff --git a/dumux/decoupled/common/variableclass_adaptive.hh b/dumux/decoupled/common/variableclassadaptive.hh
similarity index 100%
rename from dumux/decoupled/common/variableclass_adaptive.hh
rename to dumux/decoupled/common/variableclassadaptive.hh
diff --git a/test/decoupled/1p/test_1p.cc b/test/decoupled/1p/test_1p.cc
index c59f5b13baf5e4b229e06addee731325ea2a70e6..d51c6394c93d1eaf08cddb90484c2a496790ad34 100644
--- a/test/decoupled/1p/test_1p.cc
+++ b/test/decoupled/1p/test_1p.cc
@@ -29,7 +29,7 @@
*/
#include "config.h"
-#include "test_1p_problem.hh"
+#include "test_1pproblem.hh"
#include "benchmarkresult.hh"
#include <dumux/common/start.hh>
diff --git a/test/decoupled/1p/test_1p_problem.hh b/test/decoupled/1p/test_1pproblem.hh
similarity index 99%
rename from test/decoupled/1p/test_1p_problem.hh
rename to test/decoupled/1p/test_1pproblem.hh
index ec16f51288c2d8407a1eabaeb89862e2dc1d3232..cbb3ce9d1cada19e693081b1c2736bfec083cd00 100644
--- a/test/decoupled/1p/test_1p_problem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -42,7 +42,7 @@
#include <dumux/decoupled/1p/diffusion/diffusionproblem1p.hh>
#include <dumux/decoupled/common/fv/fvvelocity.hh>
-#include "test_1p_spatialparams.hh"
+#include "test_1pspatialparams.hh"
namespace Dumux
{
diff --git a/test/decoupled/1p/test_1p_spatialparams.hh b/test/decoupled/1p/test_1pspatialparams.hh
similarity index 100%
rename from test/decoupled/1p/test_1p_spatialparams.hh
rename to test/decoupled/1p/test_1pspatialparams.hh
diff --git a/test/decoupled/1p/test_diffusion.cc b/test/decoupled/1p/test_diffusion.cc
index 10f8208aa1bce4f2f23da893cbe98bd3363bea7d..cdd9c487d80830876fbac499b4cea7c1d3501e2f 100644
--- a/test/decoupled/1p/test_diffusion.cc
+++ b/test/decoupled/1p/test_diffusion.cc
@@ -34,7 +34,7 @@
#include <dune/common/mpihelper.hh>
#include <dune/grid/common/gridinfo.hh>
-#include "test_diffusion_problem.hh"
+#include "test_diffusionproblem.hh"
#include "benchmarkresult.hh"
////////////////////////
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusionproblem.hh
similarity index 99%
rename from test/decoupled/1p/test_diffusion_problem.hh
rename to test/decoupled/1p/test_diffusionproblem.hh
index 8ed014ba296b7a5a81eeeceee71a1380088c6381..d76e087e505f3a8db9b48d74f9f081d55cb7ffee 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -44,7 +44,7 @@
#include <dumux/decoupled/2p/diffusion/diffusionproblem2p.hh>
#include <dumux/decoupled/common/fv/fvvelocity.hh>
-#include "test_diffusion_spatialparams.hh"
+#include "test_diffusionspatialparams.hh"
namespace Dumux
{
diff --git a/test/decoupled/1p/test_diffusion_spatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
similarity index 100%
rename from test/decoupled/1p/test_diffusion_spatialparams.hh
rename to test/decoupled/1p/test_diffusionspatialparams.hh
diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc
index a61c2cbe09d0ea72efed985525e2036d7e9b1bee..6a436acb96fc5bef6ddc89f3773ceecd13959f6b 100644
--- a/test/decoupled/2p/test_impes.cc
+++ b/test/decoupled/2p/test_impes.cc
@@ -29,7 +29,7 @@
*/
#include "config.h"
-#include "test_impes_problem.hh"
+#include "test_impesproblem.hh"
#include <dumux/common/start.hh>
/*!
diff --git a/test/decoupled/2p/test_impes_problem.hh b/test/decoupled/2p/test_impesproblem.hh
similarity index 98%
rename from test/decoupled/2p/test_impes_problem.hh
rename to test/decoupled/2p/test_impesproblem.hh
index 940d397cdfbb6659a5dc617c752731cb3a229305..ded216f0543fb48c763279380ac75a12581c3383 100644
--- a/test/decoupled/2p/test_impes_problem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -50,9 +50,9 @@
#include <dumux/decoupled/2p/transport/fv/capillarydiffusion.hh>
#include <dumux/decoupled/2p/transport/fv/gravitypart.hh>
-#include "test_impes_spatialparams.hh"
+#include "test_impesspatialparams.hh"
-#include<dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh>
+#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
namespace Dumux
{
diff --git a/test/decoupled/2p/test_impes_spatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_impes_spatialparams.hh
rename to test/decoupled/2p/test_impesspatialparams.hh
diff --git a/test/decoupled/2p/test_transport.cc b/test/decoupled/2p/test_transport.cc
index 31a78aa93e0a365d5d5c8be98d05506d20b120d6..05401f98c4aee9fa2dae4b37eb6ca292bc4b001f 100644
--- a/test/decoupled/2p/test_transport.cc
+++ b/test/decoupled/2p/test_transport.cc
@@ -29,7 +29,7 @@
*/
#include "config.h"
-#include "test_transport_problem.hh"
+#include "test_transportproblem.hh"
#include <dumux/common/start.hh>
diff --git a/test/decoupled/2p/test_transport_problem.hh b/test/decoupled/2p/test_transportproblem.hh
similarity index 99%
rename from test/decoupled/2p/test_transport_problem.hh
rename to test/decoupled/2p/test_transportproblem.hh
index ae1493fed5e16dd762e73e83f6f0916980a2094d..9a3486841ee3c389be184fbe5cd5251104557f52 100644
--- a/test/decoupled/2p/test_transport_problem.hh
+++ b/test/decoupled/2p/test_transportproblem.hh
@@ -37,7 +37,7 @@
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
#include <dumux/decoupled/2p/transport/transportproblem2p.hh>
-#include "test_transport_spatialparams.hh"
+#include "test_transportspatialparams.hh"
namespace Dumux
{
diff --git a/test/decoupled/2p/test_transport_spatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
similarity index 100%
rename from test/decoupled/2p/test_transport_spatialparams.hh
rename to test/decoupled/2p/test_transportspatialparams.hh
diff --git a/test/decoupled/2padaptive/CMakeLists.txt b/test/decoupled/2padaptive/CMakeLists.txt
index f7fb096fe4e4f0b526709a6953ec1c07ec795fde..a06be66cd8d06861a090d8fa8a98d49b31c731be 100644
--- a/test/decoupled/2padaptive/CMakeLists.txt
+++ b/test/decoupled/2padaptive/CMakeLists.txt
@@ -1,10 +1,10 @@
# add build targets
-add_executable("test_impes_adaptive" test_impes_adaptive.cc)
+add_executable("test_impesadaptive" test_impesadaptive.cc)
if(UG_FOUND)
- set_target_properties("test_impes_adaptive"
+ set_target_properties("test_impesadaptive"
PROPERTIES
COMPILE_FLAGS ${UG_CPPFLAGS})
- target_link_libraries("test_impes_adaptive" ${DumuxLinkLibraries} ${UG_LIBS})
+ target_link_libraries("test_impesadaptive" ${DumuxLinkLibraries} ${UG_LIBS})
endif(UG_FOUND)
# add required libraries and includes to the build flags
@@ -12,7 +12,7 @@ link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
-add_custom_command(TARGET "test_impes_adaptive"
+add_custom_command(TARGET "test_impesadaptive"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
diff --git a/test/decoupled/2padaptive/Makefile.am b/test/decoupled/2padaptive/Makefile.am
index 110918e0b171e08045f5bb4151203cb283a53c5a..378f6cc5eb16cfad8d539e45cea1fca864d9d296 100644
--- a/test/decoupled/2padaptive/Makefile.am
+++ b/test/decoupled/2padaptive/Makefile.am
@@ -1,8 +1,8 @@
-check_PROGRAMS = test_impes_adaptive
+check_PROGRAMS = test_impesadaptive
noinst_HEADERS = *.hh
EXTRA_DIST = grids/*.dgf CMakeLists.txt
-test_impes_adaptive_SOURCES = test_impes_adaptive.cc
+test_impesadaptive_SOURCES = test_impesadaptive.cc
include $(top_srcdir)/am/global-rules
diff --git a/test/decoupled/2padaptive/test_impes_adaptive.cc b/test/decoupled/2padaptive/test_impesadaptive.cc
similarity index 98%
rename from test/decoupled/2padaptive/test_impes_adaptive.cc
rename to test/decoupled/2padaptive/test_impesadaptive.cc
index 35cf1fe02f2757c1901f876e3c36068e11da09e8..1d6ed8162e40ea774bf587df40726674b416f2fb 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive.cc
+++ b/test/decoupled/2padaptive/test_impesadaptive.cc
@@ -41,7 +41,7 @@ int main()
}
#else
-#include "test_impes_adaptive_problem.hh"
+#include "test_impesadaptiveproblem.hh"
#include <dumux/common/start.hh>
////////////////////////
diff --git a/test/decoupled/2padaptive/test_impes_adaptive.input b/test/decoupled/2padaptive/test_impesadaptive.input
similarity index 100%
rename from test/decoupled/2padaptive/test_impes_adaptive.input
rename to test/decoupled/2padaptive/test_impesadaptive.input
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh b/test/decoupled/2padaptive/test_impesadaptiveproblem.hh
similarity index 98%
rename from test/decoupled/2padaptive/test_impes_adaptive_problem.hh
rename to test/decoupled/2padaptive/test_impesadaptiveproblem.hh
index 79afd94113b0f71e324b671b6632b4c321bb3f24..7800ef51830897d21aeeb85c4fe01aa4231eb713 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
+++ b/test/decoupled/2padaptive/test_impesadaptiveproblem.hh
@@ -42,9 +42,9 @@
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh>
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
-#include "test_impes_adaptive_spatialparams.hh"
+#include "test_impesadaptivespatialparams.hh"
-#include<dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh>
+#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
namespace Dumux
{
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh b/test/decoupled/2padaptive/test_impesadaptivespatialparams.hh
similarity index 100%
rename from test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
rename to test/decoupled/2padaptive/test_impesadaptivespatialparams.hh