Commit 35db05cd authored by Naumann, Andreas's avatar Naumann, Andreas
Browse files

added the current demo results for testing

parent 7d472011
...@@ -97,16 +97,7 @@ int Balldemo::solve(SolutionInformation& solinfo) { ...@@ -97,16 +97,7 @@ int Balldemo::solve(SolutionInformation& solinfo) {
int retCode = adapt->adapt(); int retCode = adapt->adapt();
solinfo.dofVec = ball.getSolution(); solinfo.dofVec = ball.getSolution();
//ball.writeFiles(adaptInfo,true);
return retCode; return retCode;
} }
/*
void createProjectList(ProjectList& list) {
list.clear();
Project* demo = new Balldemo();
ProjectInfo ballInfo(demo, "init/ball.dat.2d", "../testdata/balldata_2d");
list.push_back(ballInfo);
ballInfo = ProjectInfo(demo, "init/ball.dat.3d", "../testdata/balldata_3d");
list.push_back(ballInfo);
}
*/
dimension of world: 2 dimension of world: 2
ballMesh->macro file name: ./macro/macro.ball.2d ballMesh->macro file name: ./macro/macro.ball.2d
ballMesh->global refinements: 3 ballMesh->global refinements: 13
ball->mesh: ballMesh ball->mesh: ballMesh
ball->dim: 2 ball->dim: 2
...@@ -25,7 +25,7 @@ ball->adapt->tolerance: 1e-8 ...@@ -25,7 +25,7 @@ ball->adapt->tolerance: 1e-8
ball->adapt->max iteration: 4 ball->adapt->max iteration: 4
ball->adapt->info: 8 ball->adapt->info: 8
ball->output->filename: ball ball->output->filename: ball2d
ball->output->ParaView format: 1 ball->output->ParaView format: 1
......
dimension of world: 3 dimension of world: 3
ballMesh->macro file name: ./macro/macro.ball.3d ballMesh->macro file name: ./macro/macro.ball.3d
ballMesh->global refinements: 15 ballMesh->global refinements: 13
ball->mesh: ballMesh ball->mesh: ballMesh
ball->dim: 3 ball->dim: 3
...@@ -15,7 +15,7 @@ ball->solver->left precon: diag ...@@ -15,7 +15,7 @@ ball->solver->left precon: diag
ball->estimator: 0 ball->estimator: 0
ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ball->output->filename: output/ball ball->output->filename: ball3d
ball->output->ParaView format: 1 ball->output->ParaView format: 1
......
...@@ -7,11 +7,11 @@ ellipt->mesh: elliptMesh ...@@ -7,11 +7,11 @@ ellipt->mesh: elliptMesh
ellipt->dim: 3 ellipt->dim: 3
ellipt->polynomial degree: 2 ellipt->polynomial degree: 2
ellipt->solver: bicgstab ellipt->solver: cg
ellipt->solver->max iteration: 1000 ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8 ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2 ellipt->solver->info: 2
ellipt->solver->left precon: ilu ellipt->solver->left precon: diag
ellipt->solver->right precon: no ellipt->solver->right precon: no
ellipt->estimator: residual ellipt->estimator: residual
...@@ -22,7 +22,7 @@ ellipt->marker->strategy: 3 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ...@@ -22,7 +22,7 @@ ellipt->marker->strategy: 3 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ellipt->marker->MSGamma: 0.5 ellipt->marker->MSGamma: 0.5
ellipt->adapt->tolerance: 1e-4 ellipt->adapt->tolerance: 1e-4
ellipt->adapt->max iteration: 5 ellipt->adapt->max iteration: 4
ellipt->adapt->info: 8 ellipt->adapt->info: 8
ellipt->adapt->refine bisections: 3 ellipt->adapt->refine bisections: 3
......
...@@ -54,7 +54,7 @@ heat->space->marker->info: 8 ...@@ -54,7 +54,7 @@ heat->space->marker->info: 8
heat->space->output->filename: heat heat->space->output->filename: heat
heat->space->output->ParaView format: 1 heat->space->output->ParaView format: 0
heat->space->output->TecPlot format: 0 heat->space->output->TecPlot format: 0
heat->space->output->TecPlot ext: .tec heat->space->output->TecPlot ext: .tec
......
...@@ -23,7 +23,7 @@ heat->theta: 1.0 ...@@ -23,7 +23,7 @@ heat->theta: 1.0
heat->adapt->timestep: 0.01 heat->adapt->timestep: 0.01
heat->adapt->min timestep: 0.01 heat->adapt->min timestep: 0.01
heat->adapt->start time: 0.0 heat->adapt->start time: 0.0
heat->adapt->end time: 1.0 heat->adapt->end time: 0.05
heat->adapt->tolerance: 0.0001 heat->adapt->tolerance: 0.0001
heat->adapt->rel space error: 0.5 heat->adapt->rel space error: 0.5
...@@ -39,6 +39,7 @@ heat->adapt->max iteration: 100 ...@@ -39,6 +39,7 @@ heat->adapt->max iteration: 100
heat->adapt->coarsen allowed: 1 % 0|1 heat->adapt->coarsen allowed: 1 % 0|1
heat->adapt->refine bisections: 1 heat->adapt->refine bisections: 1
heat->adapt->coarsen bisections: 1 heat->adapt->coarsen bisections: 1
%heat->adapt->info: 2
heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->MSGamma: 0.5 heat->space->marker->MSGamma: 0.5
......
...@@ -15,31 +15,34 @@ heat->space->solver->left precon: no ...@@ -15,31 +15,34 @@ heat->space->solver->left precon: no
heat->space->solver->right precon: no heat->space->solver->right precon: no
heat->space->estimator: residual heat->space->estimator: residual
heat->space->estimator->C0: 0.0 heat->space->estimator->C0: 0.1
heat->space->estimator->C1: 1.0 heat->space->estimator->C1: 0.1
heat->space->estimator->C3: 1.0
heat->theta: 1.0 heat->theta: 1.0
heat->adapt->timestep: 0.01
heat->adapt->min timestep: 0.01
heat->adapt->start time: 0.0
heat->adapt->end time: 0.05
heat->adapt->tolerance: 0.01 heat->adapt->tolerance: 0.01
heat->adapt->timestep: 0.01
heat->adapt->rel space error: 0.5 heat->adapt->rel space error: 0.5
heat->adapt->rel time error: 0.5 heat->adapt->rel time error: 0.5
heat->adapt->strategy: 0 % 0=explicit, 1=implicit heat->adapt->strategy: 0 % 0=explicit, 1=implicit
heat->adapt->max iteration: 10 heat->adapt->max iteration: 10
heat->adapt->info: 2 %heat->adapt->info: 2
heat->initial->adapt->strategy: 2 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS heat->initial->adapt->strategy: 2 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->initial->adapt->max iteration: 10 heat->initial->adapt->max iteration: 10
heat->initial->adapt->info: 2 %heat->initial->adapt->info: 2
heat->space->marker->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->ESTheta: 0.9 heat->space->marker->ESTheta: 0.9
heat->space->marker->ESThetaC: 0.05 heat->space->marker->ESThetaC: 0.05
heat->adapt->max iteration: 2 heat->adapt->max iteration: 2
heat->adapt->coarsen allowed: 1 % 0|1 heat->adapt->coarsen allowed: 1 % 0|1
heat->adapt->info: 2 %heat->adapt->info: 2
heat->adapt->refine bisections: 3 heat->adapt->refine bisections: 3
heat->adapt->coarsen bisections: 3 heat->adapt->coarsen bisections: 3
......
...@@ -27,7 +27,7 @@ periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS ...@@ -27,7 +27,7 @@ periodic->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
periodic->marker->MSGamma: 0.5 periodic->marker->MSGamma: 0.5
periodic->adapt->tolerance: 1e-2 periodic->adapt->tolerance: 1e-2
periodic->adapt->max iteration: 100 periodic->adapt->max iteration: 5 %100
periodic->adapt->refine bisections: 3 periodic->adapt->refine bisections: 3
periodic->adapt->coarsen allowed: 0 periodic->adapt->coarsen allowed: 0
......
...@@ -33,13 +33,13 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual ...@@ -33,13 +33,13 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual
vecellipt->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecellipt->marker[0]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
vecellipt->marker[1]->MSGamma: 0.5 vecellipt->marker[1]->MSGamma: 0.5
vecellipt->adapt->max iteration: 8 vecellipt->adapt->max iteration: 20
vecellipt->adapt->info: 8 vecellipt->adapt->info: 8
vecellipt->adapt->refine bisections: 1 vecellipt->adapt->refine bisections: 1
vecellipt->adapt[0]->tolerance: 1e-4 vecellipt->adapt[0]->tolerance: 1e-3
vecellipt->adapt[1]->tolerance: 1e-4 vecellipt->adapt[1]->tolerance: 1e-3
vecellipt->output->filename: vecellipt vecellipt->output->filename: vecellipt
vecellipt->output->ParaView format: 1 vecellipt->output->ParaView format: 1
......
...@@ -33,15 +33,15 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual ...@@ -33,15 +33,15 @@ vecellipt->estimator[1]->C1: 0.1 % constant of jump residual
vecellipt->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS vecellipt->marker[1]->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
vecellipt->marker[1]->MSGamma: 0.5 vecellipt->marker[1]->MSGamma: 0.5
vecellipt->adapt->max iteration: 5 vecellipt->adapt->max iteration: 16
vecellipt->adapt->info: 8 vecellipt->adapt->info: 8
vecellipt->adapt->refine bisections[0]: 3 vecellipt->adapt->refine bisections[0]: 3
vecellipt->adapt->refine bisections[1]: 3 vecellipt->adapt->refine bisections[1]: 3
vecellipt->adapt[0]->tolerance: 1e-4 vecellipt->adapt[0]->tolerance: 1e-2
vecellipt->adapt[1]->tolerance: 1e-4 vecellipt->adapt[1]->tolerance: 1e-3
vecellipt->output->filename: vecellipt vecellipt->output->filename: vecellipt
......
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