From 7909f0699474377ca71990bd7f905219a90f8a67 Mon Sep 17 00:00:00 2001
From: Robert K <robertk@posteo.org>
Date: Thu, 5 Nov 2015 14:52:38 -0700
Subject: [PATCH] [cleanup] make headercheck compile.
---
cmake/modules/TargetDistclean.cmake | 40 ++++-----
dune.module | 2 +-
dune/fem-dg/algorithm/gridinitializer.hh | 2 +
.../algorithm/handler/additionaloutput.hh | 4 +-
dune/fem-dg/misc/error/dgeocerror.hh | 2 +-
dune/fem-dg/misc/error/h1eocerror.hh | 2 +-
dune/fem-dg/misc/error/l1eocerror.hh | 2 +-
dune/fem-dg/misc/error/l2eocerror.hh | 2 +-
dune/fem-dg/misc/parameterkey.hh | 2 +
dune/fem-dg/misc/problemcreatorselector.hh | 3 +
dune/fem-dg/misc/simulator.hh | 5 ++
dune/fem-dg/misc/tupleconcat.hh | 2 +
dune/fem-dg/operator/dg/fluxoperator.hh | 17 ++--
dune/fem-dg/operator/fluxes/llfadvflux.hh | 1 +
dune/fem-dg/operator/fluxes/upwindflux.hh | 2 +
dune/fem-dg/solver/uzawa.hh | 2 +-
dune/fem-dg/test/advdiff/parameter | 53 +-----------
dune/fem-dg/test/combined/parameter | 26 ++++++
dune/fem-dg/test/dataio/parameter | 8 +-
dune/fem-dg/test/euler/parameter | 83 ++-----------------
dune/fem-dg/test/navierstokes/parameter | 66 +--------------
.../test/navierstokes/problems/nssmooth.hh | 2 +-
dune/fem-dg/test/poisson/gridinitializer.hh | 1 +
dune/fem-dg/test/poisson/parameter | 67 +--------------
dune/fem-dg/test/stokes/parameter | 76 +----------------
dune/fem-dg/test/stokes/problemcreator.hh | 6 +-
26 files changed, 104 insertions(+), 374 deletions(-)
diff --git a/cmake/modules/TargetDistclean.cmake b/cmake/modules/TargetDistclean.cmake
index c587eb7a..b30bb30e 100644
--- a/cmake/modules/TargetDistclean.cmake
+++ b/cmake/modules/TargetDistclean.cmake
@@ -1,22 +1,22 @@
# add custom target distclean
-if(${CMAKE_GENERATOR} MATCHES ".*Unix Makefiles.*")
-add_custom_target(distclean @echo cleaning CMake files)
-set(DISTCLEANFILES
-cmake.depends
-cmake.check_depends
-CMakeCache.txt
-*/CMakeCache.txt
-CMakeFiles
-*/CMakeFiles
-Makefile
-*/Makefile
-)
+#if(${CMAKE_GENERATOR} MATCHES ".*Unix Makefiles.*")
+#add_custom_target(distclean @echo cleaning CMake files)
+#set(DISTCLEANFILES
+#cmake.depends
+#cmake.check_depends
+#CMakeCache.txt
+#*/CMakeCache.txt
+#CMakeFiles
+#*/CMakeFiles
+#Makefile
+#*/Makefile
+#)
-add_custom_command(
-DEPENDS clean
-COMMENT "distribution clean"
-COMMAND rm
-ARGS -Rf ${DISTCLEANFILES}
-TARGET distclean
-)
-endif()
+#add_custom_command(
+#DEPENDS clean
+#COMMENT "distribution clean"
+#COMMAND rm
+#ARGS -Rf ${DISTCLEANFILES}
+#TARGET distclean
+#)
+#endif()
diff --git a/dune.module b/dune.module
index f6601a03..d5c31e99 100644
--- a/dune.module
+++ b/dune.module
@@ -1,5 +1,5 @@
Module: dune-fem-dg
Version: 0.1
Maintainer: dune@mathematik.uni-freiburg.de
-Depends: dune-fem (>= 1.3.0)
+Depends: dune-fem
Sources: dune
diff --git a/dune/fem-dg/algorithm/gridinitializer.hh b/dune/fem-dg/algorithm/gridinitializer.hh
index 3d1458a2..8ba45228 100644
--- a/dune/fem-dg/algorithm/gridinitializer.hh
+++ b/dune/fem-dg/algorithm/gridinitializer.hh
@@ -8,8 +8,10 @@
#include <dune/fem/misc/mpimanager.hh>
#include <dune/fem/misc/femeoc.hh>
#include <dune/fem/misc/femtimer.hh>
+#include <dune/fem/space/common/adaptmanager.hh>
#include <dune/fem-dg/misc/parameterkey.hh>
+#include <dune/fem-dg/operator/adaptation/utility.hh>
#include <dune/fem-dg/algorithm/handler/checkpoint.hh>
namespace Dune
diff --git a/dune/fem-dg/algorithm/handler/additionaloutput.hh b/dune/fem-dg/algorithm/handler/additionaloutput.hh
index 1bec25f4..a0a39a2c 100644
--- a/dune/fem-dg/algorithm/handler/additionaloutput.hh
+++ b/dune/fem-dg/algorithm/handler/additionaloutput.hh
@@ -1,5 +1,5 @@
-#ifndef CONS2PRIM_HH
-#define CONS2PRIM_HH
+#ifndef FEMDG_NOADDITIONALOUTPUT_HH
+#define FEMDG_NOADDITIONALOUTPUT_HH
// system include
#include <sstream>
diff --git a/dune/fem-dg/misc/error/dgeocerror.hh b/dune/fem-dg/misc/error/dgeocerror.hh
index 34bd2dfc..cef03ce1 100644
--- a/dune/fem-dg/misc/error/dgeocerror.hh
+++ b/dune/fem-dg/misc/error/dgeocerror.hh
@@ -2,7 +2,7 @@
#define FEMDG_DGEOCERROR_HH
#include <dune/fem-dg/misc/dgnorm.hh>
-
+#include <dune/fem/misc/femeoc.hh>
class DGEOCError
{
diff --git a/dune/fem-dg/misc/error/h1eocerror.hh b/dune/fem-dg/misc/error/h1eocerror.hh
index 9a7a4ba4..d89298f4 100644
--- a/dune/fem-dg/misc/error/h1eocerror.hh
+++ b/dune/fem-dg/misc/error/h1eocerror.hh
@@ -2,7 +2,7 @@
#define FEMDG_H1EOCERROR_HH
#include <dune/fem/misc/h1norm.hh>
-
+#include <dune/fem/misc/femeoc.hh>
class H1EOCError
{
diff --git a/dune/fem-dg/misc/error/l1eocerror.hh b/dune/fem-dg/misc/error/l1eocerror.hh
index 9616af34..cfde8771 100644
--- a/dune/fem-dg/misc/error/l1eocerror.hh
+++ b/dune/fem-dg/misc/error/l1eocerror.hh
@@ -2,7 +2,7 @@
#define FEMDG_L1EOCERROR_HH
#include <dune/fem/misc/l1norm.hh>
-
+#include <dune/fem/misc/femeoc.hh>
class L1EOCError
{
diff --git a/dune/fem-dg/misc/error/l2eocerror.hh b/dune/fem-dg/misc/error/l2eocerror.hh
index 55451890..c5263ee5 100644
--- a/dune/fem-dg/misc/error/l2eocerror.hh
+++ b/dune/fem-dg/misc/error/l2eocerror.hh
@@ -2,7 +2,7 @@
#define FEMDG_L2EOCERROR_HH
#include <dune/fem/misc/l2norm.hh>
-
+#include <dune/fem/misc/femeoc.hh>
class L2EOCError
{
diff --git a/dune/fem-dg/misc/parameterkey.hh b/dune/fem-dg/misc/parameterkey.hh
index 354bfaab..0f48616d 100644
--- a/dune/fem-dg/misc/parameterkey.hh
+++ b/dune/fem-dg/misc/parameterkey.hh
@@ -1,6 +1,8 @@
#ifndef PARAMETERKEY_HH
#define PARAMETERKEY_HH
+#include <string>
+
namespace Dune
{
/**
diff --git a/dune/fem-dg/misc/problemcreatorselector.hh b/dune/fem-dg/misc/problemcreatorselector.hh
index aebffd22..4c5acdfb 100644
--- a/dune/fem-dg/misc/problemcreatorselector.hh
+++ b/dune/fem-dg/misc/problemcreatorselector.hh
@@ -1,7 +1,10 @@
#ifndef FEMDG_PROBLEMCREATOR_SELECTOR_HH
#define FEMDG_PROBLEMCREATOR_SELECTOR_HH
+#include <dune/fem/operator/projection/l2projection.hh>
+
#include <dune/fem-dg/solver/linearsolvers.hh>
+#include <dune/fem-dg/operator/dg/primaloperator.hh>
diff --git a/dune/fem-dg/misc/simulator.hh b/dune/fem-dg/misc/simulator.hh
index aa33eace..9847e02d 100644
--- a/dune/fem-dg/misc/simulator.hh
+++ b/dune/fem-dg/misc/simulator.hh
@@ -1,6 +1,11 @@
#ifndef DUNE_FEM_DG_SIMULATOR_HH
#define DUNE_FEM_DG_SIMULATOR_HH
+#ifdef HEADERCHECK
+#define YASPGRID
+#define GRIDDIM 2
+#endif
+
#if defined GRIDDIM
#ifndef CODEDIM
#define CODEDIM GRIDDIM
diff --git a/dune/fem-dg/misc/tupleconcat.hh b/dune/fem-dg/misc/tupleconcat.hh
index fa6fbf7d..9b9478de 100644
--- a/dune/fem-dg/misc/tupleconcat.hh
+++ b/dune/fem-dg/misc/tupleconcat.hh
@@ -1,6 +1,8 @@
#ifndef DUNE_TUPLE_CONCAT_HH
#define DUNE_TUPLE_CONCAT_HH
+#include <tuple>
+
template <class... Args>
auto func(Args&& ... args) -> decltype(std::tuple_cat(args...))
{ return std::tuple_cat(args...); }
diff --git a/dune/fem-dg/operator/dg/fluxoperator.hh b/dune/fem-dg/operator/dg/fluxoperator.hh
index b6e5161f..97c66d43 100644
--- a/dune/fem-dg/operator/dg/fluxoperator.hh
+++ b/dune/fem-dg/operator/dg/fluxoperator.hh
@@ -58,21 +58,24 @@ namespace Dune {
{
// overload discrete function space
typedef typename Traits :: DiscreteFunctionSpaceType :: template
- ToNewDimRange< ModelType::dimGradRange > :: Type DiscreteFunctionSpaceType;
+ ToNewDimRange< ModelType::dimGradRange > :: Type DiscreteFunctionSpaceType;
- template < template <class> DF >
- struct ToNewSpace< DF< typename Traits :: DiscreteFunctionSpaceType > >
+ template < class DF >
+ struct ToNewSpace;
+
+ template < class Space, template <class> class DF >
+ struct ToNewSpace< DF< Space > >
{
typedef DF< DiscreteFunctionSpaceType > Type;
};
- template < class Arg, template <class, class> DF >
- struct ToNewSpace< DF< typename Traits :: DiscreteFunctionSpaceType, Arg > >
+ template < class Space, typename... Args, template < class, typename... > class DF >
+ struct ToNewSpace< DF< Space, Args... > >
{
- typedef DF< DiscreteFunctionSpaceType, Arg > Type;
+ typedef DF< DiscreteFunctionSpaceType, Args... > Type;
};
- typedef typename ToNewSpace< DestinationType > :: Type DestinationType;
+ typedef typename ToNewSpace< typename Traits::DestinationType > :: Type DestinationType;
};
typedef GradientModel< GradientTraits, u > DiscreteModel1Type;
diff --git a/dune/fem-dg/operator/fluxes/llfadvflux.hh b/dune/fem-dg/operator/fluxes/llfadvflux.hh
index 90ed2ce5..e7fa27c5 100644
--- a/dune/fem-dg/operator/fluxes/llfadvflux.hh
+++ b/dune/fem-dg/operator/fluxes/llfadvflux.hh
@@ -1,6 +1,7 @@
#ifndef FEMDG_LLFADVFLUX_FLUX_HH
#define FEMDG_LLFADVFLUX_FLUX_HH
+#include <string>
namespace Dune
{
diff --git a/dune/fem-dg/operator/fluxes/upwindflux.hh b/dune/fem-dg/operator/fluxes/upwindflux.hh
index 7d40d5e8..571f9452 100644
--- a/dune/fem-dg/operator/fluxes/upwindflux.hh
+++ b/dune/fem-dg/operator/fluxes/upwindflux.hh
@@ -1,6 +1,8 @@
#ifndef FEMDG_UPWIND_FLUX_HH
#define FEMDG_UPWIND_FLUX_HH
+#include <string>
+#include <cmath>
namespace Dune
{
diff --git a/dune/fem-dg/solver/uzawa.hh b/dune/fem-dg/solver/uzawa.hh
index a6c09d3d..8be9b3fe 100644
--- a/dune/fem-dg/solver/uzawa.hh
+++ b/dune/fem-dg/solver/uzawa.hh
@@ -87,7 +87,7 @@ namespace Dune {
{
}
- static_assert( (int)DiscreteFunctionType::DiscreteFunctionSpaceType::FunctionSpaceType::dimRange == DIMRANGE , "stokes assembler: velocity dimrange does not fit");
+ static_assert( (int)DiscreteFunctionType::DiscreteFunctionSpaceType::FunctionSpaceType::dimRange == DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain, "stokes assembler: velocity dimrange does not fit");
static_assert( (int)PressureDiscreteFunctionType::DiscreteFunctionSpaceType::FunctionSpaceType::dimRange == 1 , "stokes assembler: pressure dimrange does not fit");
diff --git a/dune/fem-dg/test/advdiff/parameter b/dune/fem-dg/test/advdiff/parameter
index 9766e2aa..16d0a58c 100644
--- a/dune/fem-dg/test/advdiff/parameter
+++ b/dune/fem-dg/test/advdiff/parameter
@@ -2,54 +2,7 @@
# (-1: off, p: process p is verbose, in general 0 is a good choice)
fem.verboserank: 0
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/advdiff/data # specify directory for data output (is created if not exists)
+fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/advdiff
-# DATA WRITER
-#------------
-fem.prefix: ./data # specify directory for data output (is created if not exists)
-fem.io.datafileprefix: heat # prefix data data files
-fem.io.savestep: 0.1 # save data every time interval
-fem.io.savecount: -1 # save every i-th step
-
-
-# GRID SOLUTION
-#--------------
-
-gridsol.savestep: 0.01
-gridsol.firstwrite: 0.1
-gridsol.filename: heat-checkpoint
-
-
-# GENERAL
-#--------
-paramfile: ../parameter/paramBase
-
-
-# PROBLEM SETUP
-#--------------
-
-# problem: heat, quasi, plaplace
-#problem: deformational
-problem: pulse
-
-femdg.stepper.endtime: 1.0
-femdg.stepper.diffusiontimestep: 1
-epsilon: 0.0
-plaplace: 3.0
-xvelocity: 1. # the only advection part for the linear heat eqn
-yvelocity: 3. # the only advection part for the linear heat eqn
-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
-
-
-# SOLVER
-#-------
-dgdiffusionflux.upwind: -1 -0.001
-femdg.stepper.maxtimestep: 0.5
-paramfile: ../parameter/paramSolver
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/combined/parameter b/dune/fem-dg/test/combined/parameter
index e69de29b..6dde6238 100644
--- a/dune/fem-dg/test/combined/parameter
+++ b/dune/fem-dg/test/combined/parameter
@@ -0,0 +1,26 @@
+
+# Prefixes for this project
+#--------------------------
+
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/combined/data # specify directory for data output (is created if not exists)
+fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/combined # specify directory for data output (is created if not exists)
+
+
+# Combined parameters
+#---------------------
+paramfile: parameter
+
+
+# INFLAMMATION
+#----------------
+paramfile: ../inflammation/parameters/parameter
+paramfile: ../inflammation/parameters/species_unit/paramProblem
+paramfile: ../inflammation/parameters/paramProblem
+
+
+# NAVIER-STOKES
+#-----------------
+paramfile: ../navierstokes/parameters/parameter
+paramfile: ../navierstokes/parameters/unit_square/paramProblem
+paramfile: ../navierstokes/parameters/paramProblem
+
diff --git a/dune/fem-dg/test/dataio/parameter b/dune/fem-dg/test/dataio/parameter
index 33b26d1d..526119ea 100644
--- a/dune/fem-dg/test/dataio/parameter
+++ b/dune/fem-dg/test/dataio/parameter
@@ -1,15 +1,15 @@
fem.verboserank: 0
# macro grid file
-fem.io.macroGridFile: ../grids/unitcube2.dgf
+fem.io.macroGridFile: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/dataio/../grids/unitcube2.dgf
# macro grid file
-fem.io.macroGridFile_3d: ../grids/unitcube3.dgf
+fem.io.macroGridFile_3d: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/dataio/../grids/unitcube3.dgf
# if false no discrete function data is written (for debugging)
fem.io.writedata: true
-#fem.io.checkpointrestartfile: ./checkpoint
+#fem.io.checkpointrestartfile: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/dataio/checkpoint
# number of EOC steps (only 1 for checkpointing)
fem.eoc.steps: 1
@@ -43,7 +43,7 @@ fem.adaptation.coarsestLevel: 2
fem.adaptation.finestLevel: 2
# specify directory for data output (is created if not exists)
-fem.prefix: ./data
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/dataio/data
# prefix data data files
fem.io.datafileprefix: solution
# save data every time interval
diff --git a/dune/fem-dg/test/euler/parameter b/dune/fem-dg/test/euler/parameter
index 9a843025..34a42683 100644
--- a/dune/fem-dg/test/euler/parameter
+++ b/dune/fem-dg/test/euler/parameter
@@ -1,79 +1,8 @@
-problem.verboserank: 0
+# toggle verbosity of on process
+# (-1: off, p: process p is verbose, in general 0 is a good choice)
+fem.verboserank: 0
-# PROBLEM SELECTION
-#------------------
-# possible: "sod" , "withman", "withmansmooth", "smooth1d" , "ffs" , "diffraction" , "shockbubble"
-problem: sod
-# problemflag: 0
-# riemanndata: [1., -1., 1., 1., 1., 1.]
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/euler/data # specify directory for data output (is created if not exists)
+fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/euler
-# LIMITER SETTINGS
-#-----------------
-# 0 = only dg solution | 1 = only reconstruction | 2 = both
-femdg.limiter.admissiblefunctions: 1
-# tolerance for shock indicator
-femdg.limiter.tolerance: 1
-# threshold for avoiding over-excessive limitation
-femdg.limiter.limiteps: 1e-8
-# add indicator to outputvariables
-femdg.limiter.indicatoroutput: true
-
-# DATA WRITER
-#------------
-fem.io.path: /data/euler
-fem.io.datafileprefix: RC
-fem.io.savestep: 0.01 # SaveStep (write data every `saveStep' time period, <=0 deactivates)
-fem.io.savecount: -1 # SaveCount (write data every saveCount time steps, <=0 deactivates)
-
-
-# GRID SOLUTION
-#--------------
-gridsol.savestep: 0.5
-gridsol.firstwrite: 0.5
-gridsol.filename: straka-checkpoint
-
-
-# GENERAL
-#--------
-paramfile: ../parameter/paramBase
-
-
-# STEPPER
-#--------
-fem.eoc.steps: 3
-femdg.stepper.starttime: 0.
-femdg.stepper.endtime: 0.15
-
-
-
-# PROBLEM SETUP
-#--------------
-paramfile: ../parameter/paramPhysicalConstants
-
-g: 1. # gravity force [m/ss]
-hSpeed0: 1. # x-axis speed [m/s]
-vSpeed0: 1.25 # z-axis speed [m/s]
-p0: 1. # surface pressure [Pa]
-N: 0.01 # Brunt-Vaisala frequency
-Re: 1. # Reynold's number
-Pr: 1. # Prandtl's number
-rho_a: 1.
-rho_b: 0.05
-
-delta_T: -15 # temperature perturbation peak [K]
-x_c: 0.25 # x-center of perturbation ball
-y_c: 0.25 # y-center of perturbation ball
-z_c: 0.25 # z-center of perturbation ball
-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
-
-
-# SOLVER CONFIGURATION
-#---------------------
-paramfile: ../parameter/paramSolver
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/navierstokes/parameter b/dune/fem-dg/test/navierstokes/parameter
index 1bdadedb..48811e0e 100644
--- a/dune/fem-dg/test/navierstokes/parameter
+++ b/dune/fem-dg/test/navierstokes/parameter
@@ -1,69 +1,9 @@
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# This file precribes parameters for the testcase found in
-#
-# Gregor Gassner,
-# PhD thesis
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
fem.verboserank: 0
# DATA WRITER
#------------
-fem.prefix: ./data
-fem.io.datafileprefix: NS
-fem.io.savestep: 0.01 # SaveStep (write data every `saveStep' time period, <=0 deactivates)
-fem.io.savecount: -1 # SaveCount (write data every saveCount time steps, <=0 deactivates)
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/navierstokes/data
+fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/navierstokes
-
-femdg.stepper.printcount: 1
-femdg.additionalvariables: false
-
-
-# GENERAL
-#--------
-paramfile: ../parameter/paramBase
-
-
-# GRID SOLUTION
-#--------------
-gridsol.savestep: 0.5
-gridsol.firstwrite: 0.5
-gridsol.filename: nseq-checkpoint
-
-
-# PROBLEM SETUP
-#--------------
-paramfile: ../parameter/paramPhysicalConstants
-
-# WBPROBLEM
-# g: 0.7 # m/(ss)
-# p0: 10. # surface pressure Pa=kg/(mss)
-# diffusion coefficients
-mu: 0.0001 #00001 # kg/(ms)
-g: 9.81 # m/ss
-Re: 1. #(Reynold's number)
-Pr: 0.72 # 0.72 #(Prandtl's number)
-femdg.stepper.starttime: 0. # s
-femdg.stepper.endtime: 0.1
-fem.eoc.steps: 5
-
-gammaGNS: 0.5
-omegaGNS: 1.
-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
-
-
-# SOLVER CONFIGURATION
-paramfile: ../parameter/paramSolver
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/navierstokes/problems/nssmooth.hh b/dune/fem-dg/test/navierstokes/problems/nssmooth.hh
index 60ceb40b..4ebb0cf3 100644
--- a/dune/fem-dg/test/navierstokes/problems/nssmooth.hh
+++ b/dune/fem-dg/test/navierstokes/problems/nssmooth.hh
@@ -9,7 +9,7 @@
#include <dune/fem/space/common/functionspace.hh>
// local includes
-#include "thermodynamics.hh"
+#include <dune/fem-dg/test/navierstokes/thermodynamics.hh>
#include <dune/fem-dg/models/defaultprobleminterfaces.hh>
diff --git a/dune/fem-dg/test/poisson/gridinitializer.hh b/dune/fem-dg/test/poisson/gridinitializer.hh
index f8753c75..79fe83c1 100644
--- a/dune/fem-dg/test/poisson/gridinitializer.hh
+++ b/dune/fem-dg/test/poisson/gridinitializer.hh
@@ -4,6 +4,7 @@
#include <dune/fem/io/parameter.hh>
#include <dune/fem-dg/algorithm/handler/checkpoint.hh>
+#include <dune/fem-dg/algorithm/gridinitializer.hh>
namespace Dune
{
diff --git a/dune/fem-dg/test/poisson/parameter b/dune/fem-dg/test/poisson/parameter
index 4cc19bb2..7157586f 100644
--- a/dune/fem-dg/test/poisson/parameter
+++ b/dune/fem-dg/test/poisson/parameter
@@ -3,68 +3,7 @@
fem.verboserank: 0
# specify directory for data output (is created if not exists)
-fem.prefix: ./data
-# prefix data data files
-fem.io.datafileprefix: solution
-# if you want to add time stemp to eoc file name
-# # to avoid overwriting the eoc files
-fem.io.eocFileTimeStamp: 0
-fem.eoc.steps: 6
+fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/poisson/data
+fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/poisson
-# polynomial order = 0,1,2,3,4
-femdg.polynomialOrder: 2
-
-
-
-# PROBLEM
-# ----------
-# problem number
-problem: 19 # 8 5 6 13 16
-globalshift: 0
-factor: 1
-advection: 0
-epsilon: 0.1
-xvelocity: 0. # the only advection part for the linear heat eqn
-yvelocity: 0. # the only advection part for the linear heat eqn
-zvelocity: 0. # the only advection part for the linear heat eqn
-
-fem.solver.verbose: 1
-
-# macro grid file
-fem.io.macroGridFile_2d: ../grids/unitcube2.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
-dgdiffusionflux.method: CDG2
-dgdiffusionflux.theoryparameters: 1
-dgdiffusionflux.lifting: id_id
-#dgdiffusionflux.upwind: -1 -0.001
-#dgdiffusionflux.upwind: 0 0
-dgdiffusionflux.penalty: 0 # for CDG, CDG2, LDG
-dgdiffusionflux.liftfactor: 0
-
-# ADAPTATION
-# ----------
-fem.adaptation.method: generic
-
-
-# DATAWRITER
-# ----------
-# output format: grape | vtk-cell | vtk-vertex (projected in DG case), sub-vtk-cell
-fem.io.outputformat: vtk-cell
-fem.io.subsamplinglevel: 0
-# toggle grape display (0 = off | 1 = on)
-fem.io.grapedisplay: 0
-
-
-# SOLVER
-# ------
-paramfile: ../parameter/paramSolver
-istl.preconditioning.method: ilu-0
-istl.preconditioning.iterations: 1
-istl.preconditioning.relaxation: 1
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/stokes/parameter b/dune/fem-dg/test/stokes/parameter
index 56b7d686..6bcdc808 100644
--- a/dune/fem-dg/test/stokes/parameter
+++ b/dune/fem-dg/test/stokes/parameter
@@ -4,79 +4,5 @@ fem.verboserank: 0
fem.prefix: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/stokes/data # specify directory for data output (is created if not exists)
fem.prefix.input: /home/robertk/work/Dune/cmake/dune-fem-dg/dune/fem-dg/test/stokes
-# prefix data data files
-fem.io.datafileprefix: solution
-# if you want to add time stemp to eoc file name
-# # to avoid overwriting the eoc files
-fem.io.eocFileTimeStamp: 0
-fem.eoc.steps: 5
-# polynomial order = 0,1,2,3,4
-femdg.polynomialOrder: 2
-
-
-
-# PROBLEM
-# ----------
-# problem number
-problem: 8 # 5 6 13 16
-globalshift: 0
-factor: 1
-epsilon: 0.1
-xvelocity: 0. # the only advection part for the linear heat eqn
-yvelocity: 0. # the only advection part for the linear heat eqn
-zvelocity: 0. # the only advection part for the linear heat eqn
-alpha: 1.0
-mu: 1.0
-
-fem.solver.verbose: 1
-
-# 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
-nonConformOrigin: false
-
-# choises are: CDG2, CDG, IP, NIPG, BO, BR2
-dgdiffusionflux.method: CDG2
-dgdiffusionflux.theoryparameters: 1
-dgdiffusionflux.lifting: id_id
-#dgdiffusionflux.upwind: -1 -0.001
-#dgdiffusionflux.upwind: 0 0
-dgdiffusionflux.penalty: 0 # for CDG, CDG2, LDG
-dgdiffusionflux.liftfactor: 0
-
-# ADAPTATION
-# ----------
-fem.adaptation.method: generic
-# coeffroot or prior2p
-fem.adaptation.padaptive.method: coeffroot
-fem.adaptation.refineTolerance: -1 # global adapt with tolerance=0
-fem.adaptation.theta: 0.5 # equal distribution with theta=0, tolerance>0
-# true = maximum (theta defines the percentage) | false = Doerfler
-fem.adaptation.maximumstrategy: true
-
-# DATAWRITER
-# ----------
-# output format: grape | vtk-cell | vtk-vertex (projected in DG case), sub-vtk-cell
-fem.io.outputformat: vtk-cell
-fem.io.subsamplinglevel: 0
-# toggle grape display (0 = off | 1 = on)
-fem.io.grapedisplay: 0
-
-poisson.nonConformOrigin: false
-edges: 1
-use_dgstabilization: true
-# use_oldassemble: false
-
-
-# SOLVER
-# ------
-paramfile: ../parameter/paramSolver
-istl.preconditioning.method: amg-ilu-0
-istl.preconditioning.iterations: 1
-istl.preconditioning.relaxation: 1
+paramfile: parameter_cmake
diff --git a/dune/fem-dg/test/stokes/problemcreator.hh b/dune/fem-dg/test/stokes/problemcreator.hh
index 7f9b2dec..b7ee5781 100644
--- a/dune/fem-dg/test/stokes/problemcreator.hh
+++ b/dune/fem-dg/test/stokes/problemcreator.hh
@@ -2,10 +2,6 @@
#define FEMDG_STOKESSTEPPER_HH
#include <config.h>
-#ifndef DIMRANGE
-#define DIMRANGE GRIDDIM
-#endif
-
#ifndef POLORDER
#define POLORDER 1
#endif
@@ -43,7 +39,7 @@ struct PoissonProblemCreator
typedef HostGridPartType GridPartType;
// define problem type here if interface should be avoided
- typedef Dune::Fem::FunctionSpace< typename GridType::ctype, double, GridType::dimension, DIMRANGE >
+ typedef Dune::Fem::FunctionSpace< typename GridType::ctype, double, GridType::dimension, GridType::dimensionworld >
FunctionSpaceType;
typedef Dune::ProblemInterface< FunctionSpaceType > ProblemInterfaceType;
--
GitLab