old demo-initfiles restored

demo/init/ball.dat.3d

@@ -20,7 +20,7 @@ ball->marker[0]->strategy:    0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
 
 ball->output->filename:       output/ball.3d
 ball->output->ParaView format: 1
-ball->output->ARH format:      1
-ball->output->AMDiS format:    1
+ball->output->ARH format:  1
+ball->output->AMDiS format: 1
 
 

demo/init/bunny.dat.3d

@@ -9,7 +9,7 @@ bunny->dim:                   2
 bunny->components:            1
 bunny->polynomial degree[0]:  1
 
-bunny->solver:                umfpack
+bunny->solver:                cg
 bunny->solver->max iteration: 100
 bunny->solver->tolerance:     1.e-8
 bunny->solver->info:          5
@@ -33,8 +33,7 @@ bunny->output->ParaView format:  1
 bunny->output->append index:     0
 bunny->output->index length:     6
 bunny->output->index decimals:   3
-bunny->output->AMDiS format:     1
-bunny->output->ARH format:       1
+bunny->output->AMDiS format: 1
 
 WAIT: 1
 

demo/init/ellipt.dat.1d

 dimension of world:             1
 
 elliptMesh->macro file name:    ./macro/macro.stand.1d
-elliptMesh->global refinements: 10
+elliptMesh->global refinements: 3
 
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    1
 ellipt->polynomial degree[0]:   1
-ellipt->polynomial degree[1]:   2
 ellipt->components:             1
 
-ellipt->solver:                 umfpack
+ellipt->solver:                 cg
 ellipt->solver->max iteration:  1000
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
@@ -27,9 +26,8 @@ ellipt->marker[0]->MSGamma:        0.5
 ellipt->adapt[0]->tolerance:          1e-4
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:         0
+ellipt->adapt->max iteration:         10
 
 ellipt->output->filename:        output/ellipt.1d
 ellipt->output->ParaView format: 1
-ellipt->output->AMDiS format:    1
-ellipt->output->ARH format:      1
+ellipt->output->AMDiS format: 1

demo/init/ellipt.dat.2d

 dimension of world:             2
 
 elliptMesh->macro file name:    ./macro/macro.stand.2d
-elliptMesh->global refinements: 0	
+elliptMesh->global refinements: 0
 
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    2
 ellipt->components:             1
 ellipt->polynomial degree[0]:   1
-
+ 
 ellipt->solver:                 cg
+ellipt->solver->ell:        1
 ellipt->solver->max iteration:  1000
 ellipt->solver->tolerance:      1.e-8
-ellipt->solver->info:           1
-ellipt->solver->left precon:    diag
+ellipt->solver->info:           10
+ellipt->solver->left precon:    ilu
 ellipt->solver->right precon:   no
 
 ellipt->estimator[0]:              residual
-ellipt->estimator[0]->error norm:  1   % 1: H1_NORM, 2: L2_NORM
+ellipt->estimator[0]->error norm:  H1_NORM   % 1: H1_NORM, 2: L2_NORM
 ellipt->estimator[0]->C0:          0.1 % constant of element residual
 ellipt->estimator[0]->C1:          0.1 % constant of jump residual
 
-ellipt->marker[0]->strategy:       3   % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
+ellipt->marker[0]->strategy:       2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
+ellipt->marker[0]->MSGamma:        0.5
+
+ellipt->adapt[0]->tolerance:          1e-4
+ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt[0]->tolerance:       1e-4
-ellipt->adapt->max iteration:      15
+ellipt->adapt->max iteration:         10
 
-ellipt->output->filename:          output/ellipt.2d
-ellipt->output->ParaView format:   1
-ellipt->output->AMDiS format:      1
-ellipt->output->ARH format:        1
+ellipt->output->filename:       output/ellipt.2d
+ellipt->output->ParaView format: 1
+ellipt->output->ARH format: 1
+ellipt->output->AMDiS format: 1

demo/init/ellipt.dat.3d

@@ -15,19 +15,19 @@ ellipt->solver->info:           2
 ellipt->solver->left precon:    diag
 ellipt->solver->right precon:   no
 
-%ellipt->estimator[0]:              residual
+ellipt->estimator[0]:              residual
 ellipt->estimator[0]->error norm:  H1_NORM   % 1: H1_NORM, 2: L2_NORM
 ellipt->estimator[0]->C1:          0.01 % constant of jump residual
 
