Adjust demos init files.

demo/init/ball.dat.2d

@@ -7,9 +7,8 @@ ball->mesh:                   ballMesh
 ball->dim:                    2
 ball->polynomial degree:      1
 
-ball->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+ball->solver:                 cg
 ball->solver->max iteration:  1000
-ball->solver->restart:        10  %  only used for GMRES
 ball->solver->tolerance:      1.e-8
 ball->solver->info:           2
 ball->solver->left precon:    diag

demo/init/ball.dat.3d

@@ -7,7 +7,7 @@ ball->mesh:                   ballMesh
 ball->dim:                    3
 ball->polynomial degree:      1
 
-ball->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+ball->solver:                 cg
 ball->solver->max iteration:  1000
 ball->solver->tolerance:      1.e-8
 ball->solver->left precon:    diag

demo/init/bunny.init

@@ -10,7 +10,6 @@ bunny->polynomial degree:    1
 
 bunny->solver:                cg
 bunny->solver->max iteration: 100
-bunny->solver->restart:       10  %  only used for GMRES
 bunny->solver->tolerance:     1.e-8
 bunny->solver->info:          5
 bunny->solver->left precon:   diag

demo/init/couple.dat.2d

@@ -11,7 +11,7 @@ problem1->mesh:                 coupleMesh
 problem1->dim:                  2
 problem1->polynomial degree:    1
 
-problem1->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+problem1->solver:                 cg
 problem1->solver->max iteration:  1000
 problem1->solver->tolerance:      1.e-8
 problem1->solver->left precon:    diag
@@ -32,7 +32,7 @@ problem1->output->AMDiS data ext: .dat
 problem2->dim:                  2
 problem2->polynomial degree:    1
 
-problem2->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+problem2->solver:                 cg
 problem2->solver->max iteration:  1000
 problem2->solver->tolerance:      1.e-8
 problem2->solver->left precon:    diag

demo/init/ellipt.dat.1d

@@ -7,9 +7,8 @@ ellipt->mesh:                   elliptMesh
 ellipt->dim:                    1
 ellipt->polynomial degree:      1
 
-ellipt->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+ellipt->solver:                 cg
 ellipt->solver->max iteration:  1000
-ellipt->solver->restart:        10  %  only used for GMRES
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
 ellipt->solver->left precon:    diag   

demo/init/ellipt.dat.2d

@@ -7,9 +7,8 @@ ellipt->mesh:                   elliptMesh
 ellipt->dim:                    2
 ellipt->polynomial degree:      1
 
-ellipt->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+ellipt->solver:                 cg
 ellipt->solver->max iteration:  1000
-ellipt->solver->restart:        10  %  only used for GMRES
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
 ellipt->solver->left precon:    diag

demo/init/ellipt.dat.3d

@@ -7,9 +7,8 @@ ellipt->mesh:                   elliptMesh
 ellipt->dim:                    3
 ellipt->polynomial degree:      2
 
-ellipt->solver:                 bicgstab % no, bicgstab, cg, gmres, odir, ores
+ellipt->solver:                 bicgstab
 ellipt->solver->max iteration:  1000
-ellipt->solver->restart:        10  %  only used for GMRES
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
 ellipt->solver->left precon:    ilu

demo/init/heat.dat.1d

@@ -9,7 +9,6 @@ heat->space->mesh:                    heatMesh
 
 heat->space->solver:                  cg
 heat->space->solver->max iteration:   1000
-heat->space->solver->restart:         10  %  only used for GMRES
 heat->space->solver->tolerance:       1.e-8
 heat->space->solver->info:            8
 heat->space->solver->left precon:     diag

demo/init/heat.dat.2d

@@ -10,7 +10,6 @@ heat->space->mesh:                    heatMesh
 
 heat->space->solver:                  cg
 heat->space->solver->max iteration:   1000
-heat->space->solver->restart:         10  %  only used for GMRES
 heat->space->solver->tolerance:       1.e-8
 heat->space->solver->info:            2
 heat->space->solver->left precon:     diag

demo/init/heat.dat.3d

@@ -9,7 +9,6 @@ heat->space->mesh:                    heatMesh
 
 heat->space->solver:                  cg
 heat->space->solver->max iteration:   1000
-heat->space->solver->restart:         10  %  only used for GMRES
 heat->space->solver->tolerance:       1.e-8
 heat->space->solver->info:            2
 heat->space->solver->left precon:     diag

