From 63d15da12e024322ab553d4da14d86bc8963e298 Mon Sep 17 00:00:00 2001 From: Thomas Witkowski <thomas.witkowski@gmx.de> Date: Tue, 28 Jul 2009 12:59:13 +0000 Subject: [PATCH] Updated demo init files to new AMDiS version. --- demo/init/ball.dat.2d | 1 - demo/init/ball.dat.3d | 2 +- demo/init/bunny.init | 1 - demo/init/couple.dat.2d | 3 +-- demo/init/ellipt.dat.1d | 1 - demo/init/ellipt.dat.2d | 1 - demo/init/ellipt.dat.3d | 1 - demo/init/heat.dat.1d | 1 - demo/init/heat.dat.3d | 1 - demo/init/mpcci1.dat.2d | 1 - demo/init/mpcci2.dat.2d | 1 - demo/init/mpccitest.dat.2d | 1 - demo/init/navierstokes.dat.2d | 2 -- demo/init/nonlin.dat.1d | 1 - demo/init/nonlin.dat.3d | 1 - demo/init/parallelellipt.dat.2d | 1 - demo/init/parallelheat.dat.2d | 1 - demo/init/parallelvecellipt.dat.2d | 3 --- demo/init/parametric.dat.3d | 1 - demo/init/periodic.dat.1d | 1 - demo/init/periodic.dat.2d | 1 - demo/init/periodic.dat.3d | 1 - demo/init/smi.dat.2d | 1 - demo/init/sphere.dat.3d | 2 +- demo/init/torus.dat.3d | 4 ++-- demo/init/vecellipt.dat.1d | 2 -- demo/init/vecellipt.dat.2d | 1 - demo/init/vecellipt.dat.3d | 2 -- demo/init/vecheat.dat.1d | 2 -- demo/init/vecheat.dat.2d | 2 -- demo/init/vecheat.dat.3d | 2 -- demo/init/vecnonlin.dat.1d | 2 -- demo/init/vecnonlin.dat.2d | 2 -- demo/init/vecnonlin.dat.3d | 2 -- 34 files changed, 5 insertions(+), 47 deletions(-) diff --git a/demo/init/ball.dat.2d b/demo/init/ball.dat.2d index d916ae38..51d27cb8 100644 --- a/demo/init/ball.dat.2d +++ b/demo/init/ball.dat.2d @@ -17,7 +17,6 @@ ball->solver->right precon: no ball->estimator: residual % residual, recovery ball->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ball->estimator->C1: 0.1 % constant of jump residual -ball->estimator->C2: 0.1 % constant of coarsening estimate ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ball->marker->MSGamma: 0.5 diff --git a/demo/init/ball.dat.3d b/demo/init/ball.dat.3d index b792d557..0a9dabf7 100644 --- a/demo/init/ball.dat.3d +++ b/demo/init/ball.dat.3d @@ -12,7 +12,7 @@ ball->solver->max iteration: 1000 ball->solver->tolerance: 1.e-8 ball->solver->left precon: diag -ball->estimator: no +ball->estimator: 0 ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ball->output->filename: output/ball diff --git a/demo/init/bunny.init b/demo/init/bunny.init index de130891..4acd888d 100644 --- a/demo/init/bunny.init +++ b/demo/init/bunny.init @@ -18,7 +18,6 @@ bunny->solver->right precon: no bunny->estimator: residual % residual, recovery bunny->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM bunny->estimator->C1: 0.1 % constant of jump residual -bunny->estimator->C2: 0.1 % constant of coarsening estimate bunny->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS bunny->marker->MSGamma: 0.5 diff --git a/demo/init/couple.dat.2d b/demo/init/couple.dat.2d index b8f84dc8..7e78d3a6 100644 --- a/demo/init/couple.dat.2d +++ b/demo/init/couple.dat.2d @@ -37,8 +37,7 @@ problem2->solver->max iteration: 1000 problem2->solver->tolerance: 1.e-8 problem2->solver->left precon: diag -problem2->estimator: no - +problem2->estimator: 0 problem2->marker->strategy: 0 problem2->output->filename: output/problem2 diff --git a/demo/init/ellipt.dat.1d b/demo/init/ellipt.dat.1d index 71a8646c..04812387 100644 --- a/demo/init/ellipt.dat.1d +++ b/demo/init/ellipt.dat.1d @@ -18,7 +18,6 @@ ellipt->estimator: residual ellipt->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ellipt->estimator->C0: 0.1 % constant of element residual ellipt->estimator->C1: 0.1 % constant of jump residual -ellipt->estimator->C2: 0.0 % constant of coarsening estimate ellipt->adapt->tolerance: 1e-4 ellipt->adapt->max iteration: 10 diff --git a/demo/init/ellipt.dat.2d b/demo/init/ellipt.dat.2d index 042bc41c..11b7aba4 100644 --- a/demo/init/ellipt.dat.2d +++ b/demo/init/ellipt.dat.2d @@ -18,7 +18,6 @@ ellipt->estimator: residual ellipt->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ellipt->estimator->C0: 0.1 % constant of element residual ellipt->estimator->C1: 0.1 % constant of jump residual -ellipt->estimator->C2: 0.0 % constant of coarsening estimate ellipt->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ellipt->marker->MSGamma: 0.5 diff --git a/demo/init/ellipt.dat.3d b/demo/init/ellipt.dat.3d index 1b2da4dc..396d400a 100644 --- a/demo/init/ellipt.dat.3d +++ b/demo/init/ellipt.dat.3d @@ -17,7 +17,6 @@ ellipt->solver->right precon: no ellipt->estimator: residual ellipt->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ellipt->estimator->C1: 0.01 % constant of jump residual -ellipt->estimator->C2: 0.01 % constant of coarsening estimate ellipt->marker->strategy: 3 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ellipt->marker->MSGamma: 0.5 diff --git a/demo/init/heat.dat.1d b/demo/init/heat.dat.1d index 3345984e..db1621c5 100644 --- a/demo/init/heat.dat.1d +++ b/demo/init/heat.dat.1d @@ -17,7 +17,6 @@ heat->space->solver->right precon: no heat->space->estimator: residual heat->space->estimator->C0: 1.0 heat->space->estimator->C1: 1.0 -heat->space->estimator->C2: 1.0 heat->space->estimator->C3: 1.0 heat->theta: 1.0 diff --git a/demo/init/heat.dat.3d b/demo/init/heat.dat.3d index 816b974d..efb9c3f2 100644 --- a/demo/init/heat.dat.3d +++ b/demo/init/heat.dat.3d @@ -17,7 +17,6 @@ heat->space->solver->right precon: no heat->space->estimator: residual heat->space->estimator->C0: 1.0 heat->space->estimator->C1: 1.0 -heat->space->estimator->C2: 1.0 heat->space->estimator->C3: 1.0 heat->theta: 1.0 diff --git a/demo/init/mpcci1.dat.2d b/demo/init/mpcci1.dat.2d index 2adc669f..af40b270 100644 --- a/demo/init/mpcci1.dat.2d +++ b/demo/init/mpcci1.dat.2d @@ -18,7 +18,6 @@ mpcci1->estimator: residual mpcci1->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM mpcci1->estimator->C0: 0.1 % constant of element residual mpcci1->estimator->C1: 0.1 % constant of jump residual -mpcci1->estimator->C2: 0.0 % constant of coarsening estimate mpcci1->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS mpcci1->marker->MSGamma: 0.5 diff --git a/demo/init/mpcci2.dat.2d b/demo/init/mpcci2.dat.2d index e57614fc..5035344a 100644 --- a/demo/init/mpcci2.dat.2d +++ b/demo/init/mpcci2.dat.2d @@ -18,7 +18,6 @@ mpcci2->estimator: residual mpcci2->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM mpcci2->estimator->C0: 0.1 % constant of element residual mpcci2->estimator->C1: 0.1 % constant of jump residual -mpcci2->estimator->C2: 0.0 % constant of coarsening estimate mpcci2->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS mpcci2->marker->MSGamma: 0.5 diff --git a/demo/init/mpccitest.dat.2d b/demo/init/mpccitest.dat.2d index bde117f5..0bc43f45 100644 --- a/demo/init/mpccitest.dat.2d +++ b/demo/init/mpccitest.dat.2d @@ -18,7 +18,6 @@ mpccitest->estimator: residual mpccitest->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM mpccitest->estimator->C0: 0.1 % constant of element residual mpccitest->estimator->C1: 0.1 % constant of jump residual -mpccitest->estimator->C2: 0.0 % constant of coarsening estimate mpccitest->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS mpccitest->marker->MSGamma: 0.5 diff --git a/demo/init/navierstokes.dat.2d b/demo/init/navierstokes.dat.2d index 9866d551..9c93b8df 100644 --- a/demo/init/navierstokes.dat.2d +++ b/demo/init/navierstokes.dat.2d @@ -53,13 +53,11 @@ navierstokes->space->solver->right precon: no navierstokes->space->estimator[0]: residual navierstokes->space->estimator[0]->C0: 1.0 navierstokes->space->estimator[0]->C1: 1.0 -navierstokes->space->estimator[0]->C2: 1.0 navierstokes->space->estimator[0]->C3: 1.0 navierstokes->space->estimator[1]: residual navierstokes->space->estimator[1]->C0: 1.0 navierstokes->space->estimator[1]->C1: 1.0 -navierstokes->space->estimator[1]->C2: 1.0 navierstokes->space->estimator[1]->C3: 1.0 navierstokes->space->marker[0]->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS diff --git a/demo/init/nonlin.dat.1d b/demo/init/nonlin.dat.1d index 425eaed2..e68d33f7 100644 --- a/demo/init/nonlin.dat.1d +++ b/demo/init/nonlin.dat.1d @@ -21,7 +21,6 @@ nonlin->estimator: residual nonlin->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM nonlin->estimator->C0: 0.1 % constant of element residual nonlin->estimator->C1: 0.1 % constant of jump residual -nonlin->estimator->C2: 0.0 % constant of coarsening estimate nonlin->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS nonlin->marker->MSGamma: 0.9 diff --git a/demo/init/nonlin.dat.3d b/demo/init/nonlin.dat.3d index d0c26829..2127f3c7 100644 --- a/demo/init/nonlin.dat.3d +++ b/demo/init/nonlin.dat.3d @@ -27,7 +27,6 @@ nonlin->estimator: residual nonlin->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM nonlin->estimator->C0: 0.1 % constant of element residual nonlin->estimator->C1: 0.1 % constant of jump residual -nonlin->estimator->C2: 0.0 % constant of coarsening estimate nonlin->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS nonlin->marker->MSGamma: 0.9 diff --git a/demo/init/parallelellipt.dat.2d b/demo/init/parallelellipt.dat.2d index 98dde059..917f4a49 100644 --- a/demo/init/parallelellipt.dat.2d +++ b/demo/init/parallelellipt.dat.2d @@ -24,7 +24,6 @@ ellipt->estimator: residual ellipt->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ellipt->estimator->C0: 0.1 % constant of element residual ellipt->estimator->C1: 0.0 % constant of jump residual -ellipt->estimator->C2: 0.0 % constant of coarsening estimate ellipt->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ellipt->marker->MSGamma: 0.5 diff --git a/demo/init/parallelheat.dat.2d b/demo/init/parallelheat.dat.2d index 9a8a77df..e3b3e13e 100644 --- a/demo/init/parallelheat.dat.2d +++ b/demo/init/parallelheat.dat.2d @@ -30,7 +30,6 @@ heat->space->solver->right precon: no heat->space->estimator: residual heat->space->estimator->C0: 1.0 heat->space->estimator->C1: 0.0 -heat->space->estimator->C2: 0.0 heat->space->estimator->C3: 0.0 heat->adapt->timestep: 0.1 diff --git a/demo/init/parallelvecellipt.dat.2d b/demo/init/parallelvecellipt.dat.2d index c055a0a1..0e408ed4 100644 --- a/demo/init/parallelvecellipt.dat.2d +++ b/demo/init/parallelvecellipt.dat.2d @@ -36,7 +36,6 @@ vecellipt->parallelizer->estimator: cond % cond, prob, ... vecellipt->parallelizer->estimator->error norm: 1 vecellipt->parallelizer->estimator->C0: 0.1 vecellipt->parallelizer->estimator->C1: 0.0 -vecellipt->parallelizer->estimator->C2: 0.0 vecellipt->parallelizer->marker strategy: 5 % 5:condES, 6:problems marker vecellipt->parallelizer->marker->MSGamma: 0.5 vecellipt->parallelizer->marker->max partition DOFs: 0 @@ -57,7 +56,6 @@ vecellipt->estimator[0]: residual vecellipt->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[0]->C0: 0.1 % constant of element residual vecellipt->estimator[0]->C1: 0.1 % constant of jump residual -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 @@ -66,7 +64,6 @@ vecellipt->estimator[1]: residual vecellipt->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[1]->C0: 0.1 % constant of element residual vecellipt->estimator[1]->C1: 0.1 % constant of jump residual -vecellipt->estimator[1]->C2: 0.0 % constant of coarsening estimate vecellipt->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecellipt->marker[1]->MSGamma: 0.5 diff --git a/demo/init/parametric.dat.3d b/demo/init/parametric.dat.3d index 01e46e1b..d1b87fb2 100644 --- a/demo/init/parametric.dat.3d +++ b/demo/init/parametric.dat.3d @@ -17,7 +17,6 @@ parametric->solver->right precon: no parametric->estimator: residual % residual, recovery parametric->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM parametric->estimator->C1: 0.1 % constant of jump residual -parametric->estimator->C2: 0.1 % constant of coarsening estimate parametric->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS parametric->marker->MSGamma: 0.5 diff --git a/demo/init/periodic.dat.1d b/demo/init/periodic.dat.1d index 976179b9..b829698c 100644 --- a/demo/init/periodic.dat.1d +++ b/demo/init/periodic.dat.1d @@ -22,7 +22,6 @@ periodic->estimator: residual periodic->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM periodic->estimator->C0: 0.1 % constant of element residual periodic->estimator->C1: 0.0 % constant of jump residual -periodic->estimator->C2: 0.0 % constant of coarsening estimate periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS periodic->marker->MSGamma: 0.5 diff --git a/demo/init/periodic.dat.2d b/demo/init/periodic.dat.2d index 2af88eee..2fee81c5 100644 --- a/demo/init/periodic.dat.2d +++ b/demo/init/periodic.dat.2d @@ -22,7 +22,6 @@ periodic->estimator: residual periodic->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM periodic->estimator->C0: 0.1 % constant of element residual periodic->estimator->C1: 0.0 % constant of jump residual -periodic->estimator->C2: 0.0 % constant of coarsening estimate periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS periodic->marker->MSGamma: 0.5 diff --git a/demo/init/periodic.dat.3d b/demo/init/periodic.dat.3d index 87b20237..25f40f44 100644 --- a/demo/init/periodic.dat.3d +++ b/demo/init/periodic.dat.3d @@ -22,7 +22,6 @@ periodic->estimator: residual periodic->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM periodic->estimator->C0: 0.1 % constant of element residual periodic->estimator->C1: 0.0 % constant of jump residual -periodic->estimator->C2: 0.0 % constant of coarsening estimate periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS periodic->marker->MSGamma: 0.5 diff --git a/demo/init/smi.dat.2d b/demo/init/smi.dat.2d index 7efeaa49..d838bdc7 100644 --- a/demo/init/smi.dat.2d +++ b/demo/init/smi.dat.2d @@ -18,7 +18,6 @@ ellipt->estimator: residual ellipt->estimator->error norm: 1 % 1: H1_NORM, 2: L2_NORM ellipt->estimator->C0: 0.1 % constant of element residual ellipt->estimator->C1: 0.1 % constant of jump residual -ellipt->estimator->C2: 0.0 % constant of coarsening estimate ellipt->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ellipt->marker->MSGamma: 0.5 diff --git a/demo/init/sphere.dat.3d b/demo/init/sphere.dat.3d index ae9b7779..de70ca0d 100644 --- a/demo/init/sphere.dat.3d +++ b/demo/init/sphere.dat.3d @@ -12,7 +12,7 @@ sphere->solver->max iteration: 100 sphere->solver->tolerance: 1.e-8 sphere->solver->left precon: diag -sphere->estimator: no +sphere->estimator: 0 sphere->marker->strategy: 0 sphere->output->filename: output/sphere diff --git a/demo/init/torus.dat.3d b/demo/init/torus.dat.3d index c7b55443..0f774581 100644 --- a/demo/init/torus.dat.3d +++ b/demo/init/torus.dat.3d @@ -11,8 +11,8 @@ torus->solver: cg torus->solver->max iteration: 1000 torus->solver->tolerance: 1.e-8 torus->solver->left precon: diag -torus->estimator: no -torus->marker->strategy: no +torus->estimator: 0 +torus->marker->strategy: 0 torus->output->filename: output/torus torus->output->ParaView format: 1 diff --git a/demo/init/vecellipt.dat.1d b/demo/init/vecellipt.dat.1d index 6efb81d3..1dade792 100644 --- a/demo/init/vecellipt.dat.1d +++ b/demo/init/vecellipt.dat.1d @@ -21,7 +21,6 @@ vecellipt->estimator[0]: residual vecellipt->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[0]->C0: 0.1 % constant of element residual vecellipt->estimator[0]->C1: 0.1 % constant of jump residual -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 @@ -30,7 +29,6 @@ vecellipt->estimator[1]: residual vecellipt->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[1]->C0: 0.1 % constant of element residual vecellipt->estimator[1]->C1: 0.1 % constant of jump residual -vecellipt->estimator[1]->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[1]->MSGamma: 0.5 diff --git a/demo/init/vecellipt.dat.2d b/demo/init/vecellipt.dat.2d index b11883de..1930ed51 100644 --- a/demo/init/vecellipt.dat.2d +++ b/demo/init/vecellipt.dat.2d @@ -22,7 +22,6 @@ vecellipt->estimator[0]: residual vecellipt->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[0]->C0: 0.1 % constant of element residual vecellipt->estimator[0]->C1: 0.1 % constant of jump residual -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 diff --git a/demo/init/vecellipt.dat.3d b/demo/init/vecellipt.dat.3d index afca2d9c..e7efeb64 100644 --- a/demo/init/vecellipt.dat.3d +++ b/demo/init/vecellipt.dat.3d @@ -21,7 +21,6 @@ vecellipt->estimator[0]: residual vecellipt->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[0]->C0: 0.1 % constant of element residual vecellipt->estimator[0]->C1: 0.1 % constant of jump residual -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 @@ -30,7 +29,6 @@ vecellipt->estimator[1]: residual vecellipt->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecellipt->estimator[1]->C0: 0.1 % constant of element residual vecellipt->estimator[1]->C1: 0.1 % constant of jump residual -vecellipt->estimator[1]->C2: 0.0 % constant of coarsening estimate vecellipt->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecellipt->marker[1]->MSGamma: 0.5 diff --git a/demo/init/vecheat.dat.1d b/demo/init/vecheat.dat.1d index b7debf70..d458f91b 100644 --- a/demo/init/vecheat.dat.1d +++ b/demo/init/vecheat.dat.1d @@ -20,13 +20,11 @@ vecheat->space->solver->right precon: no vecheat->space->estimator[0]: residual vecheat->space->estimator[0]->C0: 1.0 vecheat->space->estimator[0]->C1: 1.0 -vecheat->space->estimator[0]->C2: 1.0 vecheat->space->estimator[0]->C3: 1.0 vecheat->space->estimator[1]: residual vecheat->space->estimator[1]->C0: 1.0 vecheat->space->estimator[1]->C1: 1.0 -vecheat->space->estimator[1]->C2: 1.0 vecheat->space->estimator[1]->C3: 1.0 vecheat->theta: 1.0 diff --git a/demo/init/vecheat.dat.2d b/demo/init/vecheat.dat.2d index 8282313f..fdddf318 100644 --- a/demo/init/vecheat.dat.2d +++ b/demo/init/vecheat.dat.2d @@ -20,13 +20,11 @@ vecheat->space->solver->right precon: no vecheat->space->estimator[0]: residual vecheat->space->estimator[0]->C0: 1.0 vecheat->space->estimator[0]->C1: 1.0 -vecheat->space->estimator[0]->C2: 1.0 vecheat->space->estimator[0]->C3: 1.0 vecheat->space->estimator[1]: residual vecheat->space->estimator[1]->C0: 1.0 vecheat->space->estimator[1]->C1: 1.0 -vecheat->space->estimator[1]->C2: 1.0 vecheat->space->estimator[1]->C3: 1.0 vecheat->theta: 1.0 diff --git a/demo/init/vecheat.dat.3d b/demo/init/vecheat.dat.3d index 2c2b3d1a..d8e908ea 100644 --- a/demo/init/vecheat.dat.3d +++ b/demo/init/vecheat.dat.3d @@ -20,13 +20,11 @@ vecheat->space->solver->right precon: no vecheat->space->estimator[0]: residual vecheat->space->estimator[0]->C0: 1.0 vecheat->space->estimator[0]->C1: 1.0 -vecheat->space->estimator[0]->C2: 1.0 vecheat->space->estimator[0]->C3: 1.0 vecheat->space->estimator[1]: residual vecheat->space->estimator[1]->C0: 1.0 vecheat->space->estimator[1]->C1: 1.0 -vecheat->space->estimator[1]->C2: 1.0 vecheat->space->estimator[1]->C3: 1.0 vecheat->theta: 1.0 diff --git a/demo/init/vecnonlin.dat.1d b/demo/init/vecnonlin.dat.1d index 05c7bc17..034ef22e 100644 --- a/demo/init/vecnonlin.dat.1d +++ b/demo/init/vecnonlin.dat.1d @@ -30,13 +30,11 @@ vecnonlin->estimator[0]: residual vecnonlin->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[0]->C0: 0.1 % constant of element residual vecnonlin->estimator[0]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[0]->C2: 0.0 % constant of coarsening estimate vecnonlin->estimator[1]: residual vecnonlin->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[1]->C0: 0.1 % constant of element residual vecnonlin->estimator[1]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[1]->C2: 0.0 % constant of coarsening estimate vecnonlin->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecnonlin->marker[0]->MSGamma: 0.9 diff --git a/demo/init/vecnonlin.dat.2d b/demo/init/vecnonlin.dat.2d index 63ca3f1e..6813d98b 100644 --- a/demo/init/vecnonlin.dat.2d +++ b/demo/init/vecnonlin.dat.2d @@ -30,13 +30,11 @@ vecnonlin->estimator[0]: residual vecnonlin->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[0]->C0: 0.1 % constant of element residual vecnonlin->estimator[0]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[0]->C2: 0.0 % constant of coarsening estimate vecnonlin->estimator[1]: residual vecnonlin->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[1]->C0: 0.1 % constant of element residual vecnonlin->estimator[1]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[1]->C2: 0.0 % constant of coarsening estimate vecnonlin->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecnonlin->marker[0]->MSGamma: 0.9 diff --git a/demo/init/vecnonlin.dat.3d b/demo/init/vecnonlin.dat.3d index bbd294ab..fd602eab 100644 --- a/demo/init/vecnonlin.dat.3d +++ b/demo/init/vecnonlin.dat.3d @@ -30,13 +30,11 @@ vecnonlin->estimator[0]: residual vecnonlin->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[0]->C0: 0.1 % constant of element residual vecnonlin->estimator[0]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[0]->C2: 0.0 % constant of coarsening estimate vecnonlin->estimator[1]: residual vecnonlin->estimator[1]->error norm: 1 % 1: H1_NORM, 2: L2_NORM vecnonlin->estimator[1]->C0: 0.1 % constant of element residual vecnonlin->estimator[1]->C1: 0.1 % constant of jump residual -vecnonlin->estimator[1]->C2: 0.0 % constant of coarsening estimate vecnonlin->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecnonlin->marker[0]->MSGamma: 0.9 -- GitLab