-ellipt->marker[0]->strategy:      0 % 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
+ellipt->marker[0]->strategy:       2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
 ellipt->marker[0]->MSGamma:        0.5
 
 ellipt->adapt[0]->tolerance:          1e-4
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:       0 %  10
+ellipt->adapt->max iteration:         10
 
 ellipt->output->filename:        output/ellipt.3d
 ellipt->output->ParaView format: 1
-ellipt->output->ARH format:      1
-ellipt->output->AMDiS format:    1
+ellipt->output->ARH format: 1
+ellipt->output->AMDiS format: 1

demo/init/heat.dat.1d

@@ -48,8 +48,7 @@ heat->space->output->write every i-th timestep:   10
 heat->space->output->append index:                1
 heat->space->output->index length:                6
 heat->space->output->index decimals:              3
-heat->space->output->AMDiS format:                1
-%heat->space->output->ARH format:                  1
+heat->space->output->AMDiS format: 1
 
 WAIT:                                0
 

demo/init/heat.dat.2d

 dimension of world:   2
 
 heatMesh->macro file name:            ./macro/macro.stand.2d
-heatMesh->global refinements:         10
+heatMesh->global refinements:         0
 
 heat->space->polynomial degree[0]:    1
 heat->space->dim:                     2
@@ -9,7 +9,7 @@ heat->space->mesh:                    heatMesh
 
 heat->space->components:              1
 
-heat->space->solver:                  cg %hypre
+heat->space->solver:                  cg
 heat->space->solver->max iteration:   1000
 heat->space->solver->tolerance:       1.e-8
 heat->space->solver->info:            2
@@ -21,7 +21,7 @@ heat->space->estimator[0]->C0:       1.0
 heat->space->estimator[0]->C1:       1.0
 heat->space->estimator[0]->C3:       1.0
 
-heat->theta:                         0.5
+heat->theta:                         1.0
 
 heat->adapt->timestep:               0.1
 heat->adapt->start time:             0.0
@@ -30,25 +30,25 @@ heat->adapt->end time:               1.0
 heat->adapt[0]->tolerance:           0.05
 heat->adapt[0]->time tolerance:      0.05
 
-heat->adapt->strategy:               0   % 0=explicit, 1=implicit
-heat->adapt->max iteration:          0
+heat->adapt->strategy:               1   % 0=explicit, 1=implicit
+heat->adapt->max iteration:          100
 
 heat->adapt[0]->coarsen allowed:        1
 heat->adapt[0]->refine bisections:      2
 heat->adapt[0]->coarsen bisections:     2
 
-heat->space->marker[0]->strategy:    0   % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
+heat->space->marker[0]->strategy:    2   % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
 heat->space->marker[0]->MSGamma:     0.5
 heat->space->marker[0]->MSGammaC:    0.1
 
 heat->space->output->filename:                    output/heat.2d
 heat->space->output->ParaView format:             1
 heat->space->output->ParaView animation:          1
-heat->space->output->write every i-th timestep:   1
+heat->space->output->write every i-th timestep:   10
 heat->space->output->append index:                1
 heat->space->output->index length:                6
 heat->space->output->index decimals:              3
-heat->space->output->ARH format:                  1
-heat->space->output->AMDiS format:                1
+heat->space->output->ARH format: 1
+heat->space->output->AMDiS format: 1
 
 WAIT:                                0

demo/init/heat.dat.3d

@@ -47,8 +47,8 @@ heat->space->output->write every i-th timestep:   10
 heat->space->output->append index:                1
 heat->space->output->index length:                6
 heat->space->output->index decimals:              3
-heat->space->output->ARH format:                  1
-heat->space->output->AMDiS format:                1
+heat->space->output->ARH format:  1
+heat->space->output->AMDiS format: 1
 
 WAIT:                                0
 

demo/init/neumann.dat.2d

@@ -28,5 +28,5 @@ neumann->adapt->max iteration:         100
 
 neumann->output->filename:        output/neumann.2d
 neumann->output->ParaView format: 1
-neumann->output->ARH format:      1
-neumann->output->AMDiS format:    1
+neumann->output->ARH format:  1
+neumann->output->AMDiS format: 1

