Commit 7d472011 authored by Naumann, Andreas's avatar Naumann, Andreas
Browse files

first tests data production, need to change data for speedup

parent 613caf74
#include "Project.h"
#include "BallProject.h"
#include "io/ArhWriter.h"
#include "io/ArhReader.h"
#include <vector>
......
......@@ -36,7 +36,7 @@ Spheredemo::~Spheredemo() {
delete adaptInfo;
}
void Spheredemo::create(string filename) {
void Spheredemo::create(string& filename) {
// ===== init parameters =====
Parameters::init(false, filename);
......@@ -76,6 +76,3 @@ int Spheredemo::solve(SolutionInformation& info) {
info.dofVec = sphere.getSolution();
return retCode;
}
void createProjectList(ProjectList& list) {
}
......@@ -17,7 +17,7 @@ class Spheredemo : public Project {
Spheredemo();
~Spheredemo();
void create(string filename);
void create(string& filename);
int solve(SolutionInformation& );
};
#endif
......@@ -53,10 +53,9 @@ Vecelliptdemo::~Vecelliptdemo() {
delete adaptInfo;
}
void Vecelliptdemo::create(string filename) {
void Vecelliptdemo::create(string& filename) {
// ===== init parameters =====
Parameters::init(false, filename);
Parameters::init(true, filename);
// ===== create and init the scalar problem =====
vecellipt.initialize(INIT_ALL);
......@@ -100,6 +99,3 @@ int Vecelliptdemo::solve(SolutionInformation& info) {
info.sysVec = vecellipt.getSolution();
return retCode;
}
void createProjectList(ProjectList& list) {
}
......@@ -17,7 +17,7 @@ class Vecelliptdemo : public Project {
Vecelliptdemo();
~Vecelliptdemo();
void create(string filename);
void create(string& filename);
int solve(SolutionInformation& );
};
......
#include "Parameters.h"
#include "Project.h"
#include "@PROJECTINCLUDE@"
typedef @CURRENTPROJECTTYPE@ ProjectType;
std::string basename="@BASENAME@";
int main(int argc, char** argv) {
ProjectList list;
createProjectList(list);
for(ProjectList::iterator it=list.begin() ; it != list.end(); ++it) {
it->create();
SolutionInformation info;
it->solve(info);
write(info, it->getFilename());
if(argc < 2) {
std::cout<<" need initfile "<<basename<<"*\n";
return 1;
}
if(argc < 3) {
std::cout<<" also need a destination file "<<basename<<"*\n";
return 2;
}
std::string initfile(argv[1]);
std::string destinationfile(argv[2]);
AMDiS::Parameters::init(false, initfile);
ProjectType project;
ProjectInfo info(&project, initfile, destinationfile);
info.create();
SolutionInformation solinfo;
info.solve(solinfo);
write(solinfo, info.getFilename());
return 0;
}
dimension of world: 1
periodicMesh->macro file name: ./macro/periodic.macro.1d
periodicMesh->global refinements: 0
periodicMesh->periodic file: ./init/periodic.per.1d
periodicMesh->preserve coarse dofs: 0
periodic->mesh: periodicMesh
periodic->dim: 1
periodic->polynomial degree: 1
periodic->solver: cg
periodic->solver->max iteration: 1000
periodic->solver->tolerance: 1.e-8
periodic->solver->info: 2
periodic->solver->left precon: diag
periodic->solver->right precon: no
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->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
periodic->marker->MSGamma: 0.5
periodic->adapt->tolerance: 1e-6
periodic->adapt->max iteration: 14
periodic->adapt->refine bisections: 2
periodic->adapt->coarsen allowed: 0
periodic->output->filename: periodic
periodic->output->ParaView format: 1
periodic->output->TecPlot format: 0
periodic->output->TecPlot ext: .tec
periodic->output->AMDiS format: 0
periodic->output->AMDiS mesh ext: .mesh
periodic->output->AMDiS data ext: .dat
periodic->output->append index: 0
periodic->output->index length: 6
periodic->output->index decimals: 3
WAIT: 1
dimension of world: 2
ballMesh->macro file name: ./macro/macro.ball.2d
ballMesh->global refinements: 3
ball->mesh: ballMesh
ball->dim: 2
ball->polynomial degree: 1
ball->solver: cg
ball->solver->max iteration: 1000
ball->solver->tolerance: 1.e-8
ball->solver->info: 2
ball->solver->left precon: diag
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->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ball->marker->MSGamma: 0.5
ball->adapt->tolerance: 1e-8
ball->adapt->max iteration: 4
ball->adapt->info: 8
ball->output->filename: ball
ball->output->ParaView format: 1
ball->output->TecPlot format: 0
ball->output->TecPlot ext: .tec
ball->output->AMDiS format: 0
ball->output->AMDiS mesh ext: .mesh
ball->output->AMDiS data ext: .dat
ball->output->append index: 0
ball->output->index length: 6
ball->output->index decimals: 3
WAIT: 1
dimension of world: 3
ballMesh->macro file name: ./macro/macro.ball.3d
ballMesh->global refinements: 15
ball->mesh: ballMesh
ball->dim: 3
ball->polynomial degree: 1
ball->solver: cg
ball->solver->max iteration: 1000
ball->solver->tolerance: 1.e-8
ball->solver->left precon: diag
ball->estimator: 0
ball->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ball->output->filename: output/ball
ball->output->ParaView format: 1
ball->output->AMDiS format: 0
ball->output->AMDiS mesh ext: .mesh
ball->output->AMDiS data ext: .dat
dimension of world: 3
bunnyMesh->macro file name: ./macro/bunny_fixed.macro
bunnyMesh->check: 0
bunnyMesh->global refinements: 0
bunny->mesh: bunnyMesh
bunny->dim: 2
bunny->polynomial degree: 1
bunny->solver: cg
bunny->solver->max iteration: 100
bunny->solver->tolerance: 1.e-8
bunny->solver->info: 5
bunny->solver->left precon: diag
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->marker->strategy: 0 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
bunny->marker->MSGamma: 0.5
bunny->adapt->tolerance: 1e-8
bunny->adapt->refine bisections: 1
bunny->adapt->max iteration: 0
bunny->adapt->info: 8
bunny->output->filename: bunny_fixed
bunny->output->ParaView format: 1
bunny->output->TecPlot format: 0
bunny->output->TecPlot ext: .tec
bunny->output->AMDiS format: 0
bunny->output->AMDiS mesh ext: .mesh
bunny->output->AMDiS data ext: .dat
bunny->output->append index: 0
bunny->output->index length: 6
bunny->output->index decimals: 3
WAIT: 1
dimension of world: 2
couple->adapt->tolerance: 1e-8
couple->adapt->max iteration: 10
couple->adapt->refine bisections: 2
coupleMesh->macro file name: ./macro/macro.stand.2d
coupleMesh->global refinements: 0
problem1->mesh: coupleMesh
problem1->dim: 2
problem1->polynomial degree: 1
problem1->solver: cg
problem1->solver->max iteration: 1000
problem1->solver->tolerance: 1.e-8
problem1->solver->left precon: diag
problem1->estimator: residual
problem1->estimator->C0: 0.1 % constant of element residual
problem1->estimator->C1: 0.1 % constant of jump residual
problem1->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
problem1->marker->MSGamma: 0.5
problem1->output->filename: output/problem1
problem1->output->ParaView format: 1
problem1->output->AMDiS format: 0
problem1->output->AMDiS mesh ext: .mesh
problem1->output->AMDiS data ext: .dat
problem2->dim: 2
problem2->polynomial degree: 1
problem2->solver: cg
problem2->solver->max iteration: 1000
problem2->solver->tolerance: 1.e-8
problem2->solver->left precon: diag
problem2->estimator: 0
problem2->marker->strategy: 0
problem2->output->filename: output/problem2
problem2->output->ParaView format: 1
problem2->output->AMDiS format: 0
problem2->output->AMDiS mesh ext: .mesh
problem2->output->AMDiS data ext: .dat
dimension of world: 1
elliptMesh->macro file name: ./macro/macro.stand.1d
elliptMesh->global refinements: 3
ellipt->mesh: elliptMesh
ellipt->dim: 1
ellipt->polynomial degree: 1
ellipt->solver: cg
ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2
ellipt->solver->left precon: diag
ellipt->solver->right precon: no
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->adapt->tolerance: 1e-4
ellipt->adapt->max iteration: 10
ellipt->adapt->info: 8
ellipt->adapt->refine bisections: 1
ellipt->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ellipt->marker->MSGamma: 0.5
ellipt->marker->info: 8
ellipt->output->filename: ellipt
ellipt->output->ParaView format: 1
ellipt->output->TecPlot format: 0
ellipt->output->TecPlot ext: .tec
ellipt->output->AMDiS format: 0
ellipt->output->AMDiS mesh ext: .mesh
ellipt->output->AMDiS data ext: .dat
ellipt->output->append index: 0
ellipt->output->index length: 6
ellipt->output->index decimals: 3
WAIT: 0
dimension of world: 2
elliptMesh->macro file name: ./macro/macro.stand.2d
elliptMesh->global refinements: 0
ellipt->mesh: elliptMesh
ellipt->dim: 2
ellipt->polynomial degree: 1
ellipt->solver: cg
ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2
ellipt->solver->left precon: diag
ellipt->solver->right precon: no
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->marker->strategy: 2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ellipt->marker->MSGamma: 0.5
ellipt->adapt->tolerance: 1e-4
ellipt->adapt->max iteration: 10
ellipt->adapt->refine bisections: 2
ellipt->output->filename: ellipt
ellipt->output->ParaView format: 1
ellipt->output->TecPlot format: 0
ellipt->output->TecPlot ext: .tec
ellipt->output->AMDiS format: 0
ellipt->output->AMDiS mesh ext: .mesh
ellipt->output->AMDiS data ext: .dat
ellipt->output->append index: 0
ellipt->output->index length: 6
ellipt->output->index decimals: 3
WAIT: 1
dimension of world: 3
elliptMesh->macro file name: ./macro/macro.stand.3d
elliptMesh->global refinements: 0
ellipt->mesh: elliptMesh
ellipt->dim: 3
ellipt->polynomial degree: 2
ellipt->solver: bicgstab
ellipt->solver->max iteration: 1000
ellipt->solver->tolerance: 1.e-8
ellipt->solver->info: 2
ellipt->solver->left precon: ilu
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->marker->strategy: 3 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
ellipt->marker->MSGamma: 0.5
ellipt->adapt->tolerance: 1e-4
ellipt->adapt->max iteration: 5
ellipt->adapt->info: 8
ellipt->adapt->refine bisections: 3
ellipt->output->filename: ellipt
ellipt->output->ParaView format: 1
ellipt->output->TecPlot format: 0
ellipt->output->TecPlot ext: .tec
ellipt->output->AMDiS format: 0
ellipt->output->AMDiS mesh ext: .mesh
ellipt->output->AMDiS data ext: .dat
ellipt->output->append index: 0
ellipt->output->index length: 6
ellipt->output->index decimals: 3
WAIT: 0
dimension of world: 1
heatMesh->macro file name: ./macro/macro.stand.1d
heatMesh->global refinements: 9
heat->space->polynomial degree: 1
heat->space->mesh: heatMesh
heat->space->solver: cg
heat->space->solver->max iteration: 1000
heat->space->solver->tolerance: 1.e-8
heat->space->solver->info: 8
heat->space->solver->left precon: diag
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->C3: 1.0
heat->theta: 1.0
heat->adapt->tolerance: 0.01
heat->adapt->timestep: 0.01
heat->adapt->start time: 0.0
heat->adapt->end time: 1.0
heat->adapt->rel space error: 0.5
heat->adapt->rel time error: 0.5
heat->adapt->max iteration: 2
heat->adapt->info: 8
heat->adapt->coarsen allowed: 1 % 0|1
heat->adapt->refine bisections: 1
heat->adapt->coarsen bisections: 1
heat->adapt->strategy: 0 % 0=explicit, 1=implicit
heat->adapt->max iteration: 100
heat->initial->marker->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->initial->adapt->max iteration: 10
heat->initial->adapt->info: 8
heat->space->dim: 1
heat->space->marker->strategy: 3 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->ESTheta: 0.9
heat->space->marker->ESThetaC: 0.05
heat->space->marker->info: 8
heat->space->output->filename: heat
heat->space->output->ParaView format: 1
heat->space->output->TecPlot format: 0
heat->space->output->TecPlot ext: .tec
heat->space->output->AMDiS format: 0
heat->space->output->AMDiS mesh ext: .mesh
heat->space->output->AMDiS data ext: .dat
heat->space->output->write every i-th timestep: 1
heat->space->output->append index: 1
heat->space->output->index length: 6
heat->space->output->index decimals: 3
WAIT: 0
dimension of world: 2
heatMesh->macro file name: ./macro/macro.stand.2d
heatMesh->global refinements: 0
heat->space->polynomial degree: 1
heat->space->dim: 2
heat->space->mesh: heatMesh
heat->space->solver: umfpack
heat->space->solver->max iteration: 1000
heat->space->solver->tolerance: 1.e-8
heat->space->solver->info: 2
heat->space->solver->left precon: no
heat->space->solver->right precon: no
heat->space->estimator: residual
heat->space->estimator->C0: 0.1
heat->space->estimator->C1: 0.1
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: 1.0
heat->adapt->tolerance: 0.0001
heat->adapt->rel space error: 0.5
heat->adapt->rel time error: 0.5
heat->adapt->time theta 1: 1.0
heat->adapt->time theta 2: 0.3
heat->adapt->strategy: 1 % 0=explicit, 1=implicit
heat->adapt->time delta 1: 0.7071
heat->adapt->time delta 2: 1.4142
heat->adapt->max iteration: 100
heat->adapt->coarsen allowed: 1 % 0|1
heat->adapt->refine bisections: 1
heat->adapt->coarsen bisections: 1
heat->space->marker->strategy: 4 % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
heat->space->marker->MSGamma: 0.5
heat->space->marker->MSGammaC: 0.1
heat->space->output->ParaView animation: 0
heat->space->output->filename: output/heat
heat->space->output->ParaView format: 0
heat->space->output->write every i-th timestep: 1
heat->space->output->append index: 1
heat->space->output->index length: 6
heat->space->output->index decimals: 3
WAIT: 0
dimension of world: 3
heatMesh->macro file name: ./macro/macro.stand.3d
heatMesh->global refinements: 3
heat->space->polynomial degree: 2
heat->space->dim: 3
heat->space->mesh: heatMesh
heat->space->solver: umfpack
heat->space->solver->max iteration: 1000
heat->space->solver->tolerance: 1.e-8
heat->space->solver->info: 2
heat->space->solver->left precon: no
heat->space->solver->right precon: no
heat->space->estimator: residual
heat->space->estimator->C0: 0.0
heat->space->estimator->C1: 1.0
heat->space->estimator->C3: 1.0
heat->theta: 1.0
heat->adapt->tolerance: 0.01
heat->adapt->timestep: 0.01
heat->adapt->rel space error: 0.5
heat->adapt->rel time error: 0.5
heat->adapt->strategy: 0 % 0=explicit, 1=implicit
heat->adapt->max iteration: 10
heat->adapt->info: 2