Commit 604b151e authored by Praetorius, Simon's avatar Praetorius, Simon

some demos modified/corrected and demo-test environment added

parent beab19ee
......@@ -5,6 +5,7 @@ ballMesh->global refinements: 3
ball->mesh: ballMesh
ball->dim: 2
ball->components: 1
ball->polynomial degree[0]: 1
ball->space->components: 1
......@@ -28,11 +29,13 @@ ball->adapt[0]->info: 8
ball->adapt->max iteration: 4
ball->output->filename: ball
ball->output->filename: output/ball.2d
ball->output->ParaView format: 1
ball->output->append index: 0
ball->output->index length: 6
ball->output->index decimals: 3
ball->output->ARH format: 1
ball->output->AMDiS format: 1
WAIT: 1
......@@ -5,6 +5,7 @@ ballMesh->global refinements: 15
ball->mesh: ballMesh
ball->dim: 3
ball->components: 1
ball->polynomial degree[0]: 1
ball->space->components: 1
......@@ -17,7 +18,9 @@ ball->solver->left precon: diag
ball->estimator[0]: 0
ball->marker[0]->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ball->output->filename: output/ball
ball->output->filename: output/ball.3d
ball->output->ParaView format: 1
ball->output->ARH format: 1
ball->output->AMDiS format: 1
......@@ -28,11 +28,12 @@ bunny->adapt->refine bisections: 1
bunny->adapt->max iteration: 0
bunny->adapt->info: 8
bunny->output->filename: bunny_fixed
bunny->output->filename: output/bunny
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
WAIT: 1
......@@ -16,7 +16,7 @@ ellipt->solver->left precon: diag
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
......@@ -28,5 +28,6 @@ ellipt->adapt[0]->refine bisections: 2
ellipt->adapt->max iteration: 10
ellipt->output->filename: output/ellipt
ellipt->output->filename: output/ellipt.1d
ellipt->output->ParaView format: 1
ellipt->output->AMDiS format: 1
dimension of world: 2
elliptMesh->macro file name: ./macro/macro.square.2d
elliptMesh->macro file name: ./macro/macro.stand.2d
elliptMesh->global refinements: 0
ellipt->mesh: elliptMesh
......@@ -8,27 +8,28 @@ ellipt->dim: 2
ellipt->polynomial degree[0]: 1
ellipt->components: 1
ellipt->solver: cg
ellipt->solver->symmetric strategy: 1
ellipt->solver->store symbolic: 0
ellipt->solver: cg
ellipt->solver->ell: 1
ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2
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: 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->estimator[0]: residual
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: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
%ellipt->marker[0]->MSGamma: 0.5
ellipt->marker[0]->strategy: 0 % 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[0]->refine bisections: 2
ellipt->adapt->max iteration: 0
ellipt->output->filename: output/ellipt
ellipt->output->filename: output/ellipt.2d
ellipt->output->ParaView format: 1
ellipt->output->ARH format: 1
ellipt->output->AMDiS format: 1
......@@ -16,7 +16,7 @@ ellipt->solver->left precon: diag
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]->C1: 0.01 % constant of jump residual
ellipt->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
......@@ -27,5 +27,7 @@ ellipt->adapt[0]->refine bisections: 2
ellipt->adapt->max iteration: 10
ellipt->output->filename: output/ellipt
ellipt->output->filename: output/ellipt.3d
ellipt->output->ParaView format: 1
ellipt->output->ARH format: 1
ellipt->output->AMDiS format: 1
......@@ -41,13 +41,14 @@ heat->space->marker[0]->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker[0]->ESTheta: 0.9
heat->space->marker[0]->ESThetaC: 0.05
heat->space->output->filename: output/heat
heat->space->output->filename: output/heat.1d
heat->space->output->ParaView format: 1
heat->space->output->ParaView animation: 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->AMDiS format: 1
WAIT: 0
......
......@@ -41,12 +41,14 @@ 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
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: 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
WAIT: 0
......@@ -3,6 +3,7 @@ dimension of world: 3
heatMesh->macro file name: ./macro/macro.stand.3d
heatMesh->global refinements: 3
heat->space->components: 1
heat->space->polynomial degree[0]: 1
heat->space->dim: 3
heat->space->mesh: heatMesh
......@@ -39,13 +40,15 @@ heat->space->marker[0]->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker[0]->ESTheta: 0.9
heat->space->marker[0]->ESThetaC: 0.05
heat->space->output->filename: output/heat
heat->space->output->filename: output/heat.3d
heat->space->output->ParaView format: 1
heat->space->output->ParaView animation: 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
WAIT: 0
......
......@@ -26,5 +26,7 @@ neumann->adapt[0]->refine bisections: 2
neumann->adapt->max iteration: 100
neumann->output->filename: output/neumann
neumann->output->filename: output/neumann.2d
neumann->output->ParaView format: 1
neumann->output->ARH format: 1
neumann->output->AMDiS format: 1
......@@ -28,11 +28,13 @@ parametric->adapt[0]->info: 8
parametric->adapt->max iteration: 8
parametric->output->filename: parametric
parametric->output->filename: output/parametric.3d
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
WAIT: 1
......@@ -30,9 +30,12 @@ periodic->adapt[0]->coarsen allowed: 0
periodic->adapt->max iteration: 100
periodic->output->filename: output/periodic
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
WAIT: 0
......@@ -21,19 +21,21 @@ periodic->estimator[0]->error norm: 1 % 1: H1_NORM, 2: L2_NORM
periodic->estimator[0]->C0: 0.1 % constant of element residual
periodic->estimator[0]->C1: 0.0 % constant of jump residual
periodic->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
periodic->marker[0]->MSGamma: 0.5
periodic->marker[0]->strategy: 4 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
periodic->adapt[0]->tolerance: 1e-6
periodic->adapt[0]->refine bisections: 3
periodic->adapt[0]->coarsen allowed: 0
periodic->adapt[0]->tolerance: 1e-2
periodic->adapt[0]->refine bisections: 2
periodic->adapt[0]->coarsen allowed: 1
periodic->adapt->max iteration: 100
periodic->adapt->max iteration: 15
periodic->output->filename: periodic
periodic->output->filename: output/periodic.3d
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
WAIT: 1
......@@ -16,7 +16,9 @@ sphere->solver->left precon: diag
sphere->estimator[0]: 0
sphere->marker[0]->strategy: 0
sphere->output->filename: output/sphere
sphere->output->filename: output/sphere.3d
sphere->output->ParaView format: 1
sphere->output->AMDiS format: 1
sphere->output->ARH format: 1
......@@ -16,6 +16,8 @@ torus->solver->left precon: diag
torus->estimator[0]: 0
torus->marker[0]->strategy: 0
torus->output->filename: output/torus
torus->output->filename: output/torus.3d
torus->output->ParaView format: 1
torus->output->AMDiS format: 1
torus->output->ARH format: 1
......@@ -9,7 +9,7 @@ vecellipt->components: 2
vecellipt->polynomial degree[0]: 1
vecellipt->polynomial degree[1]: 1
vecellipt->solver: ufmpack
vecellipt->solver: umfpack
vecellipt->solver->max iteration: 1000
vecellipt->solver->tolerance: 1.e-8
vecellipt->solver->info: 2
......@@ -38,5 +38,11 @@ vecellipt->adapt[1]->tolerance: 1e-4
vecellipt->adapt->max iteration: 10
vecellipt->adapt->refine bisections: 2
vecellipt->output->filename: output/vecellipt
vecellipt->output->ParaView format: 1
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[1]->filename: output/vecellipt1.1d
vecellipt->output[1]->ParaView format: 1
vecellipt->output[1]->AMDiS format: 1
......@@ -33,6 +33,12 @@ vecellipt->adapt[1]->tolerance: 1e-3
vecellipt->adapt->max iteration: 10
vecellipt->adapt->refine bisections: 2
vecellipt->output->filename: output/vecellipt
vecellipt->output->ParaView format: 1
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
......@@ -38,5 +38,12 @@ vecellipt->adapt[1]->tolerance: 1e-4
vecellipt->adapt->max iteration: 10
vecellipt->adapt->refine bisections: 2
vecellipt->output->filename: output/vecellipt
vecellipt->output->ParaView format: 1
vecellipt->output[0]->filename: output/vecellipt0.3d
vecellipt->output[0]->ParaView format: 1
vecellipt->output[0]->ARH format: 1
vecellipt->output[0]->AMDiS format: 1
vecellipt->output[1]->filename: output/vecellipt1.3d
vecellipt->output[1]->ParaView format: 1
vecellipt->output[1]->ARH format: 1
vecellipt->output[1]->AMDiS format: 1
\ No newline at end of file
......@@ -58,19 +58,22 @@ vecheat->space->marker[1]->ESTheta: 0.9
vecheat->space->marker[1]->ESThetaC: 0.05
vecheat->space->marker[1]->info: 8
vecheat->space->output[0]->filename: vecheat0_
vecheat->space->output[0]->filename: output/vecheat0.1d
vecheat->space->output[0]->ParaView format: 1
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[1]->filename: vecheat1_
vecheat->space->output[1]->filename: output/vecheat1.1d
vecheat->space->output[1]->ParaView format: 1
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
WAIT: 0
......
......@@ -61,19 +61,23 @@ vecheat->space->marker[1]->ESTheta: 0.9
vecheat->space->marker[1]->ESThetaC: 0.05
vecheat->space->marker[1]->info: 8
vecheat->space->output[0]->filename: vecheat0_
vecheat->space->output[0]->filename: output/vecheat0.2d
vecheat->space->output[0]->ParaView format: 1
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[1]->filename: vecheat1_
vecheat->space->output[1]->filename: output/vecheat1.2d
vecheat->space->output[1]->ParaView format: 1
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
WAIT: 0
......
......@@ -32,8 +32,8 @@ vecheat->theta: 1.0
vecheat->adapt->refine bisections: 2
vecheat->adapt->coarsen bisections: 2
vecheat->adapt[0]->tolerance: 0.001
vecheat->adapt[0]->tolerance: 0.001
vecheat->adapt[0]->tolerance: 0.01
vecheat->adapt[1]->tolerance: 0.01
vecheat->adapt[0]->time tolerance: 0.1
vecheat->adapt[1]->time tolerance: 0.1
......@@ -61,19 +61,23 @@ vecheat->space->marker[1]->ESTheta: 0.9
vecheat->space->marker[1]->ESThetaC: 0.05
vecheat->space->marker[1]->info: 8
vecheat->space->output[0]->filename: vecheat0_
vecheat->space->output[0]->filename: output/vecheat0.3d
vecheat->space->output[0]->ParaView format: 1
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[1]->filename: vecheat1_
vecheat->space->output[1]->filename: output/vecheat1.3d
vecheat->space->output[1]->ParaView format: 1
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
WAIT: 0
......
......@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
ball.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("ball->adapt");
AdaptInfo *adaptInfo = new AdaptInfo("ball->adapt", ball.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("ball->adapt", &ball, adaptInfo);
......
......@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
bunny.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo adaptInfo("bunny->adapt");
AdaptInfo adaptInfo("bunny->adapt", bunny.getNumComponents());
// === create adapt ===
AdaptStationary adapt("bunny->adapt", bunny, adaptInfo);
......
......@@ -48,8 +48,8 @@ int main(int argc, char* argv[])
TEST_EXIT(argc >= 2)("usage: ellipt initfile\n");
// ===== init parameters =====
Parameters::init(argv[1]);
// ===== init parameters =====
Parameters::init(true, argv[1]);
// ===== create and init the scalar problem =====
......@@ -58,7 +58,7 @@ int main(int argc, char* argv[])
// === create adapt info ===
AdaptInfo adaptInfo("ellipt->adapt");
AdaptInfo adaptInfo("ellipt->adapt", ellipt.getNumComponents());
// === create adapt ===
......@@ -85,7 +85,6 @@ int main(int argc, char* argv[])
// ===== start adaption loop =====
adapt.adapt();
ellipt.writeFiles(adaptInfo, true);
}
......
......@@ -161,7 +161,7 @@ int main(int argc, char** argv)
heat.initialize(INIT_ALL);
// create adapt info
AdaptInfo adaptInfo("heat->adapt");
AdaptInfo adaptInfo("heat->adapt", heatSpace.getNumComponents());
// create initial adapt info
AdaptInfo adaptInfoInitial("heat->initial->adapt");
......
......@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
neumann.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("neumann->adapt", 1);
AdaptInfo *adaptInfo = new AdaptInfo("neumann->adapt", neumann.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("neumann->adapt",
......
......@@ -133,7 +133,7 @@ int main(int argc, char* argv[])
parametric.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("parametric->adapt", 1);
AdaptInfo *adaptInfo = new AdaptInfo("parametric->adapt", parametric.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("parametric->adapt",
......
......@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
periodic.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("periodic->adapt", 1);
AdaptInfo *adaptInfo = new AdaptInfo("periodic->adapt", periodic.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("periodic->adapt",
......
......@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
sphere.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("sphere->adapt");
AdaptInfo *adaptInfo = new AdaptInfo("sphere->adapt", sphere.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("sphere->adapt",
......
......@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
torus.initialize(INIT_ALL);
// === create adapt info ===
AdaptInfo *adaptInfo = new AdaptInfo("torus->adapt");
AdaptInfo *adaptInfo = new AdaptInfo("torus->adapt", torus.getNumComponents());
// === create adapt ===
AdaptStationary *adapt = new AdaptStationary("torus->adapt",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment