diff --git a/demo/init/ball.dat.2d b/demo/init/ball.dat.2d index d916ae381f672a3f93a04d86601a51aee18b190f..51d27cb8fc34a0657a2a530c8170306237d8a445 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 b792d55747b16cfacf907eb0db2b619dd316f59a..0a9dabf7500918e735e40cf356d93f5d6b3ef8c8 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 de130891fcb6ac357681b8b64976a4f068296a00..4acd888d738b179f0e39a67f4cc9ff620ac032d9 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 b8f84dc862ebcfe6ce616fa7336a595d8d4113c4..7e78d3a6d2763dcc1b7dd1a570c13779e4a5fc89 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 71a8646cbd704459c6b6b8181c9807ee7839d7c3..04812387b032ac72ccf71b60b8763f973e4b464c 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 042bc41ce2c328119ff81c4a54d263fa03c9c153..11b7aba4e8f061bd9128fda5f661c49415714306 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 1b2da4dc0f241e8d63b579ed86e1814483238277..396d400ad228d46e4fee6d71ef961576423e3e64 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 3345984e9c379e873b66db480a605552e8acdee5..db1621c5daf13bce7bba9b2de9cca873f6a9d571 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 816b974dc348b71d7298f70abe87051fcb3cd142..efb9c3f2765c31d565edb95a5a9191a905c1c649 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 2adc669f1da452c852e8b78cd79b62a1cd0ceef4..af40b270b59250d2ca798122976fa1c4cf22ee00 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 e57614fcdb0ec19702e60ae16781ef81dfe49276..5035344a79b62f6b3bf0b81df953910f1861e5c0 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 bde117f58552ed25d956615433cf508f027cab74..0bc43f45173d75d9961c06e3f35663a72e07fa79 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 9866d55116a4b27127508f9bd07b1abf5ead7b8c..9c93b8dff3403a2b123ed608b80925e52049d16a 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 425eaed203ac2375853c82118ff087a1277bf59e..e68d33f79f954f6491169357d56d72f43713d0ac 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 d0c268290cc6c69bc46407888f8c783588ff8018..2127f3c77fd655806c0fa1b2097f20f9466ac118 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 98dde05920a88034b545e633afc1eb4854fa7d6f..917f4a49d9880283b7524a6375b93064d75ce38c 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 9a8a77dfe4e3fe1bca30785be7cccd03aedec2fd..e3b3e13ef95e55a77c2dfa14a6c96467dc115127 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 c055a0a14bae3c10aad811b9e385282cf1cb6ade..0e408ed41fba87e1276ab2fb89d3d18063b0d8cc 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 01e46e1bea696c88b7e39150d3222e3ee5e3e4db..d1b87fb2721c06e7af0b12ba7947fbf7cf129530 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 976179b9db4e9730c01b3ceb23b77cfa1d5ca545..b829698cb69f01a6f07998a76aeded8b869c5a87 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 2af88eee67c193ea4a48f120e13f1bc1fa2fe19d..2fee81c59fc79c6b556b5e647a7f1acb494bc2f9 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 87b20237f9324925e7544942e51e4df17c7b1758..25f40f44e0040cc51634662e448456e5d3ed7fb2 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 7efeaa49086908771641b98c26d58f1c3482d27d..d838bdc7f70f35e653af6e8db6a50ebdcd52b1af 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 ae9b77799ab47770a86b56b5e0ddaa731d65abc2..de70ca0d67368a2f2a120a0b28bc6b02a102a673 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 c7b5544344071fa6e321cc677663494c6a993282..0f774581eea620f1f04a915d47926e8e44461bea 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 6efb81d3e392e65ab14cf6eef531ac8cecc05763..1dade792ae2966c70908d56bf7bd4d96c8d146af 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 b11883de0fb0f553d9a355ded584c8b7bd8dfc62..1930ed5100ef6aaa3a6f40cc010e56720be9c138 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 afca2d9c4f0a7a910a99a13d6dea2a2caf38aad9..e7efeb64aa544d3c7cd55cdee90e278b8bd9c31e 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 b7debf7010b50a4b1364509e51ac32daa21a100e..d458f91bbfc22242b78ca4f805b707905e02cfae 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 8282313f1ef89f0819b20a24550cc76fb968d33e..fdddf318e3d54166fe9270d2d52c9272b2bb913e 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 2c2b3d1a0b7df8d73c8139a0fac0fe97814256bb..d8e908eaa95c293781c9c50438f08f3348a73d2f 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 05c7bc17e92f318fec8f9bd7c8691e319a0c8273..034ef22e765e4d8d21241fa4b2ac78f5b473a8dd 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 63ca3f1ed0fea8e89c2c7b9e72fab261d1f086ae..6813d98b131b2167b81f35ed8b603957a0d3a759 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 bbd294ab257de70b621ccfad0f0ace76e3922fc2..fd602eabfbe3cdcca2bffd0545f7b6e06d51afe7 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