demo/init/mpcci1.dat.2d

@@ -7,9 +7,8 @@ mpcci1->mesh:                   mpcci1Mesh
 mpcci1->dim:                    2
 mpcci1->polynomial degree:      1
 
-mpcci1->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+mpcci1->solver:                 cg
 mpcci1->solver->max iteration:  1000
-mpcci1->solver->restart:        10  %  only used for GMRES
 mpcci1->solver->tolerance:      1.e-8
 mpcci1->solver->info:           2
 mpcci1->solver->left precon:    diag

demo/init/mpcci2.dat.2d

@@ -7,9 +7,8 @@ mpcci2->mesh:                   mpcci2Mesh
 mpcci2->dim:                    2
 mpcci2->polynomial degree:      1
 
-mpcci2->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+mpcci2->solver:                 cg
 mpcci2->solver->max iteration:  1000
-mpcci2->solver->restart:        10  %  only used for GMRES
 mpcci2->solver->tolerance:      1.e-8
 mpcci2->solver->info:           2
 mpcci2->solver->left precon:    diag

demo/init/mpccitest.dat.2d

@@ -7,9 +7,8 @@ mpccitest->mesh:                   mpccitestMesh
 mpccitest->dim:                    2
 mpccitest->polynomial degree:      1
 
-mpccitest->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+mpccitest->solver:                 cg
 mpccitest->solver->max iteration:  1000
-mpccitest->solver->restart:        10  %  only used for GMRES
 mpccitest->solver->tolerance:      1.e-8
 mpccitest->solver->info:           2
 mpccitest->solver->left precon:    diag

demo/init/multigrid.dat.2d

-dimension of world:             2
-
-multigridMesh->macro file name:    ./macro/macro.stand.2d
-multigridMesh->global refinements: 0
-multigridMesh->preserve coarse dofs: 1
-
-multigrid->mesh:                   multigridMesh
-multigrid->dim:                    2
-multigrid->polynomial degree:      1
-
-multigrid->solver:                               mg
-multigrid->solver->tolerance:                    1.e-12
-multigrid->solver->max iteration:                100
-multigrid->solver->use galerkin operator:        0
-multigrid->solver->mg cycle index:               1 % 1: V, 2: W
-multigrid->solver->smoother:                     gs
-multigrid->solver->smoother->omega:              1.0
-multigrid->solver->pre smoothing steps:          3
-multigrid->solver->post smoothing steps:         3
-multigrid->solver->coarse level smoothing steps: 1
-multigrid->solver->min level:                    0
-multigrid->solver->min level gap:                1
-multigrid->solver->max mg levels:                100
-multigrid->solver->info:           2
-multigrid->solver->left precon:    diag
-multigrid->solver->right precon:   no
-
-multigrid->estimator:              residual
-multigrid->estimator->error norm:  1   % 1: H1_NORM, 2: L2_NORM
-multigrid->estimator->C0:          0.1 % constant of element residual
-multigrid->estimator->C1:          0.1 % constant of jump residual
-multigrid->estimator->C2:          0.0 % constant of coarsening estimate
-
-multigrid->marker->strategy:       2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
-multigrid->marker->MSGamma:        0.5
-
-multigrid->adapt->tolerance:       1e-8
-multigrid->adapt->max iteration:   10
-multigrid->adapt->refine bisections:  2
-
-multigrid->output->filename:       multigrid
-
-multigrid->output->ParaView format: 1
-
-multigrid->output->TecPlot format: 0
-multigrid->output->TecPlot ext:    .tec
-
-multigrid->output->AMDiS format:   0
-multigrid->output->AMDiS mesh ext: .mesh
-multigrid->output->AMDiS data ext: .dat
-
-multigrid->output->append index:   0
-multigrid->output->index length:   6
-multigrid->output->index decimals: 3
-
-WAIT:                           1

demo/init/multigrid.dat.3d

