From 6ad371c1a064c3168dc88192dc1168205de873c7 Mon Sep 17 00:00:00 2001 From: Thomas Witkowski <thomas.witkowski@gmx.de> Date: Wed, 29 Apr 2009 08:16:55 +0000 Subject: [PATCH] Adjust demos init files. --- demo/init/ball.dat.2d | 3 +- demo/init/ball.dat.3d | 2 +- demo/init/bunny.init | 1 - demo/init/couple.dat.2d | 4 +- demo/init/ellipt.dat.1d | 3 +- demo/init/ellipt.dat.2d | 3 +- demo/init/ellipt.dat.3d | 3 +- demo/init/heat.dat.1d | 1 - demo/init/heat.dat.2d | 1 - demo/init/heat.dat.3d | 1 - demo/init/mpcci1.dat.2d | 3 +- demo/init/mpcci2.dat.2d | 3 +- demo/init/mpccitest.dat.2d | 3 +- demo/init/multigrid.dat.2d | 56 ---------------- demo/init/multigrid.dat.3d | 54 --------------- demo/init/navierstokes.dat.2d | 1 - demo/init/neumann.dat.2d | 2 +- demo/init/nonlin.dat.1d | 1 - demo/init/nonlin.dat.3d | 3 +- demo/init/parallelellipt.dat.2d | 7 +- demo/init/parallelheat.dat.2d | 1 - demo/init/parallelvecellipt.dat.2d | 3 +- demo/init/parametric.dat.3d | 1 - demo/init/periodic.dat.1d | 3 +- demo/init/periodic.dat.2d | 3 +- demo/init/periodic.dat.3d | 3 +- demo/init/smi.dat.2d | 3 +- demo/init/vecellipt.dat.1d | 3 +- demo/init/vecellipt.dat.2d | 5 +- demo/init/vecellipt.dat.3d | 3 +- demo/init/vecheat.dat.1d | 1 - demo/init/vecheat.dat.2d | 1 - demo/init/vecheat.dat.3d | 1 - demo/init/vecmultigrid.dat.2d | 102 ----------------------------- demo/init/vecnonlin.dat.1d | 1 - demo/init/vecnonlin.dat.2d | 1 - demo/init/vecnonlin.dat.3d | 1 - 37 files changed, 22 insertions(+), 269 deletions(-) delete mode 100644 demo/init/multigrid.dat.2d delete mode 100644 demo/init/multigrid.dat.3d delete mode 100644 demo/init/vecmultigrid.dat.2d diff --git a/demo/init/ball.dat.2d b/demo/init/ball.dat.2d index 04d0dca1..d916ae38 100644 --- a/demo/init/ball.dat.2d +++ b/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 diff --git a/demo/init/ball.dat.3d b/demo/init/ball.dat.3d index 381fbfed..b792d557 100644 --- a/demo/init/ball.dat.3d +++ b/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 diff --git a/demo/init/bunny.init b/demo/init/bunny.init index ab46c172..de130891 100644 --- a/demo/init/bunny.init +++ b/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 diff --git a/demo/init/couple.dat.2d b/demo/init/couple.dat.2d index 21931cce..b8f84dc8 100644 --- a/demo/init/couple.dat.2d +++ b/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 diff --git a/demo/init/ellipt.dat.1d b/demo/init/ellipt.dat.1d index 2ef12e83..71a8646c 100644 --- a/demo/init/ellipt.dat.1d +++ b/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 diff --git a/demo/init/ellipt.dat.2d b/demo/init/ellipt.dat.2d index bba93597..042bc41c 100644 --- a/demo/init/ellipt.dat.2d +++ b/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 diff --git a/demo/init/ellipt.dat.3d b/demo/init/ellipt.dat.3d index dcb1ad42..1b2da4dc 100644 --- a/demo/init/ellipt.dat.3d +++ b/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 diff --git a/demo/init/heat.dat.1d b/demo/init/heat.dat.1d index 2a90e1d9..3345984e 100644 --- a/demo/init/heat.dat.1d +++ b/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 diff --git a/demo/init/heat.dat.2d b/demo/init/heat.dat.2d index be45ba28..5bc6a4ba 100644 --- a/demo/init/heat.dat.2d +++ b/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 diff --git a/demo/init/heat.dat.3d b/demo/init/heat.dat.3d index 3632c4b4..816b974d 100644 --- a/demo/init/heat.dat.3d +++ b/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 diff --git a/demo/init/mpcci1.dat.2d b/demo/init/mpcci1.dat.2d index e6be269d..2adc669f 100644 --- a/demo/init/mpcci1.dat.2d +++ b/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 diff --git a/demo/init/mpcci2.dat.2d b/demo/init/mpcci2.dat.2d index c04fbe14..e57614fc 100644 --- a/demo/init/mpcci2.dat.2d +++ b/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 diff --git a/demo/init/mpccitest.dat.2d b/demo/init/mpccitest.dat.2d index 4bcb1a18..bde117f5 100644 --- a/demo/init/mpccitest.dat.2d +++ b/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 diff --git a/demo/init/multigrid.dat.2d b/demo/init/multigrid.dat.2d deleted file mode 100644 index 7e22ce29..00000000 --- a/demo/init/multigrid.dat.2d +++ /dev/null @@ -1,56 +0,0 @@ -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 diff --git a/demo/init/multigrid.dat.3d b/demo/init/multigrid.dat.3d deleted file mode 100644 index 7eb722e1..00000000 --- a/demo/init/multigrid.dat.3d +++ /dev/null @@ -1,54 +0,0 @@ -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 diff --git a/demo/init/navierstokes.dat.2d b/demo/init/navierstokes.dat.2d index ec53a74d..9866d551 100644 --- a/demo/init/navierstokes.dat.2d +++ b/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 diff --git a/demo/init/neumann.dat.2d b/demo/init/neumann.dat.2d index 333dfbc8..808c2334 100644 --- a/demo/init/neumann.dat.2d +++ b/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 diff --git a/demo/init/nonlin.dat.1d b/demo/init/nonlin.dat.1d index c82bfede..425eaed2 100644 --- a/demo/init/nonlin.dat.1d +++ b/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 diff --git a/demo/init/nonlin.dat.3d b/demo/init/nonlin.dat.3d index 21e1b7ca..d0c26829 100644 --- a/demo/init/nonlin.dat.3d +++ b/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 diff --git a/demo/init/parallelellipt.dat.2d b/demo/init/parallelellipt.dat.2d index 589124b9..98dde059 100644 --- a/demo/init/parallelellipt.dat.2d +++ b/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 diff --git a/demo/init/parallelheat.dat.2d b/demo/init/parallelheat.dat.2d index ec05f6c1..9a8a77df 100644 --- a/demo/init/parallelheat.dat.2d +++ b/demo/init/parallelheat.dat.2d @@ -22,7 +22,6 @@ heat->parallel->global refinements: 0 heat->space->solver: cg heat->space->solver->use galerkin operator: 1 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 diff --git a/demo/init/parallelvecellipt.dat.2d b/demo/init/parallelvecellipt.dat.2d index 998094b8..c055a0a1 100644 --- a/demo/init/parallelvecellipt.dat.2d +++ b/demo/init/parallelvecellipt.dat.2d @@ -41,14 +41,13 @@ vecellipt->parallelizer->marker strategy: 5 % 5:condES, 6:problems marker vecellipt->parallelizer->marker->MSGamma: 0.5 vecellipt->parallelizer->marker->max partition DOFs: 0 -vecellipt->solver: gmres +vecellipt->solver: bicgstab vecellipt->solver->smoother: gs vecellipt->solver->smoother->omega: 1.0 vecellipt->solver->coarse level smoothing steps: 1 vecellipt->solver->pre smoothing steps: 1 vecellipt->solver->post smoothing steps: 1 vecellipt->solver->max iteration: 100 -vecellipt->solver->restart: 10 % only used for GMRES vecellipt->solver->tolerance: 1.e-8 vecellipt->solver->info: 2 vecellipt->solver->left precon: diag diff --git a/demo/init/parametric.dat.3d b/demo/init/parametric.dat.3d index 522939fd..01e46e1b 100644 --- a/demo/init/parametric.dat.3d +++ b/demo/init/parametric.dat.3d @@ -9,7 +9,6 @@ parametric->polynomial degree: 2 parametric->solver: cg parametric->solver->max iteration: 100 -parametric->solver->restart: 10 % only used for GMRES parametric->solver->tolerance: 1.e-8 parametric->solver->info: 2 parametric->solver->left precon: diag diff --git a/demo/init/periodic.dat.1d b/demo/init/periodic.dat.1d index b9f50e97..976179b9 100644 --- a/demo/init/periodic.dat.1d +++ b/demo/init/periodic.dat.1d @@ -11,9 +11,8 @@ periodic->mesh: periodicMesh periodic->dim: 1 periodic->polynomial degree: 1 -periodic->solver: cg % no, bicgstab, cg, gmres, odir, ores +periodic->solver: cg periodic->solver->max iteration: 1000 -periodic->solver->restart: 10 % only used for GMRES periodic->solver->tolerance: 1.e-8 periodic->solver->info: 2 periodic->solver->left precon: diag diff --git a/demo/init/periodic.dat.2d b/demo/init/periodic.dat.2d index 4ef7ac1b..2af88eee 100644 --- a/demo/init/periodic.dat.2d +++ b/demo/init/periodic.dat.2d @@ -11,9 +11,8 @@ periodic->mesh: periodicMesh periodic->dim: 2 periodic->polynomial degree: 1 -periodic->solver: cg % no, bicgstab, cg, gmres, odir, ores +periodic->solver: cg periodic->solver->max iteration: 1000 -periodic->solver->restart: 10 % only used for GMRES periodic->solver->tolerance: 1.e-8 periodic->solver->info: 2 periodic->solver->left precon: diag diff --git a/demo/init/periodic.dat.3d b/demo/init/periodic.dat.3d index 200ae4e2..87b20237 100644 --- a/demo/init/periodic.dat.3d +++ b/demo/init/periodic.dat.3d @@ -11,9 +11,8 @@ periodic->mesh: periodicMesh periodic->dim: 3 periodic->polynomial degree: 1 -periodic->solver: cg % no, bicgstab, cg, gmres, odir, ores +periodic->solver: cg periodic->solver->max iteration: 1000 -periodic->solver->restart: 10 % only used for GMRES periodic->solver->tolerance: 1.e-8 periodic->solver->info: 2 periodic->solver->left precon: diag diff --git a/demo/init/smi.dat.2d b/demo/init/smi.dat.2d index 21bf1a7c..7efeaa49 100644 --- a/demo/init/smi.dat.2d +++ b/demo/init/smi.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 diff --git a/demo/init/vecellipt.dat.1d b/demo/init/vecellipt.dat.1d index eeb6dd4a..6efb81d3 100644 --- a/demo/init/vecellipt.dat.1d +++ b/demo/init/vecellipt.dat.1d @@ -10,9 +10,8 @@ vecellipt->polynomial degree[1]: 2 vecellipt->components: 2 -vecellipt->solver: gmres +vecellipt->solver: bicgstab vecellipt->solver->max iteration: 1000 -vecellipt->solver->restart: 10 % only used for GMRES vecellipt->solver->tolerance: 1.e-8 vecellipt->solver->info: 2 vecellipt->solver->left precon: diag diff --git a/demo/init/vecellipt.dat.2d b/demo/init/vecellipt.dat.2d index 60972647..b11883de 100644 --- a/demo/init/vecellipt.dat.2d +++ b/demo/init/vecellipt.dat.2d @@ -11,9 +11,8 @@ vecellipt->components: 2 vecellipt->polynomial degree[0]: 1 vecellipt->polynomial degree[1]: 1 -vecellipt->solver: gmres +vecellipt->solver: bicgstab vecellipt->solver->max iteration: 1000 -vecellipt->solver->restart: 10 % only used for GMRES vecellipt->solver->tolerance: 1.e-8 vecellipt->solver->info: 2 vecellipt->solver->left precon: diag @@ -28,7 +27,7 @@ vecellipt->estimator[0]->C2: 0.0 % constant of coarsening estimate vecellipt->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecellipt->marker[0]->MSGamma: 0.5 -vecellipt->estimator[1]: no +vecellipt->estimator[1]: 0 vecellipt->marker[1]->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS diff --git a/demo/init/vecellipt.dat.3d b/demo/init/vecellipt.dat.3d index c843d7f9..afca2d9c 100644 --- a/demo/init/vecellipt.dat.3d +++ b/demo/init/vecellipt.dat.3d @@ -10,9 +10,8 @@ vecellipt->polynomial degree[1]: 1 vecellipt->components: 2 -vecellipt->solver: gmres +vecellipt->solver: bicgstab vecellipt->solver->max iteration: 1000 -vecellipt->solver->restart: 10 % only used for GMRES vecellipt->solver->tolerance: 1.e-8 vecellipt->solver->info: 2 vecellipt->solver->left precon: diag diff --git a/demo/init/vecheat.dat.1d b/demo/init/vecheat.dat.1d index 20bbc239..b7debf70 100644 --- a/demo/init/vecheat.dat.1d +++ b/demo/init/vecheat.dat.1d @@ -12,7 +12,6 @@ vecheat->space->components: 2 vecheat->space->solver: cg vecheat->space->solver->max iteration: 1000 -vecheat->space->solver->restart: 10 % only used for GMRES vecheat->space->solver->tolerance: 1.e-8 vecheat->space->solver->info: 8 vecheat->space->solver->left precon: diag diff --git a/demo/init/vecheat.dat.2d b/demo/init/vecheat.dat.2d index 1412226d..8282313f 100644 --- a/demo/init/vecheat.dat.2d +++ b/demo/init/vecheat.dat.2d @@ -12,7 +12,6 @@ vecheat->space->components: 2 vecheat->space->solver: cg vecheat->space->solver->max iteration: 1000 -vecheat->space->solver->restart: 10 % only used for GMRES vecheat->space->solver->tolerance: 1.e-8 vecheat->space->solver->info: 2 vecheat->space->solver->left precon: diag diff --git a/demo/init/vecheat.dat.3d b/demo/init/vecheat.dat.3d index 7f6d5e58..2c2b3d1a 100644 --- a/demo/init/vecheat.dat.3d +++ b/demo/init/vecheat.dat.3d @@ -12,7 +12,6 @@ vecheat->space->components: 2 vecheat->space->solver: cg vecheat->space->solver->max iteration: 1000 -vecheat->space->solver->restart: 10 % only used for GMRES vecheat->space->solver->tolerance: 1.e-8 vecheat->space->solver->info: 8 vecheat->space->solver->left precon: diag diff --git a/demo/init/vecmultigrid.dat.2d b/demo/init/vecmultigrid.dat.2d deleted file mode 100644 index c8e208d6..00000000 --- a/demo/init/vecmultigrid.dat.2d +++ /dev/null @@ -1,102 +0,0 @@ -dimension of world: 2 - -AMDiS mesh file extension: .mesh -AMDiS value file extension: .dat -TecPlot file extension: .tec -time index length: 7 -time index decimals: 3 - -vecmultigridMesh->macro file name: ./macro/macro.stand.2d -vecmultigridMesh->global refinements: 0 -vecmultigridMesh->preserve coarse dofs: 1 - -%periodicMesh->periodic file: ./init/periodic.per.2d - - -vecmultigrid->mesh: vecmultigridMesh -vecmultigrid->dim: 2 - -vecmultigrid->components: 2 - -vecmultigrid->polynomial degree[0]: 1 -vecmultigrid->polynomial degree[1]: 1 - -vecmultigrid->solver: mg -vecmultigrid->solver->use galerkin operator: 1 -vecmultigrid->solver->mg cycle index: 1 % 1: V, 2: W -vecmultigrid->solver->smoother: box -vecmultigrid->solver->pre smoothing steps: 3 -vecmultigrid->solver->post smoothing steps: 3 -vecmultigrid->solver->coarse level smoothing steps: 1 -vecmultigrid->solver->min level: 0 -vecmultigrid->solver->min level gap: 1 -%vecmultigrid->solver->max mg levels: 100 - -vecmultigrid->solver->max iteration: 1000 -vecmultigrid->solver->restart: 10 % only used for GMRES -vecmultigrid->solver->tolerance: 1.e-12 -vecmultigrid->solver->info: 2 -vecmultigrid->solver->left precon: diag -vecmultigrid->solver->right precon: no - -vecmultigrid->estimator[0]: residual -vecmultigrid->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM -vecmultigrid->estimator[0]->C0: 0.1 % constant of element residual -vecmultigrid->estimator[0]->C1: 0.1 % constant of jump residual -vecmultigrid->estimator[0]->C2: 0.0 % constant of coarsening estimate - -vecmultigrid->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS -vecmultigrid->marker[0]->MSGamma: 0.5 - -vecmultigrid->estimator[1]: residual -vecmultigrid->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM -vecmultigrid->estimator[1]->C0: 0.1 % constant of element residual -vecmultigrid->estimator[1]->C1: 0.1 % constant of jump residual -vecmultigrid->estimator[1]->C2: 0.0 % constant of coarsening estimate - -vecmultigrid->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS -vecmultigrid->marker[1]->MSGamma: 0.5 - -vecmultigrid->adapt->max iteration: 10 -vecmultigrid->adapt->info: 8 -vecmultigrid->adapt->refine bisections: 2 - - -vecmultigrid->adapt[0]->tolerance: 1e-4 -vecmultigrid->adapt[1]->tolerance: 1e-4 - - -vecmultigrid->output[0]->filename: vecmultigrid0 - -vecmultigrid->output[0]->ParaView format: 1 - -vecmultigrid->output[0]->TecPlot format: 0 -vecmultigrid->output[0]->TecPlot ext: .tec - -vecmultigrid->output[0]->AMDiS format: 0 -vecmultigrid->output[0]->AMDiS mesh ext: .mesh -vecmultigrid->output[0]->AMDiS data ext: .dat - -vecmultigrid->output[0]->append index: 0 -vecmultigrid->output[0]->index length: 6 -vecmultigrid->output[0]->index decimals: 3 - -vecmultigrid->output[1]->filename: vecmultigrid1 - -vecmultigrid->output[1]->ParaView format: 1 - -vecmultigrid->output[1]->TecPlot format: 0 -vecmultigrid->output[1]->TecPlot ext: .tec - -vecmultigrid->output[1]->AMDiS format: 0 -vecmultigrid->output[1]->AMDiS mesh ext: .mesh -vecmultigrid->output[1]->AMDiS data ext: .dat - -vecmultigrid->output[1]->append index: 0 -vecmultigrid->output[1]->index length: 6 -vecmultigrid->output[1]->index decimals: 3 - -vecmultigrid->info: 8 - -WAIT: 0 - diff --git a/demo/init/vecnonlin.dat.1d b/demo/init/vecnonlin.dat.1d index 8c94b7b5..05c7bc17 100644 --- a/demo/init/vecnonlin.dat.1d +++ b/demo/init/vecnonlin.dat.1d @@ -21,7 +21,6 @@ vecnonlin->nonlin solver->norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->solver: cg vecnonlin->solver->max iteration: 1000 -vecnonlin->solver->restart: 10 % only used for GMRES vecnonlin->solver->tolerance: 1.e-8 vecnonlin->solver->info: 1 vecnonlin->solver->left precon: diag diff --git a/demo/init/vecnonlin.dat.2d b/demo/init/vecnonlin.dat.2d index 9678185d..63ca3f1e 100644 --- a/demo/init/vecnonlin.dat.2d +++ b/demo/init/vecnonlin.dat.2d @@ -21,7 +21,6 @@ vecnonlin->nonlin solver->norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->solver: cg vecnonlin->solver->max iteration: 1000 -vecnonlin->solver->restart: 10 % only used for GMRES vecnonlin->solver->tolerance: 1.e-8 vecnonlin->solver->info: 1 vecnonlin->solver->left precon: diag diff --git a/demo/init/vecnonlin.dat.3d b/demo/init/vecnonlin.dat.3d index 7ba0ef20..bbd294ab 100644 --- a/demo/init/vecnonlin.dat.3d +++ b/demo/init/vecnonlin.dat.3d @@ -21,7 +21,6 @@ vecnonlin->nonlin solver->norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->solver: cg vecnonlin->solver->max iteration: 1000 -vecnonlin->solver->restart: 10 % only used for GMRES vecnonlin->solver->tolerance: 1.e-8 vecnonlin->solver->info: 1 vecnonlin->solver->left precon: diag -- GitLab