demo/init/nonlin.dat.2d

@@ -31,5 +31,5 @@ nonlin->adapt->max iteration:         0
 
 nonlin->output->filename:       output/nonlin.2d
 nonlin->output->ParaView format: 1
-nonlin->output->AMDiS format:    1
-nonlin->output->ARH format:      1
+nonlin->output->AMDiS format: 1
+nonlin->output->ARH format: 1

demo/init/parametric.dat.3d

@@ -33,8 +33,8 @@ parametric->output->ParaView format:  1
 parametric->output->append index:     0
 parametric->output->index length:     6
 parametric->output->index decimals:   3
-parametric->output->ARH format:       1
-parametric->output->AMDiS format:     1
+parametric->output->ARH format:  1
+parametric->output->AMDiS format: 1
 
 WAIT: 1
 

demo/init/periodic.dat.2d

@@ -34,8 +34,8 @@ periodic->output->filename:         output/periodic.2d
 periodic->output->ParaView format:  1
 periodic->output->index length:     6
 periodic->output->index decimals:   3
-periodic->output->AMDiS format:     1
-periodic->output->ARH format:       1
-periodic->output->Periodic format:  1
+periodic->output->AMDiS format: 1
+periodic->output->ARH format: 1
+periodic->output->Periodic format: 1
 
 WAIT:                           0

demo/init/periodic.dat.3d

@@ -34,8 +34,8 @@ periodic->output->ParaView format:  1
 periodic->output->append index:     0
 periodic->output->index length:     6
 periodic->output->index decimals:   3
-periodic->output->AMDiS format:     1
-periodic->output->ARH format:       1
-periodic->output->Periodic format:  1
+periodic->output->AMDiS format: 1
+periodic->output->ARH format: 1
+periodic->output->Periodic format: 1
 
 WAIT:                           1

demo/init/sphere.dat.3d

@@ -18,7 +18,7 @@ sphere->marker[0]->strategy:   0
 
 sphere->output->filename:         output/sphere.3d
 sphere->output->ParaView format:  1
-sphere->output->AMDiS format:     1
-sphere->output->ARH format:       1
+sphere->output->AMDiS format: 1
+sphere->output->ARH format: 1
 
 

demo/init/torus.dat.3d

@@ -18,6 +18,6 @@ torus->marker[0]->strategy:   0
 
 torus->output->filename:         output/torus.3d
 torus->output->ParaView format:  1
-torus->output->AMDiS format:     1
-torus->output->ARH format:       1
+torus->output->AMDiS format: 1
+torus->output->ARH format: 1
 

demo/init/vecellipt.dat.1d

@@ -40,10 +40,9 @@ vecellipt->adapt->refine bisections:     2
 
 vecellipt->output[0]->filename:             output/vecellipt0.1d
 vecellipt->output[0]->ParaView format:      1
-%vecellipt->output[0]->ARH format:           1
-vecellipt->output[0]->AMDiS format:         1
+vecellipt->output[0]->ARH format: 1
+vecellipt->output[0]->AMDiS format: 1
 
 vecellipt->output[1]->filename:             output/vecellipt1.1d
 vecellipt->output[1]->ParaView format:      1
-%vecellipt->output[1]->ARH format:           1
-vecellipt->output[1]->AMDiS format:         1
+vecellipt->output[1]->AMDiS format: 1

demo/init/vecellipt.dat.2d

 dimension of world:                      2
 
 vecelliptMesh->macro file name:          ./macro/macro.stand.2d
-vecelliptMesh->global refinements:       2
+vecelliptMesh->global refinements:       0
 
 vecellipt->mesh:                         vecelliptMesh
 vecellipt->dim:                          2
@@ -30,11 +30,15 @@ vecellipt->marker[1]->strategy:          0   % 0: no adaption 1: GR 2: MS 3: ES
 vecellipt->adapt[0]->tolerance:          1e-2
 vecellipt->adapt[1]->tolerance:          1e-3
 
-vecellipt->adapt->max iteration:         100
+vecellipt->adapt->max iteration:         10
 vecellipt->adapt->refine bisections:     2
 
-vecellipt->output[0]->filename:             output/vecellipt.2d
+vecellipt->output[0]->filename:             output/vecellipt0.2d
 vecellipt->output[0]->ParaView format:      1
