From 3be2e50333c197ad013180944a9e390d20fbc654 Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robertk@posteo.net>
Date: Tue, 21 Oct 2014 18:31:23 +0200
Subject: [PATCH] added some dgf files and parameter.
---
dune/fem-dg/test/grids/corner.dgf | 26 +++++
dune/fem-dg/test/grids/corner3d.dgf | 27 +++++
dune/fem-dg/test/grids/corner3d_nonaffine.dgf | 54 ++++++++++
dune/fem-dg/test/grids/corner_cube.dgf | 21 ++++
dune/fem-dg/test/grids/corner_green.dgf | 22 +++++
dune/fem-dg/test/grids/corner_red.dgf | 23 +++++
dune/fem-dg/test/poisson/Makefile.am | 13 +--
dune/fem-dg/test/poisson/parameter | 98 +++++++++++++++++++
8 files changed, 278 insertions(+), 6 deletions(-)
create mode 100644 dune/fem-dg/test/grids/corner.dgf
create mode 100644 dune/fem-dg/test/grids/corner3d.dgf
create mode 100644 dune/fem-dg/test/grids/corner3d_nonaffine.dgf
create mode 100644 dune/fem-dg/test/grids/corner_cube.dgf
create mode 100644 dune/fem-dg/test/grids/corner_green.dgf
create mode 100644 dune/fem-dg/test/grids/corner_red.dgf
create mode 100644 dune/fem-dg/test/poisson/parameter
diff --git a/dune/fem-dg/test/grids/corner.dgf b/dune/fem-dg/test/grids/corner.dgf
new file mode 100644
index 00000000..c84d9a39
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner.dgf
@@ -0,0 +1,26 @@
+DGF
+
+VERTEX
+0 0 % vertex 0
+1 0 % vertex 1
+1 1 % vertex 2
+-1 1 % vertex 3
+-1 -1 % vertex 4
+0 -1 % vertex 5
+# VERTEX
+
+SIMPLEX
+0 1 2
+0 2 3
+0 3 4
+0 4 5
+# SIMPLEX
+
+BOUNDARYDOMAIN
+default 1
+# BOUNDARYDOMAIN
+Gridparameter
+closure green
+#
+
+# DFG
diff --git a/dune/fem-dg/test/grids/corner3d.dgf b/dune/fem-dg/test/grids/corner3d.dgf
new file mode 100644
index 00000000..5114f2b3
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner3d.dgf
@@ -0,0 +1,27 @@
+DGF
+
+Interval
+% first block
+-1 -1 -1 % first corner
+ 1 1 0 % second corner
+ 2 2 1 % 4 cells in each direction (x, y, z)
+% second block
+-1 -1 0 % first corner
+ 0 1 1 % second corner
+ 1 2 1 % 4 cells in each direction (x, y, z)
+% third block
+ 0 -1 0 % first corner
+ 1 0 1 % second corner
+ 1 1 1 % 4 cells in each direction (x, y, z)
+#
+
+BoundaryDomain
+default 1 % all boundaries have id 1
+#
+
+GridParameter
+name 3d_Unit_Cube
+overlap 1
+#
+
+# unitcube3.dgf
diff --git a/dune/fem-dg/test/grids/corner3d_nonaffine.dgf b/dune/fem-dg/test/grids/corner3d_nonaffine.dgf
new file mode 100644
index 00000000..db065b51
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner3d_nonaffine.dgf
@@ -0,0 +1,54 @@
+DGF
+% Elements = 7 | Vertices = 26
+
+VERTEX
+-1.2 -1.2 -1.2
+0.0 -1.0 -1.0
+-1.0 0.0 -1.0
+0.15 0.0 -1.0
+-0.9 -1.0 0.0
+0.0 -1.0 0.0
+-1.0 0.0 0.0
+0.0 0.0 0.0
+1.0 -1.0 -1.0
+0.9 0.0 -1.0
+1.0 -1.0 0.0
+1.0 0.0 0.0
+-1.0 1.0 -1.0
+0.0 0.9 -1.0
+-1.0 1.0 0.0
+0.0 1.1 0.0
+1.0 1.0 -1.0
+1.0 1.0 0.0
+-1.0 -1.0 1.0
+0.0 -1.0 1.0
+-1.0 0.0 1.0
+0.2 0.0 0.9
+-1.0 1.0 1.0
+0.0 1.0 1.0
+1.0 -1.0 1.0
+1.0 0.0 1.0
+#
+
+SIMPLEX
+#
+
+CUBE
+0 1 2 3 4 5 6 7
+1 8 3 9 5 10 7 11
+2 3 12 13 6 7 14 15
+3 9 13 16 7 11 15 17
+4 5 6 7 18 19 20 21
+6 7 14 15 20 21 22 23
+5 10 7 11 19 24 21 25
+#
+
+GRIDPARAMETER
+closure none
+#
+
+FemParameter
+nonconformitydifference: -1
+#
+
+#
diff --git a/dune/fem-dg/test/grids/corner_cube.dgf b/dune/fem-dg/test/grids/corner_cube.dgf
new file mode 100644
index 00000000..dfda69c3
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner_cube.dgf
@@ -0,0 +1,21 @@
+DGF
+Vertex
+ 0 0
+ 1 0
+ 1 1
+ 0 1
+-1 1
+-1 0
+-1 -1
+ 0 -1
+#
+Cube
+0 1 3 2
+5 0 4 3
+6 7 5 0
+#
+Simplex
+#
+Gridparameter
+closure green
+#
diff --git a/dune/fem-dg/test/grids/corner_green.dgf b/dune/fem-dg/test/grids/corner_green.dgf
new file mode 100644
index 00000000..143c96ce
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner_green.dgf
@@ -0,0 +1,22 @@
+DGF
+Vertex
+ 0 0
+ 1 -0.
+ 0.9 1
+ 0.2 1
+-1.1 1.1
+-1 -0.2
+-1 -0.9
+ 0. -1
+#
+Cube
+0 1 3 2
+5 0 4 3
+6 7 5 0
+#
+Gridparameter
+closure green
+#
+FemParameter
+nonconformitydifference: -1
+#
diff --git a/dune/fem-dg/test/grids/corner_red.dgf b/dune/fem-dg/test/grids/corner_red.dgf
new file mode 100644
index 00000000..bba2861d
--- /dev/null
+++ b/dune/fem-dg/test/grids/corner_red.dgf
@@ -0,0 +1,23 @@
+DGF
+Vertex
+ 0 0
+ 1 -0.
+ 0.9 1
+ 0.2 1
+-1.1 1.1
+-1 -0.2
+-1 -0.9
+ 0. -1
+#
+Cube
+0 1 3 2
+5 0 4 3
+6 7 5 0
+#
+Gridparameter
+closure none
+#
+FemParameter
+nonconformitydifference: 1
+#
+
diff --git a/dune/fem-dg/test/poisson/Makefile.am b/dune/fem-dg/test/poisson/Makefile.am
index 06d95a11..fc39277c 100644
--- a/dune/fem-dg/test/poisson/Makefile.am
+++ b/dune/fem-dg/test/poisson/Makefile.am
@@ -10,7 +10,8 @@ BASEDIR=../../main
#GRIDTYPE = YASPGRID
#GRIDTYPE=PARALLELGRID_ALUGRID_SIMPLEX
#GRIDTYPE=CARTESIANGRID_ALUGRID_CUBE
-GRIDTYPE = SPGRID
+#GRIDTYPE = SPGRID
+GRIDTYPE=ALUGRID_CUBE
POLORDER = 2
GRIDDIM = 2
DIMRANGE = 1
@@ -18,19 +19,19 @@ FLUX = 1 # LLF 1, HLL 2
#USE_OMP=-fopenmp
-EXTRA_PROGRAMS = poisson # quasiadvdiff quasiadvdiff12 plaplace plaplace12
-check_PROGRAMS = poissononep # quasiadvdiff quasiadvdiff12 plaplace plaplace12
+EXTRA_PROGRAMS = poisson_all # quasiadvdiff quasiadvdiff12 plaplace plaplace12
+check_PROGRAMS = poisson # quasiadvdiff quasiadvdiff12 plaplace plaplace12
-poisson_SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_1.cc $(BASEDIR)/main_2.cc \
+poisson_all_SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_1.cc $(BASEDIR)/main_2.cc \
$(BASEDIR)/main_0.cc $(BASEDIR)/main_3.cc
-poissononep_SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_pol.cc
+poisson_SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_pol.cc
AM_CPPFLAGS = $(USE_OMP) $(ALL_PKG_CPPFLAGS) -DGRIDDIM=$(GRIDDIM) \
-D$(GRIDTYPE) $(DUNEMPICPPFLAGS) -DDGSCHEME -DONB \
-DDIMRANGE=$(DIMRANGE) -DFLUX=$(FLUX) -DPRIMALDG -DUSE_ASSERT_THROW
AM_LDFLAGS = $(ALL_PKG_LDFLAGS) $(LAPACK_LDFLAGS) $(USE_OMP)
-poissononep_CPPFLAGS = $(AM_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
+poisson_CPPFLAGS = $(AM_CPPFLAGS) -DONLY_ONE_P -DPOLORDER=$(POLORDER)
DISTCHECK_CONFIGURE_FLAGS = DOXYGEN="true"
diff --git a/dune/fem-dg/test/poisson/parameter b/dune/fem-dg/test/poisson/parameter
new file mode 100644
index 00000000..70dd8268
--- /dev/null
+++ b/dune/fem-dg/test/poisson/parameter
@@ -0,0 +1,98 @@
+femhowto.eocSteps: 30
+UseBlocking: 0
+
+# enable or disable DG stabilization
+use_dgstabilization: true
+use_oldassemble: false
+
+# enable or disable use of solvebench
+use_solvebench: true
+
+# enable or disable strong boundary conditions
+use_strongbnd: false
+
+# polynomial order = 0,1,2,3,4
+femhowto.polynomialOrder: 2
+
+# problem number
+femhowto.problem: 20 # 5 6 13 16
+
+femhowto.globalshift: 0
+femhowto.factor: 1
+femhowto.tolerance: 1e-4 # global adapt with tolerance=0
+femhowto.adaptive.theta: 0.05 # equal distribution with theta=0, tolerance>0
+# true = maximum (theta defines the percentage) | false = Doerfler
+femhowto.adaptive.maximumstrategy: false
+
+# none = disabled | coeffroot | prior2p
+padaptive.method: none
+
+femhowto.verbose: 1
+fem.solver.verbose: 0
+
+fem.solver.matrixfilename: matrixfile
+
+# 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
+
+
+femhowto.epsilon: 0.1
+#femhowto.xvelocity: 1. # the only advection part for the linear heat eqn
+#femhowto.yvelocity: 3. # the only advection part for the linear heat eqn
+#femhowto.zvelocity: 0. # the only advection part for the linear heat eqn
+femhowto.xvelocity: 0. # the only advection part for the linear heat eqn
+femhowto.yvelocity: 0. # the only advection part for the linear heat eqn
+femhowto.zvelocity: 0. # the only advection part for the linear heat eqn
+
+# 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
+
+# toggle verbosity of on process
+# (-1: off, p: process p is verbose, in general 0 is a good choice)
+fem.verboserank: 0
+fem.adaptation.method: generic
+
+#number of global refinements before start of simulation
+femhowto.startLevel: 0
+
+# number of EOC steps
+
+# 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
+
+# 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
+
+# write file with values of numerical solution at
+# the end time along given line
+femhowto.sampleAlongLine: 0
+
+paramfile: solverparameter
+
+poisson.nonConformOrigin: false
+
+istl.preconditioning.method: ilu-0
+istl.preconditioning.iterations: 1
+istl.preconditioning.relaxation: 1
+
+nonconformitydifference: -1
--
GitLab