-dimension of world:             3
-
-multigridMesh->macro file name:    ./macro/macro.stand.3d
-multigridMesh->global refinements: 0
-multigridMesh->preserve coarse dofs: 1
-
-multigrid->mesh:                   multigridMesh
-multigrid->dim:                    3
-multigrid->polynomial degree:      1
-
-multigrid->solver:                               mg
-multigrid->solver->tolerance:                    1.e-8
-multigrid->solver->max iteration:                1000
-multigrid->solver->full mg:                      0
-multigrid->solver->mg cycle index:               1 % 1: V, 2: W
-multigrid->solver->pre smoothing steps:          3
-multigrid->solver->post smoothing steps:         3
-multigrid->solver->coarse level smoothing steps: 10
-multigrid->solver->min level:                    0
-multigrid->solver->min level gap:                0
-multigrid->solver->max mg levels:                100
-multigrid->solver->info:           2
-multigrid->solver->left precon:    diag
-multigrid->solver->right precon:   no
-
-multigrid->estimator:              residual
-multigrid->estimator->error norm:  1   % 1: H1_NORM, 2: L2_NORM
-multigrid->estimator->C0:          0.1 % constant of element residual
-multigrid->estimator->C1:          0.1 % constant of jump residual
-multigrid->estimator->C2:          0.0 % constant of coarsening estimate
-
-multigrid->marker->strategy:       1 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
-multigrid->marker->MSGamma:        0.5
-
-multigrid->adapt->tolerance:       1e-8
-multigrid->adapt->max iteration:   20
-multigrid->adapt->refine bisections:  3
-
-multigrid->output->filename:       multigrid
-
-multigrid->output->ParaView format:  1
-
-multigrid->output->TecPlot format: 0
-multigrid->output->TecPlot ext:    .tec
-
-multigrid->output->AMDiS format:   0
-multigrid->output->AMDiS mesh ext: .mesh
-multigrid->output->AMDiS data ext: .dat
-
-multigrid->output->append index:   0
-multigrid->output->index length:   6
-multigrid->output->index decimals: 3
-
-WAIT:                           0

demo/init/navierstokes.dat.2d

@@ -45,7 +45,6 @@ navierstokes->adapt[2]->coarsen allowed:        1   % 0|1
 
 navierstokes->space->solver:                    bicgstab
 navierstokes->space->solver->max iteration:     1000
-navierstokes->space->solver->restart:           10  %  only used for GMRES
 navierstokes->space->solver->tolerance:         1.e-8
 navierstokes->space->solver->info:              5
 navierstokes->space->solver->left precon:       ilu

demo/init/neumann.dat.2d

@@ -7,7 +7,7 @@ neumann->mesh:                   neumannMesh
 neumann->dim:                    2
 neumann->polynomial degree:      1
 
-neumann->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
+neumann->solver:                 cg
 neumann->solver->max iteration:  1000
 neumann->solver->tolerance:      1.e-8
 neumann->solver->left precon:    diag

demo/init/nonlin.dat.1d

@@ -14,7 +14,6 @@ nonlin->newton->max iteration: 10
 
 nonlin->solver:                 cg
 nonlin->solver->max iteration:  1000
-nonlin->solver->restart:        10  %  only used for GMRES
 nonlin->solver->tolerance:      1.e-8
 nonlin->solver->left precon:    diag
 

demo/init/nonlin.dat.3d

@@ -16,9 +16,8 @@ nonlin->nonlin solver->info:          6         % information level of Newton
 nonlin->nonlin solver->restart:       20        % number of iterations for step size control
 nonlin->nonlin solver->norm:          1         % 1:H1, 2:L2
 
-nonlin->solver:                       gmres
+nonlin->solver:                       bicgstab
 nonlin->solver->max iteration:        1000
-nonlin->solver->restart:              10  %  only used for GMRES
 nonlin->solver->tolerance:            1.e-7
 nonlin->solver->info:                 0    
 nonlin->solver->left precon:          diag

demo/init/parallelellipt.dat.2d

@@ -3,8 +3,6 @@ dimension of world:             2
 elliptMesh->macro file name:    ./macro/macro.stand.2d
 elliptMesh->global refinements: 4
 
-elliptMesh->preserve coarse dofs: 1
-
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    2
 ellipt->polynomial degree:      1
@@ -15,11 +13,8 @@ ellipt->parallel->global coarse grid level: 0
 ellipt->parallel->local coarse grid level: 4
 ellipt->parallel->global refinements: 0
 
-ellipt->solver:                 cg % no, bicgstab, cg, gmres, odir, ores
-ellipt->solver->smoother:       gs
-
+ellipt->solver:                 cg
 ellipt->solver->max iteration:  10000
-ellipt->solver->restart:        10  %  only used for GMRES
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
 ellipt->solver->left precon:    diag