diff --git a/AMDiS/test/datacreation/src/BallProject.cpp b/AMDiS/test/datacreation/src/BallProject.cpp
index 8a62fa406b9f87d2704096df8431e038a84dbf16..c2cdf2b2387144128d807ce5d8e8fae3d4a6cd27 100644
--- a/AMDiS/test/datacreation/src/BallProject.cpp
+++ b/AMDiS/test/datacreation/src/BallProject.cpp
@@ -97,16 +97,7 @@ int Balldemo::solve(SolutionInformation& solinfo) {
int retCode = adapt->adapt();
solinfo.dofVec = ball.getSolution();
+ //ball.writeFiles(adaptInfo,true);
return retCode;
}
-/*
-void createProjectList(ProjectList& list) {
- list.clear();
-
- Project* demo = new Balldemo();
- ProjectInfo ballInfo(demo, "init/ball.dat.2d", "../testdata/balldata_2d");
- list.push_back(ballInfo);
- ballInfo = ProjectInfo(demo, "init/ball.dat.3d", "../testdata/balldata_3d");
- list.push_back(ballInfo);
-}
-*/
+
diff --git a/AMDiS/test/testdata/ball_2d.arh b/AMDiS/test/testdata/ball_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..f58a2555eaa78ba79e74a8425c39d3d8167d57c2
Binary files /dev/null and b/AMDiS/test/testdata/ball_2d.arh differ
diff --git a/AMDiS/test/testdata/ball_3d.arh b/AMDiS/test/testdata/ball_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..959047c6ae937c680ccfb19e1528d2bb0d4ab0bf
Binary files /dev/null and b/AMDiS/test/testdata/ball_3d.arh differ
diff --git a/AMDiS/test/testdata/ellipt_1d.arh b/AMDiS/test/testdata/ellipt_1d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..9406d2fb781ba2be34cb0df9f31bdf5acdf02b02
Binary files /dev/null and b/AMDiS/test/testdata/ellipt_1d.arh differ
diff --git a/AMDiS/test/testdata/ellipt_2d.arh b/AMDiS/test/testdata/ellipt_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..bd1ad88e95c832d333fd9a8ba081b9c5f80fefbd
Binary files /dev/null and b/AMDiS/test/testdata/ellipt_2d.arh differ
diff --git a/AMDiS/test/testdata/ellipt_3d.arh b/AMDiS/test/testdata/ellipt_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..bc443fc7977cb8a2f3851206d6803b3e4e1cb7ed
Binary files /dev/null and b/AMDiS/test/testdata/ellipt_3d.arh differ
diff --git a/AMDiS/test/testdata/heat_1d.arh b/AMDiS/test/testdata/heat_1d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..bd95cb64ab433db478a504c0f42f27b0d44f46ae
Binary files /dev/null and b/AMDiS/test/testdata/heat_1d.arh differ
diff --git a/AMDiS/test/testdata/heat_2d.arh b/AMDiS/test/testdata/heat_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..c0d8a92aea57baf7f802bc5360588a7911acf880
Binary files /dev/null and b/AMDiS/test/testdata/heat_2d.arh differ
diff --git a/AMDiS/test/testdata/heat_3d.arh b/AMDiS/test/testdata/heat_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..efa4a254271d926df9d00c87b161228943caa062
Binary files /dev/null and b/AMDiS/test/testdata/heat_3d.arh differ
diff --git a/AMDiS/test/testdata/init/ball.dat.2d b/AMDiS/test/testdata/init/ball.dat.2d
index 51d27cb8fc34a0657a2a530c8170306237d8a445..1bf29db2195005476c845c62ab9ab153be89012d 100644
--- a/AMDiS/test/testdata/init/ball.dat.2d
+++ b/AMDiS/test/testdata/init/ball.dat.2d
@@ -1,7 +1,7 @@
dimension of world: 2
ballMesh->macro file name: ./macro/macro.ball.2d
-ballMesh->global refinements: 3
+ballMesh->global refinements: 13
ball->mesh: ballMesh
ball->dim: 2
@@ -25,7 +25,7 @@ ball->adapt->tolerance: 1e-8
ball->adapt->max iteration: 4
ball->adapt->info: 8
-ball->output->filename: ball
+ball->output->filename: ball2d
ball->output->ParaView format: 1
diff --git a/AMDiS/test/testdata/init/ball.dat.3d b/AMDiS/test/testdata/init/ball.dat.3d
index 0a9dabf7500918e735e40cf356d93f5d6b3ef8c8..763fd6b8da6869f2fd0098bdc8d209ff231af7ed 100644
--- a/AMDiS/test/testdata/init/ball.dat.3d
+++ b/AMDiS/test/testdata/init/ball.dat.3d
@@ -1,7 +1,7 @@
dimension of world: 3
ballMesh->macro file name: ./macro/macro.ball.3d
-ballMesh->global refinements: 15
+ballMesh->global refinements: 13
ball->mesh: ballMesh
ball->dim: 3
@@ -15,7 +15,7 @@ ball->solver->left precon: diag
ball->estimator: 0
ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
-ball->output->filename: output/ball
+ball->output->filename: ball3d
ball->output->ParaView format: 1
diff --git a/AMDiS/test/testdata/init/ellipt.dat.3d b/AMDiS/test/testdata/init/ellipt.dat.3d
index 286959bd960c6daa186ef0fa3c273d2db1fb3432..4d56472052fb81ed8b7997ad5bd541e7d332222c 100644
--- a/AMDiS/test/testdata/init/ellipt.dat.3d
+++ b/AMDiS/test/testdata/init/ellipt.dat.3d
@@ -7,11 +7,11 @@ ellipt->mesh: elliptMesh
ellipt->dim: 3
ellipt->polynomial degree: 2
-ellipt->solver: bicgstab
+ellipt->solver: cg
ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2
-ellipt->solver->left precon: ilu
+ellipt->solver->left precon: diag
ellipt->solver->right precon: no
ellipt->estimator: residual
@@ -22,7 +22,7 @@ ellipt->marker->strategy: 3 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ellipt->marker->MSGamma: 0.5
ellipt->adapt->tolerance: 1e-4
-ellipt->adapt->max iteration: 5
+ellipt->adapt->max iteration: 4
ellipt->adapt->info: 8
ellipt->adapt->refine bisections: 3
diff --git a/AMDiS/test/testdata/init/heat.dat.1d b/AMDiS/test/testdata/init/heat.dat.1d
index d18bfc58e3479c546d8cd35febc392ef00ce05fa..52f7bf5a9760b55338120836ad30e8fb1288992b 100644
--- a/AMDiS/test/testdata/init/heat.dat.1d
+++ b/AMDiS/test/testdata/init/heat.dat.1d
@@ -54,7 +54,7 @@ heat->space->marker->info: 8
heat->space->output->filename: heat
-heat->space->output->ParaView format: 1
+heat->space->output->ParaView format: 0
heat->space->output->TecPlot format: 0
heat->space->output->TecPlot ext: .tec
diff --git a/AMDiS/test/testdata/init/heat.dat.2d b/AMDiS/test/testdata/init/heat.dat.2d
index df7e186565e02840ee52d18291fa4fbdfa8318a0..892e74f8468723126619d28604f8defef164f8ae 100644
--- a/AMDiS/test/testdata/init/heat.dat.2d
+++ b/AMDiS/test/testdata/init/heat.dat.2d
@@ -23,7 +23,7 @@ heat->theta: 1.0
heat->adapt->timestep: 0.01
heat->adapt->min timestep: 0.01
heat->adapt->start time: 0.0
-heat->adapt->end time: 1.0
+heat->adapt->end time: 0.05
heat->adapt->tolerance: 0.0001
heat->adapt->rel space error: 0.5
@@ -39,6 +39,7 @@ heat->adapt->max iteration: 100
heat->adapt->coarsen allowed: 1 % 0|1
heat->adapt->refine bisections: 1
heat->adapt->coarsen bisections: 1
+%heat->adapt->info: 2
heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->MSGamma: 0.5
diff --git a/AMDiS/test/testdata/init/heat.dat.3d b/AMDiS/test/testdata/init/heat.dat.3d
index 9933cb67990dcbb16c77eb06400c1063b13ca047..af426330954b23762b2f56b3e1f9df009244b6a6 100644
--- a/AMDiS/test/testdata/init/heat.dat.3d
+++ b/AMDiS/test/testdata/init/heat.dat.3d
@@ -15,31 +15,34 @@ heat->space->solver->left precon: no
heat->space->solver->right precon: no
heat->space->estimator: residual
-heat->space->estimator->C0: 0.0
-heat->space->estimator->C1: 1.0
-heat->space->estimator->C3: 1.0
+heat->space->estimator->C0: 0.1
+heat->space->estimator->C1: 0.1
heat->theta: 1.0
+heat->adapt->timestep: 0.01
+heat->adapt->min timestep: 0.01
+heat->adapt->start time: 0.0
+heat->adapt->end time: 0.05
+
heat->adapt->tolerance: 0.01
-heat->adapt->timestep: 0.01
heat->adapt->rel space error: 0.5
heat->adapt->rel time error: 0.5
heat->adapt->strategy: 0 % 0=explicit, 1=implicit
heat->adapt->max iteration: 10
-heat->adapt->info: 2
+%heat->adapt->info: 2
heat->initial->adapt->strategy: 2 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->initial->adapt->max iteration: 10
-heat->initial->adapt->info: 2
+%heat->initial->adapt->info: 2
-heat->space->marker->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
+heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->ESTheta: 0.9
heat->space->marker->ESThetaC: 0.05
heat->adapt->max iteration: 2
heat->adapt->coarsen allowed: 1 % 0|1
-heat->adapt->info: 2
+%heat->adapt->info: 2
heat->adapt->refine bisections: 3
heat->adapt->coarsen bisections: 3
diff --git a/AMDiS/test/testdata/init/periodic.dat.3d b/AMDiS/test/testdata/init/periodic.dat.3d
index 547eaf843aefa67312b4c7a5ffa81ad8901416a3..41252e7a9c1a6df81691928ad1b8cd1de879f663 100644
--- a/AMDiS/test/testdata/init/periodic.dat.3d
+++ b/AMDiS/test/testdata/init/periodic.dat.3d
@@ -27,7 +27,7 @@ periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
periodic->marker->MSGamma: 0.5
periodic->adapt->tolerance: 1e-2
-periodic->adapt->max iteration: 100
+periodic->adapt->max iteration: 5 %100
periodic->adapt->refine bisections: 3
periodic->adapt->coarsen allowed: 0
diff --git a/AMDiS/test/testdata/init/vecellipt.dat.1d b/AMDiS/test/testdata/init/vecellipt.dat.1d
index 1dade792ae2966c70908d56bf7bd4d96c8d146af..ceb86cd66142ba928341f32d3eaca929427ac3c5 100644
--- a/AMDiS/test/testdata/init/vecellipt.dat.1d
+++ b/AMDiS/test/testdata/init/vecellipt.dat.1d
@@ -33,13 +33,13 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual
vecellipt->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
vecellipt->marker[1]->MSGamma: 0.5
-vecellipt->adapt->max iteration: 8
+vecellipt->adapt->max iteration: 20
vecellipt->adapt->info: 8
vecellipt->adapt->refine bisections: 1
-vecellipt->adapt[0]->tolerance: 1e-4
-vecellipt->adapt[1]->tolerance: 1e-4
+vecellipt->adapt[0]->tolerance: 1e-3
+vecellipt->adapt[1]->tolerance: 1e-3
vecellipt->output->filename: vecellipt
vecellipt->output->ParaView format: 1
diff --git a/AMDiS/test/testdata/init/vecellipt.dat.3d b/AMDiS/test/testdata/init/vecellipt.dat.3d
index e7efeb64aa544d3c7cd55cdee90e278b8bd9c31e..74211574560cff02884faf456a941a2159ee5308 100644
--- a/AMDiS/test/testdata/init/vecellipt.dat.3d
+++ b/AMDiS/test/testdata/init/vecellipt.dat.3d
@@ -33,15 +33,15 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual
vecellipt->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
vecellipt->marker[1]->MSGamma: 0.5
-vecellipt->adapt->max iteration: 5
+vecellipt->adapt->max iteration: 16
vecellipt->adapt->info: 8
vecellipt->adapt->refine bisections[0]: 3
vecellipt->adapt->refine bisections[1]: 3
-vecellipt->adapt[0]->tolerance: 1e-4
-vecellipt->adapt[1]->tolerance: 1e-4
+vecellipt->adapt[0]->tolerance: 1e-2
+vecellipt->adapt[1]->tolerance: 1e-3
vecellipt->output->filename: vecellipt
diff --git a/AMDiS/test/testdata/neumann_2d.arh b/AMDiS/test/testdata/neumann_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..4f6636ec766e36d66fdc369235da7a24c361e2f0
Binary files /dev/null and b/AMDiS/test/testdata/neumann_2d.arh differ
diff --git a/AMDiS/test/testdata/parametric_3d.arh b/AMDiS/test/testdata/parametric_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..cb53ac9687f14006b64444e3897a89c0ecba6ca4
Binary files /dev/null and b/AMDiS/test/testdata/parametric_3d.arh differ
diff --git a/AMDiS/test/testdata/periodic_2d.arh b/AMDiS/test/testdata/periodic_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..77d23133b7a23acdad67a7ad3b03d156e1f02a09
Binary files /dev/null and b/AMDiS/test/testdata/periodic_2d.arh differ
diff --git a/AMDiS/test/testdata/periodic_3d.arh b/AMDiS/test/testdata/periodic_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..a631f68cbc256f10e05370bf6f7956a6acbfcac5
Binary files /dev/null and b/AMDiS/test/testdata/periodic_3d.arh differ
diff --git a/AMDiS/test/testdata/sphere_3d.arh b/AMDiS/test/testdata/sphere_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..998aaf88796bcb7378013db2e40a3bd9a0d75a97
Binary files /dev/null and b/AMDiS/test/testdata/sphere_3d.arh differ
diff --git a/AMDiS/test/testdata/vecellipt_1d.arh b/AMDiS/test/testdata/vecellipt_1d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..3141e2e619fa215e6e726181a4252aa2d015ec78
Binary files /dev/null and b/AMDiS/test/testdata/vecellipt_1d.arh differ
diff --git a/AMDiS/test/testdata/vecellipt_2d.arh b/AMDiS/test/testdata/vecellipt_2d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..9dd9a25678e477992f2aa487febb7396d1f8dba0
Binary files /dev/null and b/AMDiS/test/testdata/vecellipt_2d.arh differ
diff --git a/AMDiS/test/testdata/vecellipt_3d.arh b/AMDiS/test/testdata/vecellipt_3d.arh
new file mode 100644
index 0000000000000000000000000000000000000000..52197fa69ad61ba2c94f55bacaaf0e5887bdcffe
Binary files /dev/null and b/AMDiS/test/testdata/vecellipt_3d.arh differ