diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75a1968984be91dbb33525d25fbcf234ba60312b..90de71f34ffa96c525c7286423a4543979d91273 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,5 +22,9 @@ include(DuneMPI)
#add sub directories
dune_add_subdirs( dune m4 lib doc cmake/modules )
+#add fem-dg test, i.e. tests which are not included in a directory called "test"
+#set( _dirnew dune/fem-dg/examples/advdiff_test )
+#set_property(DIRECTORY ${_dirnew} PROPERTY TEST_INCLUDE_FILE ${CMAKE_BINARY_DIR}/${_dirnew}/BuildTests.cmake)
+
# finalize the dune project, e.g., generate config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/dune/CMakeLists.txt b/dune/CMakeLists.txt
index 459b751c53c95c2058016200597e1a509d8485d6..fb706af9baab5eee24a4c3b088b911b29d078781 100644
--- a/dune/CMakeLists.txt
+++ b/dune/CMakeLists.txt
@@ -1,10 +1 @@
-set(SUBDIRS fem-dg)
-# include not needed for CMake
-# include $(top_srcdir)/am/global-rules
-foreach(i ${SUBDIRS})
- if(${i} STREQUAL "test")
- set(opt EXCLUDE_FROM_ALL)
- endif(${i} STREQUAL "test")
- add_subdirectory(${i} ${opt})
- unset(opt)
-endforeach(i ${SUBDIRS})
+dune_add_subdirs(fem-dg)
diff --git a/dune/fem-dg/CMakeLists.txt b/dune/fem-dg/CMakeLists.txt
index 09e7ec46dd5106967ab0d118c267fbbaf9f697a3..1f78f05462cebd85e4d03a71c1b65ae88a95c6a7 100644
--- a/dune/fem-dg/CMakeLists.txt
+++ b/dune/fem-dg/CMakeLists.txt
@@ -1 +1 @@
-dune_add_subdirs( algorithm assemble main misc models operator pass solver test)
+dune_add_subdirs( algorithm assemble main misc models operator pass solver examples)
diff --git a/dune/fem-dg/test/CMakeLists.txt b/dune/fem-dg/examples/CMakeLists.txt
similarity index 100%
rename from dune/fem-dg/test/CMakeLists.txt
rename to dune/fem-dg/examples/CMakeLists.txt
diff --git a/dune/fem-dg/test/Makefile.am b/dune/fem-dg/examples/Makefile.am
similarity index 61%
rename from dune/fem-dg/test/Makefile.am
rename to dune/fem-dg/examples/Makefile.am
index 3c723929385ee991e5c0bc478dad7b931b79966c..2ce5c7344dcf13a53f5d90c083146886ee8ddb5d 100644
--- a/dune/fem-dg/test/Makefile.am
+++ b/dune/fem-dg/examples/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = dataio advdiff euler navierstokes poisson stokes
include $(top_srcdir)/am/global-rules
testdir = $(includedir)/dune/fem-dg/test
diff --git a/dune/fem-dg/examples/advdiff/CMakeLists.txt b/dune/fem-dg/examples/advdiff/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d247b303570518533c81939369c908f5d9eac975
--- /dev/null
+++ b/dune/fem-dg/examples/advdiff/CMakeLists.txt
@@ -0,0 +1,4 @@
+dune_install( main.cc models.hh problemcreator.hh problems.hh)
+
+dune_add_subdirs( test )
+
diff --git a/dune/fem-dg/test/advdiff/main.cc b/dune/fem-dg/examples/advdiff/main.cc
similarity index 100%
rename from dune/fem-dg/test/advdiff/main.cc
rename to dune/fem-dg/examples/advdiff/main.cc
diff --git a/dune/fem-dg/test/advdiff/models.hh b/dune/fem-dg/examples/advdiff/models.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/models.hh
rename to dune/fem-dg/examples/advdiff/models.hh
diff --git a/dune/fem-dg/test/advdiff/problemcreator.hh b/dune/fem-dg/examples/advdiff/problemcreator.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problemcreator.hh
rename to dune/fem-dg/examples/advdiff/problemcreator.hh
diff --git a/dune/fem-dg/test/advdiff/problems.hh b/dune/fem-dg/examples/advdiff/problems.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems.hh
rename to dune/fem-dg/examples/advdiff/problems.hh
diff --git a/dune/fem-dg/test/advdiff/problems/deformationalflow.hh b/dune/fem-dg/examples/advdiff/problems/deformationalflow.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems/deformationalflow.hh
rename to dune/fem-dg/examples/advdiff/problems/deformationalflow.hh
diff --git a/dune/fem-dg/test/advdiff/problems/problem.hh b/dune/fem-dg/examples/advdiff/problems/problem.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems/problem.hh
rename to dune/fem-dg/examples/advdiff/problems/problem.hh
diff --git a/dune/fem-dg/test/advdiff/problems/problemQuasiHeatEqn.hh b/dune/fem-dg/examples/advdiff/problems/problemQuasiHeatEqn.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems/problemQuasiHeatEqn.hh
rename to dune/fem-dg/examples/advdiff/problems/problemQuasiHeatEqn.hh
diff --git a/dune/fem-dg/test/advdiff/problems/pulse.hh b/dune/fem-dg/examples/advdiff/problems/pulse.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems/pulse.hh
rename to dune/fem-dg/examples/advdiff/problems/pulse.hh
diff --git a/dune/fem-dg/test/advdiff/problems/sin.hh b/dune/fem-dg/examples/advdiff/problems/sin.hh
similarity index 100%
rename from dune/fem-dg/test/advdiff/problems/sin.hh
rename to dune/fem-dg/examples/advdiff/problems/sin.hh
diff --git a/dune/fem-dg/test/advdiff/CMakeLists.txt b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
similarity index 62%
rename from dune/fem-dg/test/advdiff/CMakeLists.txt
rename to dune/fem-dg/examples/advdiff/test/CMakeLists.txt
index d16d99af8dce3ec4835d1a3cba6e0098f37f83d7..b3d2d75d3a1fdc04011756b84b4867007287eeff 100644
--- a/dune/fem-dg/test/advdiff/CMakeLists.txt
+++ b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-dune_install( models.hh problemcreator.hh steppertraits.hh)
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/advdiff/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/advdiff/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
endif()
@@ -8,23 +6,22 @@ endif()
add_definitions( "-DYASPGRID" )
add_definitions( "-DGRIDDIM=2" )
add_definitions( "-DDIMRANGE=1" )
-add_definitions( "-DFLUX=1" )
-add_definitions( "-DPRIMALDG" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( advdiff main.cc )
- add_executable( advdiffall main.cc )
- set_property(TARGET advdiffall APPEND PROPERTY
+ add_executable( advdiff ../main.cc )
+ add_executable( advdiffall ../main.cc )
+ set_property(TARGET advdiff APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( advdiff advdiffall )
+
dune_add_test( advdiff advdiffall )
else()
dune_add_test( NAME advdiff
- SOURCES main.cc
+ SOURCES ../main.cc
COMPILE_DEFINITIONS POLORDER=2 )
dune_add_test( NAME advdiffall
- SOURCES main.cc )
+ SOURCES ../main.cc )
endif()
add_code_generate_targets( advdiff advdiffall )
diff --git a/dune/fem-dg/test/advdiff/parameter.in b/dune/fem-dg/examples/advdiff/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/advdiff/parameter.in
rename to dune/fem-dg/examples/advdiff/test/parameter.in
diff --git a/dune/fem-dg/examples/advdiff/test/parameter2.in b/dune/fem-dg/examples/advdiff/test/parameter2.in
new file mode 100644
index 0000000000000000000000000000000000000000..db9a11dce7b32c709f71b9d0d16f7e22170c5a76
--- /dev/null
+++ b/dune/fem-dg/examples/advdiff/test/parameter2.in
@@ -0,0 +1,8 @@
+# toggle verbosity of on process
+# (-1: off, p: process p is verbose, in general 0 is a good choice)
+fem.verboserank: 0
+
+fem.prefix: ${CMAKE_CURRENT_SOURCE_DIR}/data_nonlinear # specify directory for data output (is created if not exists)
+fem.prefix.input: ${CMAKE_CURRENT_SOURCE_DIR}/parameter_nonlinear
+
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/advdiff/parameter_cmake b/dune/fem-dg/examples/advdiff/test/parameter_cmake
similarity index 78%
rename from dune/fem-dg/test/advdiff/parameter_cmake
rename to dune/fem-dg/examples/advdiff/test/parameter_cmake
index 2e509f7c56d23dcff26bb76857610f631f2e8cfd..225cb8a4ddad806dd36320bd5aca0401badfd854 100644
--- a/dune/fem-dg/test/advdiff/parameter_cmake
+++ b/dune/fem-dg/examples/advdiff/test/parameter_cmake
@@ -15,7 +15,7 @@ gridsol.filename: heat-checkpoint
# GENERAL
#--------
-paramfile: ../parameter/paramBase
+paramfile: ../../parameter/paramBase
# PROBLEM SETUP
@@ -37,13 +37,13 @@ zvelocity: 0. # the only advection part for the linear heat eqn
# DOMAIN
#-------
-fem.io.macroGridFile_1d: ../grids/unitcube1.dgf
-fem.io.macroGridFile_2d: ../grids/unitcube2.dgf
-fem.io.macroGridFile_3d: ../grids/unitcube3.dgf
+fem.io.macroGridFile_1d: ../../grids/unitcube1.dgf
+fem.io.macroGridFile_2d: ../../grids/unitcube2.dgf
+fem.io.macroGridFile_3d: ../../grids/unitcube3.dgf
# SOLVER
#-------
dgdiffusionflux.upwind: -1 -0.001
femdg.stepper.maxtimestep: 0.5
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
diff --git a/dune/fem-dg/examples/dataio/CMakeLists.txt b/dune/fem-dg/examples/dataio/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2604cc02d0d9026e024a74962d288dd5f3fa60a4
--- /dev/null
+++ b/dune/fem-dg/examples/dataio/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( checkedcheckpointhandler.hh checkpointing.hh models.hh problemcreator.hh problem.hh )
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/dataio/Makefile.am b/dune/fem-dg/examples/dataio/Makefile.am
similarity index 93%
rename from dune/fem-dg/test/dataio/Makefile.am
rename to dune/fem-dg/examples/dataio/Makefile.am
index e71d9958c98ad7e7af21ed79c9e4d280635a39ca..137c6fd91dcf9d4bb31b396d3a98e5703b991714 100644
--- a/dune/fem-dg/test/dataio/Makefile.am
+++ b/dune/fem-dg/examples/dataio/Makefile.am
@@ -20,7 +20,7 @@ BASEDIR = ../../main/
SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_pol.cc
# install these headers
-dataiodir = $(includedir)/dune/fem-dg/test/dataio
+dataiodir = $(includedir)/dune/fem-dg/examples/dataio
dataio_HEADERS = checkpointing.hh problemcreator.hh problem.hh
check_PROGRAMS = checkpointing dataconvert
diff --git a/dune/fem-dg/test/dataio/checkedcheckpointhandler.hh b/dune/fem-dg/examples/dataio/checkedcheckpointhandler.hh
similarity index 100%
rename from dune/fem-dg/test/dataio/checkedcheckpointhandler.hh
rename to dune/fem-dg/examples/dataio/checkedcheckpointhandler.hh
diff --git a/dune/fem-dg/test/dataio/checkpointing.hh b/dune/fem-dg/examples/dataio/checkpointing.hh
similarity index 99%
rename from dune/fem-dg/test/dataio/checkpointing.hh
rename to dune/fem-dg/examples/dataio/checkpointing.hh
index 898fec913a107c0cbab72d98165deb4d1dfde149..01dbeed0f38f8ca9700b9a05bfebcf4ddc1b21b1 100644
--- a/dune/fem-dg/test/dataio/checkpointing.hh
+++ b/dune/fem-dg/examples/dataio/checkpointing.hh
@@ -8,7 +8,7 @@
#include <dune/fem/function/common/rangegenerators.hh>
#include <dune/fem/space/common/interpolate.hh>
#include <dune/fem-dg/algorithm/handler/checkpoint.hh>
-#include <dune/fem-dg/test/dataio/checkedcheckpointhandler.hh>
+#include <dune/fem-dg/examples/dataio/checkedcheckpointhandler.hh>
namespace Dune
{
diff --git a/dune/fem-dg/test/dataio/dataconvert.cc b/dune/fem-dg/examples/dataio/dataconvert.cc
similarity index 100%
rename from dune/fem-dg/test/dataio/dataconvert.cc
rename to dune/fem-dg/examples/dataio/dataconvert.cc
diff --git a/dune/fem-dg/test/dataio/main.cc b/dune/fem-dg/examples/dataio/main.cc
similarity index 100%
rename from dune/fem-dg/test/dataio/main.cc
rename to dune/fem-dg/examples/dataio/main.cc
diff --git a/dune/fem-dg/test/dataio/models.hh b/dune/fem-dg/examples/dataio/models.hh
similarity index 100%
rename from dune/fem-dg/test/dataio/models.hh
rename to dune/fem-dg/examples/dataio/models.hh
diff --git a/dune/fem-dg/test/dataio/problem.hh b/dune/fem-dg/examples/dataio/problem.hh
similarity index 100%
rename from dune/fem-dg/test/dataio/problem.hh
rename to dune/fem-dg/examples/dataio/problem.hh
diff --git a/dune/fem-dg/test/dataio/problemcreator.hh b/dune/fem-dg/examples/dataio/problemcreator.hh
similarity index 99%
rename from dune/fem-dg/test/dataio/problemcreator.hh
rename to dune/fem-dg/examples/dataio/problemcreator.hh
index f0ca0b2189d2039fea302e6241d87ac79ca3c96d..735f6683beec4f303e151e0cb572333b89675810 100644
--- a/dune/fem-dg/test/dataio/problemcreator.hh
+++ b/dune/fem-dg/examples/dataio/problemcreator.hh
@@ -30,7 +30,7 @@
//--------- FLUXES ---------------------------
#include <dune/fem-dg/operator/fluxes/advection/fluxes.hh>
//--------- STEPPER -------------------------
-#include <dune/fem-dg/test/dataio/checkpointing.hh>
+#include <dune/fem-dg/examples/dataio/checkpointing.hh>
#include <dune/fem-dg/algorithm/evolution.hh>
#include <dune/fem-dg/algorithm/steadystate.hh>
//--------- EOCERROR ------------------------
diff --git a/dune/fem-dg/test/dataio/CMakeLists.txt b/dune/fem-dg/examples/dataio/test/CMakeLists.txt
similarity index 71%
rename from dune/fem-dg/test/dataio/CMakeLists.txt
rename to dune/fem-dg/examples/dataio/test/CMakeLists.txt
index f3fedf82e973bfc839cc1ddde4c1e1e61d9fb069..d32bb84fec48ea6ee999638e8470be47aa5f84ff 100644
--- a/dune/fem-dg/test/dataio/CMakeLists.txt
+++ b/dune/fem-dg/examples/dataio/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-dune_install( dataconvert.cc )
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/dataio/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/dataio/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
@@ -16,14 +14,14 @@ add_definitions( "-DENABLE_ADAPTIVELEAFINDEXSET_FOR_YASPGRID" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( dataconvert dataconvert.cc )
- add_executable( checkpointing main.cc )
+ add_executable( dataconvert ../dataconvert.cc )
+ add_executable( checkpointing ../main.cc )
dune_target_enable_all_packages( dataconvert checkpointing )
dune_add_test( dataconvert checkpointing )
else()
dune_add_test( NAME dataconvert
- SOURCES dataconvert.cc )
+ SOURCES ../dataconvert.cc )
dune_add_test( NAME checkpointing
- SOURCES main.cc )
+ SOURCES ../main.cc )
endif()
diff --git a/dune/fem-dg/test/dataio/parameter.in b/dune/fem-dg/examples/dataio/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/dataio/parameter.in
rename to dune/fem-dg/examples/dataio/test/parameter.in
diff --git a/dune/fem-dg/test/dataio/parameter_cmake b/dune/fem-dg/examples/dataio/test/parameter_cmake
similarity index 88%
rename from dune/fem-dg/test/dataio/parameter_cmake
rename to dune/fem-dg/examples/dataio/test/parameter_cmake
index 9d195353887cec79fb1cd675395b7ab68b5d9b6d..5b04e7ff2c44972414d1ca60863a46ff23dd5bce 100644
--- a/dune/fem-dg/test/dataio/parameter_cmake
+++ b/dune/fem-dg/examples/dataio/test/parameter_cmake
@@ -19,9 +19,9 @@ fem.io.checkpointmax: 2
# DOMAIN
#-------
-fem.io.macroGridFile_1d: ../grids/unitcube1.dgf
-fem.io.macroGridFile_2d: ../grids/unitcube2.dgf
-fem.io.macroGridFile_3d: ../grids/unitcube3.dgf
+fem.io.macroGridFile_1d: ../../grids/unitcube1.dgf
+fem.io.macroGridFile_2d: ../../grids/unitcube2.dgf
+fem.io.macroGridFile_3d: ../../grids/unitcube3.dgf
# PROBLEM SETUP
diff --git a/dune/fem-dg/examples/euler/CMakeLists.txt b/dune/fem-dg/examples/euler/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0108bc21be0f6227c8a2ac565f33eb0eb57c1de8
--- /dev/null
+++ b/dune/fem-dg/examples/euler/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( main.cc models.hh problemcreator.hh problems.hh )
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/euler/main.cc b/dune/fem-dg/examples/euler/main.cc
similarity index 100%
rename from dune/fem-dg/test/euler/main.cc
rename to dune/fem-dg/examples/euler/main.cc
diff --git a/dune/fem-dg/test/euler/models.hh b/dune/fem-dg/examples/euler/models.hh
similarity index 100%
rename from dune/fem-dg/test/euler/models.hh
rename to dune/fem-dg/examples/euler/models.hh
diff --git a/dune/fem-dg/test/euler/problemcreator.hh b/dune/fem-dg/examples/euler/problemcreator.hh
similarity index 100%
rename from dune/fem-dg/test/euler/problemcreator.hh
rename to dune/fem-dg/examples/euler/problemcreator.hh
diff --git a/dune/fem-dg/test/euler/problems.hh b/dune/fem-dg/examples/euler/problems.hh
similarity index 100%
rename from dune/fem-dg/test/euler/problems.hh
rename to dune/fem-dg/examples/euler/problems.hh
diff --git a/dune/fem-dg/test/euler/problems/chorjo.cc b/dune/fem-dg/examples/euler/problems/chorjo.cc
similarity index 100%
rename from dune/fem-dg/test/euler/problems/chorjo.cc
rename to dune/fem-dg/examples/euler/problems/chorjo.cc
diff --git a/dune/fem-dg/test/euler/problems/chorjo.hh b/dune/fem-dg/examples/euler/problems/chorjo.hh
similarity index 100%
rename from dune/fem-dg/test/euler/problems/chorjo.hh
rename to dune/fem-dg/examples/euler/problems/chorjo.hh
diff --git a/dune/fem-dg/test/euler/problems/problems.hh b/dune/fem-dg/examples/euler/problems/problems.hh
similarity index 100%
rename from dune/fem-dg/test/euler/problems/problems.hh
rename to dune/fem-dg/examples/euler/problems/problems.hh
diff --git a/dune/fem-dg/test/euler/CMakeLists.txt b/dune/fem-dg/examples/euler/test/CMakeLists.txt
similarity index 59%
rename from dune/fem-dg/test/euler/CMakeLists.txt
rename to dune/fem-dg/examples/euler/test/CMakeLists.txt
index 62282de4f40896981f997e828ba56739aec516fe..ab523bd2c4611815356da4b6a23c16fe4df0a64c 100644
--- a/dune/fem-dg/test/euler/CMakeLists.txt
+++ b/dune/fem-dg/examples/euler/test/CMakeLists.txt
@@ -1,30 +1,26 @@
-dune_install( models.hh problemcreator.hh problems.hh )
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/euler/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/euler/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
endif()
add_definitions( "-DYASPGRID" )
add_definitions( "-DGRIDDIM=2" )
-add_definitions( "-DFLUX=1" )
-add_definitions( "-DPRIMALDG" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( euler main.cc problems/chorjo.cc )
- add_executable( eulerall main.cc problems/chorjo.cc )
- set_property(TARGET eulerall APPEND PROPERTY
+ add_executable( euler ../main.cc ../problems/chorjo.cc )
+ add_executable( eulerall ../main.cc ../problems/chorjo.cc )
+ set_property(TARGET euler APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( euler eulerall )
dune_add_test( euler eulerall )
else()
dune_add_test( NAME eulerall
- SOURCES main.cc problems/chorjo.cc
+ SOURCES ../main.cc ../problems/chorjo.cc
COMPILE_DEFINITIONS LIMITER )
dune_add_test( NAME euler
- SOURCES main.cc problems/chorjo.cc
+ SOURCES ../main.cc ../problems/chorjo.cc
COMPILE_DEFINITIONS POLORDER=2 )
endif()
diff --git a/dune/fem-dg/test/advdiff/parameter b/dune/fem-dg/examples/euler/test/parameter
similarity index 70%
rename from dune/fem-dg/test/advdiff/parameter
rename to dune/fem-dg/examples/euler/test/parameter
index 7680fd1e7db8bab9cffb52eb4f6e7ae39c9a8cab..5c878d2879acb09de271c683798f43269c91b4cd 100644
--- a/dune/fem-dg/test/advdiff/parameter
+++ b/dune/fem-dg/examples/euler/test/parameter
@@ -2,7 +2,7 @@
# (-1: off, p: process p is verbose, in general 0 is a good choice)
fem.verboserank: 0
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/advdiff/data # specify directory for data output (is created if not exists)
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/advdiff
+fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/examples/euler/data # specify directory for data output (is created if not exists)
+fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/examples/euler
paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/euler/parameter.in b/dune/fem-dg/examples/euler/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/euler/parameter.in
rename to dune/fem-dg/examples/euler/test/parameter.in
diff --git a/dune/fem-dg/test/euler/parameter_cmake b/dune/fem-dg/examples/euler/test/parameter_cmake
similarity index 85%
rename from dune/fem-dg/test/euler/parameter_cmake
rename to dune/fem-dg/examples/euler/test/parameter_cmake
index eb057057bce3d1c4e8365edcc211ebaaf3439b76..7b14a70319958763403f38243e4f30dc3b463230 100644
--- a/dune/fem-dg/test/euler/parameter_cmake
+++ b/dune/fem-dg/examples/euler/test/parameter_cmake
@@ -32,7 +32,7 @@ gridsol.filename: straka-checkpoint
# GENERAL
#--------
-paramfile: ../parameter/paramBase
+paramfile: ../../parameter/paramBase
# STEPPER
@@ -45,7 +45,7 @@ femdg.stepper.maxtimestep: 0.1
# PROBLEM SETUP
#--------------
-paramfile: ../parameter/paramPhysicalConstants
+paramfile: ../../parameter/paramPhysicalConstants
# choises are: LLF, HLL, HLLC, LLF2
dgadvectionflux.method: LLF
@@ -69,11 +69,11 @@ r: 0.25 # radius of perturbation ball
# DOMAIN SETUP
#-------------
-fem.io.macroGridFile_1d: ../grids/unitcube1.dgf
-fem.io.macroGridFile_2d: ../grids/grid2d_str1d.dgf
-fem.io.macroGridFile_3d: ../grids/unitcube3.dgf
+fem.io.macroGridFile_1d: ../../grids/unitcube1.dgf
+fem.io.macroGridFile_2d: ../../grids/grid2d_str1d.dgf
+fem.io.macroGridFile_3d: ../../grids/unitcube3.dgf
# SOLVER CONFIGURATION
#---------------------
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
diff --git a/dune/fem-dg/test/grids/corner.dgf b/dune/fem-dg/examples/grids/corner.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner.dgf
rename to dune/fem-dg/examples/grids/corner.dgf
diff --git a/dune/fem-dg/test/grids/corner3d.dgf b/dune/fem-dg/examples/grids/corner3d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner3d.dgf
rename to dune/fem-dg/examples/grids/corner3d.dgf
diff --git a/dune/fem-dg/test/grids/corner3d_nonaffine.dgf b/dune/fem-dg/examples/grids/corner3d_nonaffine.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner3d_nonaffine.dgf
rename to dune/fem-dg/examples/grids/corner3d_nonaffine.dgf
diff --git a/dune/fem-dg/test/grids/corner_cube.dgf b/dune/fem-dg/examples/grids/corner_cube.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner_cube.dgf
rename to dune/fem-dg/examples/grids/corner_cube.dgf
diff --git a/dune/fem-dg/test/grids/corner_green.dgf b/dune/fem-dg/examples/grids/corner_green.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner_green.dgf
rename to dune/fem-dg/examples/grids/corner_green.dgf
diff --git a/dune/fem-dg/test/grids/corner_red.dgf b/dune/fem-dg/examples/grids/corner_red.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/corner_red.dgf
rename to dune/fem-dg/examples/grids/corner_red.dgf
diff --git a/dune/fem-dg/test/grids/grid2d_str1d.dgf b/dune/fem-dg/examples/grids/grid2d_str1d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/grid2d_str1d.dgf
rename to dune/fem-dg/examples/grids/grid2d_str1d.dgf
diff --git a/dune/fem-dg/test/grids/nswaves_1d.dgf b/dune/fem-dg/examples/grids/nswaves_1d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/nswaves_1d.dgf
rename to dune/fem-dg/examples/grids/nswaves_1d.dgf
diff --git a/dune/fem-dg/test/grids/nswaves_2d.dgf b/dune/fem-dg/examples/grids/nswaves_2d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/nswaves_2d.dgf
rename to dune/fem-dg/examples/grids/nswaves_2d.dgf
diff --git a/dune/fem-dg/test/grids/nswaves_2d_unstr.dgf b/dune/fem-dg/examples/grids/nswaves_2d_unstr.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/nswaves_2d_unstr.dgf
rename to dune/fem-dg/examples/grids/nswaves_2d_unstr.dgf
diff --git a/dune/fem-dg/test/grids/nswaves_3d.dgf b/dune/fem-dg/examples/grids/nswaves_3d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/nswaves_3d.dgf
rename to dune/fem-dg/examples/grids/nswaves_3d.dgf
diff --git a/dune/fem-dg/test/grids/square2d.dgf b/dune/fem-dg/examples/grids/square2d.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/square2d.dgf
rename to dune/fem-dg/examples/grids/square2d.dgf
diff --git a/dune/fem-dg/test/grids/unitcube1.dgf b/dune/fem-dg/examples/grids/unitcube1.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/unitcube1.dgf
rename to dune/fem-dg/examples/grids/unitcube1.dgf
diff --git a/dune/fem-dg/test/grids/unitcube2.dgf b/dune/fem-dg/examples/grids/unitcube2.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/unitcube2.dgf
rename to dune/fem-dg/examples/grids/unitcube2.dgf
diff --git a/dune/fem-dg/test/grids/unitcube2_per.dgf b/dune/fem-dg/examples/grids/unitcube2_per.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/unitcube2_per.dgf
rename to dune/fem-dg/examples/grids/unitcube2_per.dgf
diff --git a/dune/fem-dg/test/grids/unitcube2_unstr.dgf b/dune/fem-dg/examples/grids/unitcube2_unstr.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/unitcube2_unstr.dgf
rename to dune/fem-dg/examples/grids/unitcube2_unstr.dgf
diff --git a/dune/fem-dg/test/grids/unitcube3.dgf b/dune/fem-dg/examples/grids/unitcube3.dgf
similarity index 100%
rename from dune/fem-dg/test/grids/unitcube3.dgf
rename to dune/fem-dg/examples/grids/unitcube3.dgf
diff --git a/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt b/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..80e9539e7124a5838b7f602d4d7633f0a035ba29
--- /dev/null
+++ b/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( main.cc incompnavierstokesalgorithm.hh models.hh problemcreator.hh problems.hh stokesmodel.hh )
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/incompnavierstokes/incompnavierstokesalgorithm.hh b/dune/fem-dg/examples/incompnavierstokes/incompnavierstokesalgorithm.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/incompnavierstokesalgorithm.hh
rename to dune/fem-dg/examples/incompnavierstokes/incompnavierstokesalgorithm.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/main.cc b/dune/fem-dg/examples/incompnavierstokes/main.cc
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/main.cc
rename to dune/fem-dg/examples/incompnavierstokes/main.cc
diff --git a/dune/fem-dg/test/incompnavierstokes/models.hh b/dune/fem-dg/examples/incompnavierstokes/models.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/models.hh
rename to dune/fem-dg/examples/incompnavierstokes/models.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/problemcreator.hh b/dune/fem-dg/examples/incompnavierstokes/problemcreator.hh
similarity index 99%
rename from dune/fem-dg/test/incompnavierstokes/problemcreator.hh
rename to dune/fem-dg/examples/incompnavierstokes/problemcreator.hh
index 8d57bb264683919b92e6deedb5cbce757ff31c32..dbd4393023bc183d9ba7ca81d4b24855e0598f53 100644
--- a/dune/fem-dg/test/incompnavierstokes/problemcreator.hh
+++ b/dune/fem-dg/examples/incompnavierstokes/problemcreator.hh
@@ -33,7 +33,7 @@
//--------- STEPPER -------------------------
#include <dune/fem-dg/algorithm/sub/advectiondiffusion.hh>
#include <dune/fem-dg/algorithm/sub/advection.hh>
-#include <dune/fem-dg/test/stokes/stokesalgorithm.hh>
+#include <dune/fem-dg/examples/stokes/stokesalgorithm.hh>
#include <dune/fem-dg/algorithm/evolution.hh>
#include "incompnavierstokesalgorithm.hh"
//--------- EOCERROR ------------------------
diff --git a/dune/fem-dg/test/incompnavierstokes/problems.hh b/dune/fem-dg/examples/incompnavierstokes/problems.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/problems.hh
rename to dune/fem-dg/examples/incompnavierstokes/problems.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/problems/operatorsplitting.hh b/dune/fem-dg/examples/incompnavierstokes/problems/operatorsplitting.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/problems/operatorsplitting.hh
rename to dune/fem-dg/examples/incompnavierstokes/problems/operatorsplitting.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/problems/problem.hh b/dune/fem-dg/examples/incompnavierstokes/problems/problem.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/problems/problem.hh
rename to dune/fem-dg/examples/incompnavierstokes/problems/problem.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/stokesmodel.hh b/dune/fem-dg/examples/incompnavierstokes/stokesmodel.hh
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/stokesmodel.hh
rename to dune/fem-dg/examples/incompnavierstokes/stokesmodel.hh
diff --git a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt b/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
similarity index 64%
rename from dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
rename to dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
index 3b0d9e951b4ef6080f0dca882681f335cec93a9b..6e5f88b201e8a50aa5b7d719df9cc24775c7f2af 100644
--- a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/incompnavierstokes/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-dune_install( ns_model.hh problemcreator.hh nswaves.hh ns_model_spec.hh nssmooth.hh thermodynamics.hh passtraits.hh)
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/incompnavierstokes/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/incompnavierstokes/")
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter )
# default settings for the test case
@@ -9,18 +7,18 @@ add_definitions( "-DGRIDDIM=2" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( incompnavierstokes main.cc )
- add_executable( incompnavierstokesall main.cc )
- set_property(TARGET incompnavierstokesall APPEND PROPERTY
+ add_executable( incompnavierstokes ../main.cc )
+ add_executable( incompnavierstokesall ../main.cc )
+ set_property(TARGET incompnavierstokes APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( incompnavierstokes incompnavierstokesall )
dune_add_test( incompnavierstokes incompnavierstokesall )
else()
dune_add_test( NAME incompnavierstokesall
- SOURCES main.cc )
+ SOURCES ../main.cc )
dune_add_test( NAME incompnavierstokes
- SOURCES main.cc
+ SOURCES ../main.cc
COMPILE_DEFINITIONS POLORDER=2 )
endif()
diff --git a/dune/fem-dg/test/incompnavierstokes/parameter.in b/dune/fem-dg/examples/incompnavierstokes/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/incompnavierstokes/parameter.in
rename to dune/fem-dg/examples/incompnavierstokes/test/parameter.in
diff --git a/dune/fem-dg/test/navierstokes/parameter_cmake b/dune/fem-dg/examples/incompnavierstokes/test/parameter_cmake
similarity index 92%
rename from dune/fem-dg/test/navierstokes/parameter_cmake
rename to dune/fem-dg/examples/incompnavierstokes/test/parameter_cmake
index e79e1e6cb33539738740d6f2303476e949843d92..f55abb183c3c49cb7384a2a23385ac2766596fe1 100644
--- a/dune/fem-dg/test/navierstokes/parameter_cmake
+++ b/dune/fem-dg/examples/incompnavierstokes/test/parameter_cmake
@@ -17,7 +17,7 @@ femdg.additionalvariables: false
# GENERAL
#--------
-paramfile: ../parameter/paramBase
+paramfile: ../../parameter/paramBase
# GRID SOLUTION
@@ -29,7 +29,7 @@ gridsol.filename: nseq-checkpoint
# PROBLEM SETUP
#--------------
-paramfile: ../parameter/paramPhysicalConstants
+paramfile: ../../parameter/paramPhysicalConstants
# WBPROBLEM
# g: 0.7 # m/(ss)
@@ -61,5 +61,5 @@ fem.io.macroGridFile_3d: ../grids/nswaves_3d.dgf
# SOLVER CONFIGURATION
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
diff --git a/dune/fem-dg/examples/navierstokes/CMakeLists.txt b/dune/fem-dg/examples/navierstokes/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..751cfc66eeea938a96a5e6c78ec0708571de42eb
--- /dev/null
+++ b/dune/fem-dg/examples/navierstokes/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( main.cc ns_model.hh problemcreator.hh ns_model_spec.hh thermodynamics.hh passtraits.hh)
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/navierstokes/main.cc b/dune/fem-dg/examples/navierstokes/main.cc
similarity index 100%
rename from dune/fem-dg/test/navierstokes/main.cc
rename to dune/fem-dg/examples/navierstokes/main.cc
diff --git a/dune/fem-dg/test/navierstokes/models.hh b/dune/fem-dg/examples/navierstokes/models.hh
similarity index 100%
rename from dune/fem-dg/test/navierstokes/models.hh
rename to dune/fem-dg/examples/navierstokes/models.hh
diff --git a/dune/fem-dg/test/navierstokes/navierstokesflux.hh b/dune/fem-dg/examples/navierstokes/navierstokesflux.hh
similarity index 100%
rename from dune/fem-dg/test/navierstokes/navierstokesflux.hh
rename to dune/fem-dg/examples/navierstokes/navierstokesflux.hh
diff --git a/dune/fem-dg/test/navierstokes/problemcreator.hh b/dune/fem-dg/examples/navierstokes/problemcreator.hh
similarity index 100%
rename from dune/fem-dg/test/navierstokes/problemcreator.hh
rename to dune/fem-dg/examples/navierstokes/problemcreator.hh
diff --git a/dune/fem-dg/test/navierstokes/problems.hh b/dune/fem-dg/examples/navierstokes/problems.hh
similarity index 100%
rename from dune/fem-dg/test/navierstokes/problems.hh
rename to dune/fem-dg/examples/navierstokes/problems.hh
diff --git a/dune/fem-dg/test/navierstokes/problems/nssmooth.hh b/dune/fem-dg/examples/navierstokes/problems/nssmooth.hh
similarity index 99%
rename from dune/fem-dg/test/navierstokes/problems/nssmooth.hh
rename to dune/fem-dg/examples/navierstokes/problems/nssmooth.hh
index 52faa428c3e4de0ff1f96330676c9dd4516881dd..99aad6ad246a4b94fef4ca9fb75ad1f0ac43a2a8 100644
--- a/dune/fem-dg/test/navierstokes/problems/nssmooth.hh
+++ b/dune/fem-dg/examples/navierstokes/problems/nssmooth.hh
@@ -9,7 +9,7 @@
#include <dune/fem/space/common/functionspace.hh>
// local includes
-#include <dune/fem-dg/test/navierstokes/thermodynamics.hh>
+#include <dune/fem-dg/examples/navierstokes/thermodynamics.hh>
#include <dune/fem-dg/models/defaultprobleminterfaces.hh>
diff --git a/dune/fem-dg/test/navierstokes/problems/nswaves.hh b/dune/fem-dg/examples/navierstokes/problems/nswaves.hh
similarity index 99%
rename from dune/fem-dg/test/navierstokes/problems/nswaves.hh
rename to dune/fem-dg/examples/navierstokes/problems/nswaves.hh
index 9a6eabe72a34c05e7c9c7d46a83fcf23db7e54e0..92727e623dd65fa9f4a5956c75000514f106cbb3 100644
--- a/dune/fem-dg/test/navierstokes/problems/nswaves.hh
+++ b/dune/fem-dg/examples/navierstokes/problems/nswaves.hh
@@ -9,7 +9,7 @@
#include <dune/fem/space/common/functionspace.hh>
// local includes
-#include <dune/fem-dg/test/navierstokes/thermodynamics.hh>
+#include <dune/fem-dg/examples/navierstokes/thermodynamics.hh>
#include <dune/fem-dg/models/defaultprobleminterfaces.hh>
diff --git a/dune/fem-dg/test/navierstokes/CMakeLists.txt b/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
similarity index 67%
rename from dune/fem-dg/test/navierstokes/CMakeLists.txt
rename to dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
index fbeb835eabb9dc07ae3c82d214bb75eea0f20edb..f816969f7b83444b46132e40fdbe28f7ae655daa 100644
--- a/dune/fem-dg/test/navierstokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/navierstokes/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-dune_install( ns_model.hh problemcreator.hh ns_model_spec.hh thermodynamics.hh passtraits.hh)
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/navierstokes/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/navierstokes/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter )
endif()
@@ -11,18 +9,18 @@ add_definitions( "-DGRIDDIM=2" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( navierstokes main.cc )
- add_executable( navierstokesall main.cc )
- set_property(TARGET navierstokesall APPEND PROPERTY
+ add_executable( navierstokes ../main.cc )
+ add_executable( navierstokesall ../main.cc )
+ set_property(TARGET navierstokes APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( navierstokes navierstokesall )
dune_add_test( navierstokes navierstokesall )
else()
dune_add_test( NAME navierstokes
- SOURCES main.cc
+ SOURCES ../main.cc
COMPILE_DEFINITIONS POLORDER=2 )
dune_add_test( NAME navierstokesall
- SOURCES main.cc )
+ SOURCES ../main.cc )
endif()
#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0" )
diff --git a/dune/fem-dg/test/navierstokes/parameter.in b/dune/fem-dg/examples/navierstokes/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/navierstokes/parameter.in
rename to dune/fem-dg/examples/navierstokes/test/parameter.in
diff --git a/dune/fem-dg/test/incompnavierstokes/parameter_cmake b/dune/fem-dg/examples/navierstokes/test/parameter_cmake
similarity index 64%
rename from dune/fem-dg/test/incompnavierstokes/parameter_cmake
rename to dune/fem-dg/examples/navierstokes/test/parameter_cmake
index e79e1e6cb33539738740d6f2303476e949843d92..bcbea92ce8441ed5ac1941c1d925d6cedaec67ac 100644
--- a/dune/fem-dg/test/incompnavierstokes/parameter_cmake
+++ b/dune/fem-dg/examples/navierstokes/test/parameter_cmake
@@ -17,7 +17,7 @@ femdg.additionalvariables: false
# GENERAL
#--------
-paramfile: ../parameter/paramBase
+paramfile: ../../parameter/paramBase
# GRID SOLUTION
@@ -29,7 +29,7 @@ gridsol.filename: nseq-checkpoint
# PROBLEM SETUP
#--------------
-paramfile: ../parameter/paramPhysicalConstants
+paramfile: ../../parameter/paramPhysicalConstants
# WBPROBLEM
# g: 0.7 # m/(ss)
@@ -50,16 +50,16 @@ kGNS: 3.1415926535897932385
# DOMAIN CONFIGURATION
#---------------------
-fem.io.macroGridFile_1d: ../grids/nswaves_1d.dgf
-fem.io.macroGridFile_2d: ../grids/nswaves_2d.dgf
-#fem.io.macroGridFile_2d: ../grids/mesh4_1_2.typ1.dgf
-#fem.io.macroGridFile_2d: ../grids/mesh4_1_1.typ1.dgf
-#fem.io.macroGridFile_2d: ../grids/nswaves_2d_unstr.dgf
-fem.io.macroGridFile_3d: ../grids/nswaves_3d.dgf
-#fem.io.macroGridFile_3d: ../grids/dkershaw08.msh.dgf
-#fem.io.macroGridFile_3d: ../grids/RandMesh4.msh.dgf
+fem.io.macroGridFile_1d: ../../grids/nswaves_1d.dgf
+fem.io.macroGridFile_2d: ../../grids/nswaves_2d.dgf
+#fem.io.macroGridFile_2d: ../../grids/mesh4_1_2.typ1.dgf
+#fem.io.macroGridFile_2d: ../../grids/mesh4_1_1.typ1.dgf
+#fem.io.macroGridFile_2d: ../../grids/nswaves_2d_unstr.dgf
+fem.io.macroGridFile_3d: ../../grids/nswaves_3d.dgf
+#fem.io.macroGridFile_3d: ../../grids/dkershaw08.msh.dgf
+#fem.io.macroGridFile_3d: ../../grids/RandMesh4.msh.dgf
# SOLVER CONFIGURATION
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
diff --git a/dune/fem-dg/test/navierstokes/thermodynamics.hh b/dune/fem-dg/examples/navierstokes/thermodynamics.hh
similarity index 100%
rename from dune/fem-dg/test/navierstokes/thermodynamics.hh
rename to dune/fem-dg/examples/navierstokes/thermodynamics.hh
diff --git a/dune/fem-dg/test/parameter/paramBase b/dune/fem-dg/examples/parameter/paramBase
similarity index 100%
rename from dune/fem-dg/test/parameter/paramBase
rename to dune/fem-dg/examples/parameter/paramBase
diff --git a/dune/fem-dg/test/parameter/paramPhysicalConstants b/dune/fem-dg/examples/parameter/paramPhysicalConstants
similarity index 100%
rename from dune/fem-dg/test/parameter/paramPhysicalConstants
rename to dune/fem-dg/examples/parameter/paramPhysicalConstants
diff --git a/dune/fem-dg/test/parameter/paramSolver b/dune/fem-dg/examples/parameter/paramSolver
similarity index 100%
rename from dune/fem-dg/test/parameter/paramSolver
rename to dune/fem-dg/examples/parameter/paramSolver
diff --git a/dune/fem-dg/examples/poisson/CMakeLists.txt b/dune/fem-dg/examples/poisson/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d76bad1a0ea7cb35308295802ba84b4b3d869c71
--- /dev/null
+++ b/dune/fem-dg/examples/poisson/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( main.cc gridinitializer.hh models.hh problemcreator.hh problems.hh )
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/poisson/gridinitializer.hh b/dune/fem-dg/examples/poisson/gridinitializer.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/gridinitializer.hh
rename to dune/fem-dg/examples/poisson/gridinitializer.hh
diff --git a/dune/fem-dg/test/poisson/main.cc b/dune/fem-dg/examples/poisson/main.cc
similarity index 100%
rename from dune/fem-dg/test/poisson/main.cc
rename to dune/fem-dg/examples/poisson/main.cc
diff --git a/dune/fem-dg/test/poisson/models.hh b/dune/fem-dg/examples/poisson/models.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/models.hh
rename to dune/fem-dg/examples/poisson/models.hh
diff --git a/dune/fem-dg/test/poisson/problemcreator.hh b/dune/fem-dg/examples/poisson/problemcreator.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/problemcreator.hh
rename to dune/fem-dg/examples/poisson/problemcreator.hh
diff --git a/dune/fem-dg/test/poisson/problems.hh b/dune/fem-dg/examples/poisson/problems.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/problems.hh
rename to dune/fem-dg/examples/poisson/problems.hh
diff --git a/dune/fem-dg/test/poisson/problems/benchmarkproblems.hh b/dune/fem-dg/examples/poisson/problems/benchmarkproblems.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/problems/benchmarkproblems.hh
rename to dune/fem-dg/examples/poisson/problems/benchmarkproblems.hh
diff --git a/dune/fem-dg/test/poisson/problems/poissonproblem.hh b/dune/fem-dg/examples/poisson/problems/poissonproblem.hh
similarity index 100%
rename from dune/fem-dg/test/poisson/problems/poissonproblem.hh
rename to dune/fem-dg/examples/poisson/problems/poissonproblem.hh
diff --git a/dune/fem-dg/test/poisson/CMakeLists.txt b/dune/fem-dg/examples/poisson/test/CMakeLists.txt
similarity index 74%
rename from dune/fem-dg/test/poisson/CMakeLists.txt
rename to dune/fem-dg/examples/poisson/test/CMakeLists.txt
index 01241971828e0289589b4117e741d464eefcbccd..525785c8fc3ba4593cc9924a8fab4fdc3d5b9b35 100644
--- a/dune/fem-dg/test/poisson/CMakeLists.txt
+++ b/dune/fem-dg/examples/poisson/test/CMakeLists.txt
@@ -1,6 +1,6 @@
dune_install( models.hh problemcreator.hh problems.hh )
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/poisson/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/poisson/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
endif()
@@ -11,17 +11,17 @@ add_definitions( "-DDIMRANGE=1" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( poisson main.cc )
- add_executable( poissonall main.cc )
- set_property(TARGET poissonall APPEND PROPERTY
+ add_executable( poisson ../main.cc )
+ add_executable( poissonall ../main.cc )
+ set_property(TARGET poisson APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( poisson poissonall )
dune_add_test( poisson poissonall )
else()
dune_add_test( NAME poissonall
- SOURCES main.cc )
+ SOURCES ../main.cc )
dune_add_test( NAME poisson
- SOURCES main.cc
+ SOURCES ../main.cc
COMPILE_DEFINITIONS POLORDER=2)
endif()
diff --git a/dune/fem-dg/test/poisson/parameter.in b/dune/fem-dg/examples/poisson/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/poisson/parameter.in
rename to dune/fem-dg/examples/poisson/test/parameter.in
diff --git a/dune/fem-dg/test/poisson/parameter_cmake b/dune/fem-dg/examples/poisson/test/parameter_cmake
similarity index 78%
rename from dune/fem-dg/test/poisson/parameter_cmake
rename to dune/fem-dg/examples/poisson/test/parameter_cmake
index 31cf370019a38094956bb2eda0e3a0d4e906d1e3..89713013d65904aebb7fef733a9031782b4d78e2 100644
--- a/dune/fem-dg/test/poisson/parameter_cmake
+++ b/dune/fem-dg/examples/poisson/test/parameter_cmake
@@ -22,13 +22,13 @@ zvelocity: 0. # the only advection part for the linear heat eqn
fem.solver.verbose: 0
# macro grid file
-fem.io.macroGridFile_2d: ../grids/unitcube2.dgf
-#fem.io.macroGridFile_2d: ../grids/square2d.dgf
-#fem.io.macroGridFile_2d:../grids/nonaffine.dgf
-#fem.io.macroGridFile_2d:../grids/corner_cube.dgf
-#fem.io.macroGridFile_2d:../grids/corner.dgf
-#fem.io.macroGridFile_2d:../grids/corner_green.dgf
-#fem.io.macroGridFile_2d:../grids/corner_red.dgf
+fem.io.macroGridFile_2d: ../../grids/unitcube2.dgf
+#fem.io.macroGridFile_2d:../../grids/square2d.dgf
+#fem.io.macroGridFile_2d:../../grids/nonaffine.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_cube.dgf
+#fem.io.macroGridFile_2d:../../grids/corner.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_green.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_red.dgf
nonConformOrigin: false
# choises are: CDG2, CDG, IP, NIPG, BO, BR2
@@ -54,7 +54,7 @@ fem.io.subsamplinglevel: 0
# SOLVER
# ------
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
istl.preconditioning.method: amg-ilu-0
istl.preconditioning.iterations: 1
istl.preconditioning.relaxation: 1
diff --git a/dune/fem-dg/examples/stokes/CMakeLists.txt b/dune/fem-dg/examples/stokes/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c33b516a6f68e33bfdaaa97d6c82c0edc8d4f085
--- /dev/null
+++ b/dune/fem-dg/examples/stokes/CMakeLists.txt
@@ -0,0 +1,3 @@
+dune_install( main.cc models.hh problemcreator.hh problems.hh stokesalgorithm.hh stokesassembler.hh tensorhelper.hh )
+
+dune_add_subdirs( test )
diff --git a/dune/fem-dg/test/stokes/main.cc b/dune/fem-dg/examples/stokes/main.cc
similarity index 100%
rename from dune/fem-dg/test/stokes/main.cc
rename to dune/fem-dg/examples/stokes/main.cc
diff --git a/dune/fem-dg/test/stokes/models.hh b/dune/fem-dg/examples/stokes/models.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/models.hh
rename to dune/fem-dg/examples/stokes/models.hh
diff --git a/dune/fem-dg/test/stokes/problemcreator.hh b/dune/fem-dg/examples/stokes/problemcreator.hh
similarity index 98%
rename from dune/fem-dg/test/stokes/problemcreator.hh
rename to dune/fem-dg/examples/stokes/problemcreator.hh
index 1a721a6b7e279cb31e7c53288820c8035b1a48ff..d56281e3172fcdc751bd1a532b9cc5b368405793 100644
--- a/dune/fem-dg/test/stokes/problemcreator.hh
+++ b/dune/fem-dg/examples/stokes/problemcreator.hh
@@ -25,7 +25,7 @@
//--------- GRID HELPER ---------------------
#include <dune/fem-dg/algorithm/gridinitializer.hh>
-#include <dune/fem-dg/test/poisson/gridinitializer.hh>
+#include <dune/fem-dg/examples/poisson/gridinitializer.hh>
//--------- OPERATOR/SOLVER -----------------
#include <dune/fem-dg/assemble/primalmatrix.hh>
#include <dune/fem-dg/operator/dg/operatortraits.hh>
@@ -33,7 +33,7 @@
#include <dune/fem-dg/operator/fluxes/euler/fluxes.hh>
#include <dune/fem-dg/operator/fluxes/advection/fluxes.hh>
//--------- STEPPER -------------------------
-#include <dune/fem-dg/test/stokes/stokesalgorithm.hh>
+#include <dune/fem-dg/examples/stokes/stokesalgorithm.hh>
#include <dune/fem-dg/algorithm/steadystate.hh>
//--------- EOCERROR ------------------------
#include <dune/fem-dg/misc/error/l2eocerror.hh>
diff --git a/dune/fem-dg/test/stokes/problems.hh b/dune/fem-dg/examples/stokes/problems.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/problems.hh
rename to dune/fem-dg/examples/stokes/problems.hh
diff --git a/dune/fem-dg/test/stokes/problems/corner.hh b/dune/fem-dg/examples/stokes/problems/corner.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/problems/corner.hh
rename to dune/fem-dg/examples/stokes/problems/corner.hh
diff --git a/dune/fem-dg/test/stokes/problems/problem.hh b/dune/fem-dg/examples/stokes/problems/problem.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/problems/problem.hh
rename to dune/fem-dg/examples/stokes/problems/problem.hh
diff --git a/dune/fem-dg/test/stokes/stokesalgorithm.hh b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
similarity index 99%
rename from dune/fem-dg/test/stokes/stokesalgorithm.hh
rename to dune/fem-dg/examples/stokes/stokesalgorithm.hh
index 1297ec717d6f73f21597137da1a10d0d7494bd6d..f5bb10506dd349e46923f0fe213ebc5c23a4d646 100644
--- a/dune/fem-dg/test/stokes/stokesalgorithm.hh
+++ b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
@@ -25,7 +25,7 @@
#include <dune/fem-dg/misc/tupleutility.hh>
// include local header files
-#include <dune/fem-dg/test/stokes/stokesassembler.hh>
+#include <dune/fem-dg/examples/stokes/stokesassembler.hh>
namespace Dune
{
diff --git a/dune/fem-dg/test/stokes/stokesassembler.hh b/dune/fem-dg/examples/stokes/stokesassembler.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/stokesassembler.hh
rename to dune/fem-dg/examples/stokes/stokesassembler.hh
diff --git a/dune/fem-dg/test/stokes/tensorhelper.hh b/dune/fem-dg/examples/stokes/tensorhelper.hh
similarity index 100%
rename from dune/fem-dg/test/stokes/tensorhelper.hh
rename to dune/fem-dg/examples/stokes/tensorhelper.hh
diff --git a/dune/fem-dg/test/stokes/CMakeLists.txt b/dune/fem-dg/examples/stokes/test/CMakeLists.txt
similarity index 64%
rename from dune/fem-dg/test/stokes/CMakeLists.txt
rename to dune/fem-dg/examples/stokes/test/CMakeLists.txt
index 182ee75736c4c04c93b30dee34a3a18784f98e8e..3c21a6717127cbe5abbe94229a63bb98fa827e18 100644
--- a/dune/fem-dg/test/stokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/stokes/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-dune_install(models.hh problemcreator.hh problems.hh stokesalgorithm.hh stokesassembler.hh tensorhelper.hh)
-
-include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/test/stokes/")
+include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/stokes/")
if(GENERATE_FEMDG_PARAMETER_FILE)
configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter)
endif()
@@ -10,18 +8,18 @@ add_definitions( "-DGRIDDIM=2" )
if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
message( STATUS "Using old test build system (2.4 compability mode) " )
- add_executable( stokes main.cc )
- add_executable( stokesall main.cc )
- set_property(TARGET stokesall APPEND PROPERTY
+ add_executable( stokes ../main.cc )
+ add_executable( stokesall ../main.cc )
+ set_property(TARGET stokes APPEND PROPERTY
COMPILE_DEFINITIONS "POLORDER=2" )
dune_target_enable_all_packages( stokes stokesall )
dune_add_test( stokes stokesall )
else()
dune_add_test( NAME stokes
- SOURCES main.cc
+ SOURCES ../main.cc
COMPILE_DEFINITIONS POLORDER=2 )
dune_add_test( NAME stokesall
- SOURCES main.cc )
+ SOURCES ../main.cc )
endif()
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
diff --git a/dune/fem-dg/test/stokes/parameter.in b/dune/fem-dg/examples/stokes/test/parameter.in
similarity index 100%
rename from dune/fem-dg/test/stokes/parameter.in
rename to dune/fem-dg/examples/stokes/test/parameter.in
diff --git a/dune/fem-dg/test/stokes/parameter_cmake b/dune/fem-dg/examples/stokes/test/parameter_cmake
similarity index 81%
rename from dune/fem-dg/test/stokes/parameter_cmake
rename to dune/fem-dg/examples/stokes/test/parameter_cmake
index 4c3244f42a0b875426910151795292781b362efd..797a3b5b8ea70e150dcb6059545a4ddb91ad0e0a 100644
--- a/dune/fem-dg/test/stokes/parameter_cmake
+++ b/dune/fem-dg/examples/stokes/test/parameter_cmake
@@ -29,13 +29,13 @@ istl.reduction: 1e-10
fem.solver.verbose: 0
# macro grid file
-fem.io.macroGridFile_2d: ../grids/unitcube2.dgf
-#fem.io.macroGridFile_2d: ../grids/square2d.dgf
-#fem.io.macroGridFile_2d:../grids/nonaffine.dgf
-#fem.io.macroGridFile_2d:../grids/corner_cube.dgf
-#fem.io.macroGridFile_2d:../grids/corner.dgf
-#fem.io.macroGridFile_2d:../grids/corner_green.dgf
-#fem.io.macroGridFile_2d:../grids/corner_red.dgf
+fem.io.macroGridFile_2d: ../../grids/unitcube2.dgf
+#fem.io.macroGridFile_2d:../../grids/square2d.dgf
+#fem.io.macroGridFile_2d:../../grids/nonaffine.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_cube.dgf
+#fem.io.macroGridFile_2d:../../grids/corner.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_green.dgf
+#fem.io.macroGridFile_2d:../../grids/corner_red.dgf
nonConformOrigin: false
# choises are: CDG2, CDG, IP, NIPG, BO, BR2
@@ -71,7 +71,7 @@ use_dgstabilization: true
# SOLVER
# ------
-paramfile: ../parameter/paramSolver
+paramfile: ../../parameter/paramSolver
istl.preconditioning.method: amg-ilu-0
istl.preconditioning.iterations: 1
istl.preconditioning.relaxation: 1
diff --git a/dune/fem-dg/test/.gitignore b/dune/fem-dg/test/.gitignore
deleted file mode 100644
index 7c142d8f10183407d1c3dd1b3278d0129a98caed..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/checkpointing
-/dataconvert
diff --git a/dune/fem-dg/test/advdiff/Makefile.am b/dune/fem-dg/test/advdiff/Makefile.am
deleted file mode 100644
index 11031a22ab603a93db3c6bf02a6b190cb54fb08a..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/advdiff/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-# install these headers
-advdiffdir=$(includedir)/test/advdiff
-advdiff_HEADERS = models.hh problemcreator.hh
-
-LDADD = $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(LOCAL_LIBS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS)
-
-#GRIDTYPE = ALUGRID_SIMPLEX
-GRIDTYPE = YASPGRID
-#GRIDTYPE=PARALLELGRID_ALUGRID_SIMPLEX
-#GRIDTYPE=CARTESIANGRID_ALUGRID_CUBE
-#GRIDTYPE = SPGRID
-POLORDER = 2
-GRIDDIM = 2
-DIMRANGE = 1
-FLUX = 1 # LLF 1, HLL 2
-
-#USE_OMP=-fopenmp
-
-# INFO SPACE OPERATOR:
-# 1. define PRIMALDG for IP, BR2, CDG, CDG2
-# 2. define DUALDG for LDG
-# INFO TRACK LIFTING:
-# 1. define LOCALDEBUG to calculate \sum_e\int_Omega(r_e*l_e) and
-# \sum_e\int_Omega(r_e*l_e). They will be output to std::cout from the Algorithm
-# INFO TESTOPERATOR:
-# 1. define TESTOPERATOR for linear advdiff equation to output various
-# information on space operator
-EXTRA_PROGRAMS = advdiff_all
-check_PROGRAMS = advdiff
-
-advdiff_SOURCES = main.cc
-advdiff_all_SOURCES = main.cc
-
-AM_CPPFLAGS = $(USE_OMP) -I../../problems/advdiff $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
- -D$(GRIDTYPE) $(DUNEMPICPPFLAGS) \
- -DDIMRANGE=$(DIMRANGE) -DFLUX=$(FLUX) -DPRIMALDG
-AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-
-advdiff_all_CPPFLAGS = $(AM_CPPFLAGS)
-advdiff_CPPFLAGS = $(advdiff_all_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-
-DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
-
-EXTRA_DIST = parameter
-
-CLEANFILES=manager.*.log eoc_*.tex
-
-PROG=advdiff
-# codegeneration
-generatecode:
- $(MAKE) -i clean
- $(MAKE) CXXFLAGS="-O0 -Wall -DNDEBUG -DBASEFUNCTIONSET_CODEGEN_GENERATE" $(PROG)
- ./$(PROG) femdg.stepper.maximaltimesteps:1 fem.io.outputformat:none codegenparameter
-
-# compile fast code
-compilecode:
- $(MAKE) clean
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -DUSE_BASEFUNCTIONSET_CODEGEN" $(PROG)
-
-codegen:
- $(MAKE) generatecode
- $(MAKE) compilecode
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/fem-dg/test/dataio/parameter b/dune/fem-dg/test/dataio/parameter
deleted file mode 100644
index d91174c90955d300a1505111f05806cb5e0e3f33..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/dataio/parameter
+++ /dev/null
@@ -1,8 +0,0 @@
-# toggle verbosity of on process
-# (-1: off, p: process p is verbose, in general 0 is a good choice)
-fem.verboserank: 0
-
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/dataio/data # specify directory for data output (is created if not exists)
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/dataio
-
-paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/euler/.gitignore b/dune/fem-dg/test/euler/.gitignore
deleted file mode 100644
index ccd0055053930bc24a59338a5a7e81adfb75803f..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/euler/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-data
diff --git a/dune/fem-dg/test/euler/Makefile.am b/dune/fem-dg/test/euler/Makefile.am
deleted file mode 100644
index 15c83574cdc6bbde1cf65f02eedf132cf28fa3fe..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/euler/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-# install these headers
-eulerdir=$(includedir)/dune/fem-dg/test/euler
-euler_HEADERS= models.hh problemcreator.hh problems.hh
-
-LDADD = $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(LOCAL_LIBS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS)
-
-# helper variables
-SOURCES = main.cc problems/chorjo.cc
-
-# INFO FLUX
-# set FLUX to 1 for LLF
-# set FLUX to 2 for HLL (not tested!)
-# INFO TRACK LIFTING:
-# define LOCALDEBUG to calculate \sum_e\int_Omega(r_e*l_e) and
-# \sum_e\int_Omega(r_e*l_e). They will be output to std::cout from the Algorithm
-# INFO LIMITER
-# define LIMITER to apply limiting of the numerical solution (not tested!)
-# INFO WELL-BALANCING
-# define WELLBALANCE to apply well-balance of the numerical solution (not tested!)
-# INFO DIFFFLUXTYPE
-# define PRIMALDG to use the BR2, IP, CDG, CDG2, BO methods
-# define DUALDG to use the LDG method
-
-#GRIDTYPE = ALUGRID_CONFORM
-#GRIDTYPE = ALUGRID_SIMPLEX
-#GRIDTYPE = ALBERTAGRID
-GRIDTYPE = YASPGRID
-#GRIDTYPE = SPGRID
-#GRIDTYPE = ALUGRID_CUBE
-GRIDDIM = 2
-FLUX=1 # see comment below
-DIFFFLUXTYPE=PRIMALDG
-POLORDER=2
-
-#USE_OMP=-fopenmp
-#USE_OMP=-DUSE_PTHREADS=1
-
-AM_CPPFLAGS = $(USE_OMP) -I../../problems/coldbubble $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
- -D$(GRIDTYPE) $(DUNEMPICPPFLAGS) \
- -DFLUX=$(FLUX) -D$(DIFFFLUXTYPE) # -DWANT_CACHED_COMM_MANAGER=0
-AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-
-EXTRA_PROGRAMS = euler_all
-check_PROGRAMS = euler
-
-euler_SOURCES = $(SOURCES)
-euler_all_SOURCES = $(SOURCE)
-
-euler_all_CPPFLAGS = $(AM_CPPFLAGS) -DLIMITER -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-euler_CPPFLAGS = $(euler_all_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-
-DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
-
-EXTRA_DIST = param*
-
-CLEANFILES=manager.*.log
-
-PROG=euler
-# codegeneration
-generatecode:
- $(MAKE) -i clean
- $(MAKE) CXXFLAGS="-O0 -Wall -DNDEBUG -DBASEFUNCTIONSET_CODEGEN_GENERATE" $(PROG)
- ./$(PROG) femdg.stepper.maximaltimesteps:1 fem.io.outputformat:none parameter
-
-compilecode:
- $(MAKE) clean
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -DUSE_BASEFUNCTIONSET_CODEGEN" $(PROG)
-
-codegen:
- $(MAKE) generatecode
- $(MAKE) compilecode
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/fem-dg/test/euler/parameter b/dune/fem-dg/test/euler/parameter
deleted file mode 100644
index 6f6c59e6b6b6026ab45b5d33f1522898d894e3d3..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/euler/parameter
+++ /dev/null
@@ -1,8 +0,0 @@
-# toggle verbosity of on process
-# (-1: off, p: process p is verbose, in general 0 is a good choice)
-fem.verboserank: 0
-
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/euler/data # specify directory for data output (is created if not exists)
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/euler
-
-paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/incompnavierstokes/parameter b/dune/fem-dg/test/incompnavierstokes/parameter
deleted file mode 100644
index e60d3f84d1fb3773ac7e41aa85d474da5a49236c..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/incompnavierstokes/parameter
+++ /dev/null
@@ -1,9 +0,0 @@
-fem.verboserank: 0
-
-# DATA WRITER
-#------------
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/incompnavierstokes/data
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/incompnavierstokes
-
-paramfile: parameter_cmake
-
diff --git a/dune/fem-dg/test/navierstokes/.gitignore b/dune/fem-dg/test/navierstokes/.gitignore
deleted file mode 100644
index ccd0055053930bc24a59338a5a7e81adfb75803f..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/navierstokes/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-data
diff --git a/dune/fem-dg/test/navierstokes/Makefile.am b/dune/fem-dg/test/navierstokes/Makefile.am
deleted file mode 100644
index 8c6b3b3a8a2957764a49f52cb5cdcb974546454a..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/navierstokes/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-# install these headers
-nseqdir=$(includedir)/dune/fem-dg/test/navierstokes
-nseq_HEADERS= models.hh problemcreator.hh thermodynamics.hh
-
-#USE_OMP=-fopenmp
-#USE_OMP=-DUSE_PTHREADS=1
-
-LDADD=$(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(LOCAL_LIBS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS)
-
-SOURCES = main.cc
-
-#GRIDTYPE = ALUGRID_SIMPLEX
-#GRIDTYPE=PARALLELGRID_ALUGRID_CUBE
-#GRIDTYPE=PARALLELGRID_ALUGRID_SIMPLEX
-# GRIDTYPE=SPGRID
-#GRIDTYPE=SPGRID_COUNT_FLOPS
-#GRIDTYPE=CARTESIANGRID_ALUGRID_CUBE
-# GRIDTYPE = ALUGRID_CUBE
-GRIDTYPE=YASPGRID
-#GRIDTYPE = YASPGRID
-GRIDDIM=2
-POLORDER=2
-
-PROBLEM = 2 # check ./problemtype.hh
-FLUX = 1 # check ./problemcreator.hh
-
-DIFFFLUX=PRIMALDG
-#DIFFFLUX=FLUXDG
-
-# INFO SPACE OPERATOR:
-# 1. define PRIMALDG for various space operators in primal formulation
-# 2. define DUALDG for the LDG space operator in dual formulation
-# INFO TRACK LIFTING:
-# 1. define LOCALDEBUG to calculate \sum_e\int_Omega(r_e*l_e) and
-# \sum_e\int_Omega(r_e*l_e). They will be output to std::cout from the Algorithm
-# INFO LIMITER
-# 1. define LIMITER to limit the advection part of the solution (not checked)
-AM_CPPFLAGS = $(USE_OMP) -I../../problems/nseq $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
- -DPROBLEM=$(PROBLEM) -D$(GRIDTYPE) $(DUNEMPICPPFLAGS) \
- -DFLUX=$(FLUX) -D$(DIFFFLUX) # -DCOUNT_FLOPS # -DLEGENDREBASIS # -DWBPROBLEM -DWELLBALANCE
-AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-
-EXTRA_PROGRAMS = navierstokes_all
-check_PROGRAMS = navierstokes
-
-nodist_navierstokes_all_SOURCES = $(SOURCES)
-nodist_navierstokes_SOURCES = $(SOURCES)
-
-navierstokes_all_CPPFLAGS = $(AM_CPPFLAGS)
-navierstokes_CPPFLAGS = $(navierstokes_all_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-
-DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
-
-EXTRA_DIST = parameter
-
-CLEANFILES = manager.*.log
-
-PROG=navierstokes
-# codegeneration
-generatecode:
- $(MAKE) -i clean
- $(MAKE) CODEGEN_OBJFILE= CXXFLAGS="-g -Wall -Wfatal-errors -DBASEFUNCTIONSET_CODEGEN_GENERATE" $(PROG)
- $(MAKE) generate
-
-generate:
- ./$(PROG) fem.eoc.steps:1 femdg.stepper.maximaltimesteps:1 fem.io.outputformat:none fem.ode.order:1 parameter
-
-compilecode:
- $(MAKE) clean
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -DUSE_BASEFUNCTIONSET_CODEGEN" $(PROG)
-
-codegen:
- $(MAKE) generatecode
- $(MAKE) compilecode
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/fem-dg/test/navierstokes/parameter b/dune/fem-dg/test/navierstokes/parameter
deleted file mode 100644
index 24d0b939a2bc0251b40734a6f8d187c132759643..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/navierstokes/parameter
+++ /dev/null
@@ -1,9 +0,0 @@
-fem.verboserank: 0
-
-# DATA WRITER
-#------------
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/navierstokes/data
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/navierstokes
-
-paramfile: parameter_cmake
-
diff --git a/dune/fem-dg/test/poisson/Makefile.am b/dune/fem-dg/test/poisson/Makefile.am
deleted file mode 100644
index 56348abadbad8f8ece308709b9907ed77d22240f..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/poisson/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-# install these headers
-poissondir=$(includedir)/test/poisson
-poisson_HEADERS = models.hh problemcreator.hh problems.hh
-
-LDADD = $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(LOCAL_LIBS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS)
-
-BASEDIR=../../main
-
-#GRIDTYPE = ALUGRID_SIMPLEX
-GRIDTYPE = YASPGRID
-#GRIDTYPE=PARALLELGRID_ALUGRID_SIMPLEX
-#GRIDTYPE=CARTESIANGRID_ALUGRID_CUBE
-#GRIDTYPE = SPGRID
-#GRIDTYPE=ALUGRID_CUBE
-POLORDER = 2
-GRIDDIM = 2
-FLUX = 1 # LLF 1, HLL 2
-WANT_ISTL=1
-
-#USE_OMP=-fopenmp
-
-EXTRA_PROGRAMS = poisson_all # quasiadvdiff quasiadvdiff12 plaplace plaplace12
-check_PROGRAMS = poisson # quasiadvdiff quasiadvdiff12 plaplace plaplace12
-
-poisson_all_SOURCES = main.cc
-poisson_SOURCES = main.cc
-
-AM_CPPFLAGS = $(USE_OMP) $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
- -D$(GRIDTYPE) $(DUNEMPICPPFLAGS) -DDGSCHEME -DONB \
- -DFLUX=$(FLUX) -DPRIMALDG -DWANT_ISTL=$(WANT_ISTL)
-AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-
-poisson_all_CPPFLAGS = $(AM_CPPFLAGS)
-poisson_CPPFLAGS = $(poisson_all_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-
-DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
-
-EXTRA_DIST = parameter
-
-CLEANFILES=manager.*.log eoc_*.tex
-
-PROG=poisson
-# codegeneration
-generatecode:
- $(MAKE) -i clean
- $(MAKE) CXXFLAGS="-O0 -Wall -DNDEBUG -DBASEFUNCTIONSET_CODEGEN_GENERATE" $(PROG)
- ./$(PROG) femdg.stepper.maximaltimesteps:1 fem.io.outputformat:none codegenparameter
-
-# compile fast code
-compilecode:
- $(MAKE) clean
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -DUSE_BASEFUNCTIONSET_CODEGEN" $(PROG)
-
-codegen:
- $(MAKE) generatecode
- $(MAKE) compilecode
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/fem-dg/test/poisson/parameter b/dune/fem-dg/test/poisson/parameter
deleted file mode 100644
index 30d88e3bf062e92c65aa06af02a5411f445829cc..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/poisson/parameter
+++ /dev/null
@@ -1,9 +0,0 @@
-# toggle verbosity of on process
-# (-1: off, p: process p is verbose, in general 0 is a good choice)
-fem.verboserank: 0
-
-# specify directory for data output (is created if not exists)
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/poisson/data
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/poisson
-
-paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/stokes/Makefile.am b/dune/fem-dg/test/stokes/Makefile.am
deleted file mode 100644
index 729488a37ccdbf107a2198038a905bdd1d1becd7..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/stokes/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-# install these headers
-stokesdir=$(includedir)/test/stokes
-stokes_HEADERS = models.hh problemcreator.hh problems.hh stokesalgorithm.hh stokesassembler.hh tensorhelper.hh
-
-LDADD = $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS) $(LOCAL_LIBS) $(DUNEMPILDFLAGS) $(DUNEMPILIBS)
-
-BASEDIR=../../main
-
-#GRIDTYPE = ALUGRID_SIMPLEX
-GRIDTYPE = YASPGRID
-#GRIDTYPE=PARALLELGRID_ALUGRID_SIMPLEX
-#GRIDTYPE=CARTESIANGRID_ALUGRID_CUBE
-#GRIDTYPE = SPGRID
-#GRIDTYPE=ALUGRID_CUBE
-POLORDER = 2
-GRIDDIM = 2
-FLUX = 1 # LLF 1, HLL 2
-WANT_ISTL=1
-
-#USE_OMP=-fopenmp
-
-EXTRA_PROGRAMS = stokes_all
-check_PROGRAMS = stokes
-
-stokes_all_SOURCES = main.cc
-stokes_SOURCES = main.cc
-
-AM_CPPFLAGS = $(USE_OMP) $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
- -D$(GRIDTYPE) $(DUNEMPICPPFLAGS) -DDGSCHEME -DONB \
- -DFLUX=$(FLUX) -DPRIMALDG -DWANT_ISTL=$(WANT_ISTL) -DSTOKES
-AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-
-stokes_all_CPPFLAGS = $(AM_CPPFLAGS)
-stokes_CPPFLAGS = $(stokes_all_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
-
-DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
-
-EXTRA_DIST = parameter
-
-CLEANFILES=manager.*.log eoc_*.tex
-
-PROG=stokes
-# codegeneration
-generatecode:
- $(MAKE) -i clean
- $(MAKE) CXXFLAGS="-O0 -Wall -DNDEBUG -DBASEFUNCTIONSET_CODEGEN_GENERATE" $(PROG)
- ./$(PROG) femdg.stepper.maximaltimesteps:1 fem.io.outputformat:none codegenparameter
-
-# compile fast code
-compilecode:
- $(MAKE) clean
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -DUSE_BASEFUNCTIONSET_CODEGEN" $(PROG)
-
-codegen:
- $(MAKE) generatecode
- $(MAKE) compilecode
-
-include $(top_srcdir)/am/global-rules
diff --git a/dune/fem-dg/test/stokes/parameter b/dune/fem-dg/test/stokes/parameter
deleted file mode 100644
index 8ee872932b4110dc8d0339187b08fd20d3c8cf43..0000000000000000000000000000000000000000
--- a/dune/fem-dg/test/stokes/parameter
+++ /dev/null
@@ -1,8 +0,0 @@
-# toggle verbosity of on process
-# (-1: off, p: process p is verbose, in general 0 is a good choice)
-fem.verboserank: 0
-
-fem.prefix: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/stokes/data # specify directory for data output (is created if not exists)
-fem.prefix.input: /home/stefan/dune-super-fem-blood/dune-fem-dg/dune/fem-dg/test/stokes
-
-paramfile: parameter_cmake