+vecellipt->output[0]->ARH format: 1
+vecellipt->output[0]->AMDiS format: 1
 
 vecellipt->output[1]->filename:             output/vecellipt1.2d
 vecellipt->output[1]->ParaView format:      1
+vecellipt->output[1]->ARH format: 1
+vecellipt->output[1]->AMDiS format: 1

demo/init/vecheat.dat.1d

@@ -64,8 +64,8 @@ vecheat->space->output[0]->ParaView animation:  1
 vecheat->space->output[0]->append index:        1
 vecheat->space->output[0]->index length:        6
 vecheat->space->output[0]->index decimals:      3
-%vecheat->space->output[0]->ARH format:          1
-vecheat->space->output[0]->AMDiS format:        1
+vecheat->space->output[0]->ARH format: 1
+vecheat->space->output[0]->AMDiS format: 1
 
 vecheat->space->output[1]->filename:            output/vecheat1.1d
 vecheat->space->output[1]->ParaView format:     1
@@ -73,7 +73,7 @@ vecheat->space->output[1]->ParaView animation:  1
 vecheat->space->output[1]->append index:        1
 vecheat->space->output[1]->index length:        6
 vecheat->space->output[1]->index decimals:      3
-vecheat->space->output[1]->AMDiS format:        1
+vecheat->space->output[1]->AMDiS format: 1
 
 WAIT:                                        0
 

demo/init/vecheat.dat.2d

@@ -10,10 +10,10 @@ vecheat->space->mesh:                        vecheatMesh
 
 vecheat->space->components:                  2
 
-vecheat->space->solver:                      bicgstab
+vecheat->space->solver:                      bicgstab 
 vecheat->space->solver->max iteration:       1000
 vecheat->space->solver->tolerance:           1.e-10
-vecheat->space->solver->info:                1
+vecheat->space->solver->info:                2
 vecheat->space->solver->left precon:         diag
 vecheat->space->solver->right precon:        no
 
@@ -67,8 +67,8 @@ vecheat->space->output[0]->ParaView animation:  1
 vecheat->space->output[0]->append index:        1
 vecheat->space->output[0]->index length:        6
 vecheat->space->output[0]->index decimals:      3
-vecheat->space->output[0]->ARH format:          1
-vecheat->space->output[0]->AMDiS format:        1
+vecheat->space->output[0]->ARH format: 1
+vecheat->space->output[0]->AMDiS format: 1
 
 vecheat->space->output[1]->filename:            output/vecheat1.2d
 vecheat->space->output[1]->ParaView format:     1
@@ -76,8 +76,8 @@ vecheat->space->output[1]->ParaView animation:  1
 vecheat->space->output[1]->append index:        1
 vecheat->space->output[1]->index length:        6
 vecheat->space->output[1]->index decimals:      3
-vecheat->space->output[1]->ARH format:          1
-vecheat->space->output[1]->AMDiS format:        1
+vecheat->space->output[1]->ARH format: 1
+vecheat->space->output[1]->AMDiS format: 1
 
 
 WAIT:                                        0

demo/init/vecheat.dat.3d

@@ -67,8 +67,8 @@ vecheat->space->output[0]->ParaView animation:  1
 vecheat->space->output[0]->append index:        1
 vecheat->space->output[0]->index length:        6
 vecheat->space->output[0]->index decimals:      3
-vecheat->space->output[0]->ARH format:          1
-vecheat->space->output[0]->AMDiS format:        1
+vecheat->space->output[0]->ARH format: 1
+vecheat->space->output[0]->AMDiS format: 1
 
 vecheat->space->output[1]->filename:            output/vecheat1.3d
 vecheat->space->output[1]->ParaView format:     1
@@ -76,8 +76,8 @@ vecheat->space->output[1]->ParaView animation:  1
 vecheat->space->output[1]->append index:        1
 vecheat->space->output[1]->index length:        6
 vecheat->space->output[1]->index decimals:      3
-vecheat->space->output[1]->ARH format:          1
-vecheat->space->output[1]->AMDiS format:        1
+vecheat->space->output[1]->ARH format: 1
+vecheat->space->output[1]->AMDiS format: 1
 
 
 WAIT:                                        0