Merge trunk into branch_port_the_testsuite

Conflicts:
	tests/base/graph_coloring_02.cc
	tests/base/graph_coloring_03.cc

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30982 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/examples/step-42/p1_chinese.prm
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b1569bc49532d4d249f8a79a038bf8b401dffdb6
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/deal.II/examples/step-42/p1_chinese.prm
@@@ -1,0 -1,0 +1,25 @@@
++# Listing of Parameters
++# ---------------------
++
++# polynomial degree of the FE_Q finite element space, typically 1 or 2
++set polynomial degree             = 1
++
++# number of initial global refinements before the first computation
++set number of initial refinements = 3
++
++# number of adaptive cycles to run
++set number of cycles              = 12
++
++# refinement strategy for each cycle:
++# global: one global refinement
++# percentage: fixed percentage gets refined using kelly
++# fix dofs: tries to achieve 2^initial_refinement*300 dofs after cycle 1 (only
++# use 2 cycles!). Changes the coarse mesh!
++set refinement strategy           = percentage
++
++# obstacle file to read, leave empty to use a sphere or 'obstacle_file.pbm'
++set obstacle filename             = obstacle_file.pbm
++
++# directory to put output files (graphical output and benchmark statistics,
++# leave empty to put into current directory
++set output directory              = p1adaptive

diff --cc tests/base/graph_coloring_01.cc
Simple merge

diff --cc tests/base/graph_coloring_02.cc
Simple merge

diff --cc tests/base/graph_coloring_03.cc
Simple merge

diff --cc tests/integrators/elasticity_01.cc
index ac9b157df8e3b34ee4b4a64f1b52b0d8a6f2d6d9,13016b95642f432a95400b13c29d577cbabbc9b0..673904d22150842f742be5ef6cdd46ce04981a81
--- 1/tests/integrators/elasticity_01.cc
--- 2/tests/integrators/elasticity_01.cc
+++ b/tests/integrators/elasticity_01.cc
@@@ -19,10 -19,10 +19,10 @@@
  // Output matrices and assert consistency of residuals
  
  #include "../tests.h"
 -#include "../lib/test_grids.h"
 +#include "../test_grids.h"
  
  #include <deal.II/base/logstream.h>
- #include <deal.II/integrators/laplace.h>
+ #include <deal.II/integrators/elasticity.h>
  
  #include <deal.II/fe/fe_dgq.h>
  #include <deal.II/fe/fe_system.h>

diff --cc tests/integrators/elasticity_01.output
Simple merge