some new domes

demo/init/cahnHilliard.inc.2d

+ch->space->mesh:     ${mesh_name}
+
+% ============== USER-PARAMETER ==========================
+ch->epsilon: 0.1
+ch->gamma: 1
+ch->transport term: 1.0
+ch->initial interface: -1
+ch->double-well type: 0
+
+ch->use conservation form: 0
+
+% =========== OUTPUT ==============================================
+ch->space->output->filename: ${output_folder}/ch${output_postfix}_
+
+% ============= PROBLEM-SPACES ==================================
+ch->space->components: 2
+ch->space->polynomial degree[0]: ${polynomial-degree}
+ch->space->polynomial degree[1]: ${polynomial-degree}
+ch->space->dim: 2
+
+% ================== SOLVER ======================================
+ch->space->solver: umfpack
+ch->space->solver->symmetric strategy: 0
+ch->space->solver->store symbolic: 0
+ch->space->solver->ell:               8
+ch->space->solver->max iteration:     200
+ch->space->solver->tolerance: 1.e-8
+ch->space->solver->info: 1
+%ch->space->solver->left precon:       ilu
+
+% =================== OUTPUT =========================================
+ch->space->output->ParaView animation: 1
+ch->space->output->ParaView format: 1
+ch->space->output->write every i-th timestep: 1
+%ch->space->output->compression:  gzip
+ch->space->output->append index: 1
+ch->space->output->index length: 9
+ch->space->output->index decimals: 7
\ No newline at end of file

demo/init/drivenCavity.dat.2d

+dimension of world: 2
+
+% ====================== VARIABLES ========================
+output_folder: output
+output_postfix: _drivenCavity
+mesh_name: mesh
+polynomial-degree: 1
+
+% ====================== MESH =============================
+mesh->refinement->epsilon: 0.01
+
+% local refinement at cahn-hilliard interface
+mesh->refinement->initial level: 10
+mesh->refinement->level in inner domain: 8
+mesh->refinement->level in outer domain: 8
+mesh->refinement->level on interface: 14
+mesh->min outer interface value: 0.05
+mesh->max outer interface value: 0.95
+
+% ====================== MESH =============================
+${mesh_name}->macro file name: macro/macro.drivenCavity.2d
+${mesh_name}->global refinements: 0
+${mesh_name}->check: 0
+
+% ====================== INCLUDES =========================
+#include "init/navierStokes_TaylorHood.inc.2d"
+#include "init/cahnHilliard.inc.2d"
+#include "init/reinit.inc.2d"
+
+% ====================== MAIN INITFILE ====================
+
+% helper problem to initialize all FeSpaces
+main->mesh: ${mesh_name}
+main->dim: 2
+
+main->sigma: 0.0		% surface tension
+
+% ====================== USER-PARAMETER - CH ==============
+
+ch->initial interface: 0
+  ch->line->pos: 0.5
+ch->initial epsilon: ${mesh->refinement->epsilon}
+ch->epsilon: ${mesh->refinement->epsilon}
+ch->gamma: 1 %0.001
+ch->use mobility: 0
+ch->double-well type: 1		% c in [-1,1]
+
+% ====================== USER_PARAMETER - NS ==============
+
+ns->viscosity: 0.002
+ns->theta: 1
+%ns->force: [0.0, 9.81]		% gravitational force [m/s^2]
+
+ns->force dirichlet bc: 0
+
+ns->initial velocity: 0
+ns->initial velocity value: 0.0
+ns->laplace operator: 0  	% 0... div(nu*grad(u)), 1... div(0.5*nu*(grad(u)+grad(u)^T)) [sehr langsam]
+ns->non-linear term: 2 		% 0... u^old*grad(u_i^old), 1... u'*grad(u_i^old), 2... u^old*grad(u'_i)
+
+% ====================== TIMESTEPS ========================
+adapt->max iteration: 1
+adapt->max timestep iteration: 1
+adapt->max time iteration: 1
+
+adapt->timestep: 2e-3
+adapt->max timestep: 1e+10
+adapt->min timestep: 1e-6
+adapt->start time: 0.0
+adapt->end time: 10
+
+% ====================== ESTIMATORS =======================
+adapt->strategy: 0   % 0=explicit, 1=implicit
+
+WAIT: 1
+

demo/init/ellipt.dat.1d

 dimension of world:             1
 
 elliptMesh->macro file name:    ./macro/macro.stand.1d
-elliptMesh->global refinements: 3
+elliptMesh->global refinements: 10
 
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    1
 ellipt->polynomial degree[0]:   1
+ellipt->polynomial degree[1]:   2
 ellipt->components:             1
 
-ellipt->solver:                 cg
+ellipt->solver:                 umfpack
 ellipt->solver->max iteration:  1000
 ellipt->solver->tolerance:      1.e-8
 ellipt->solver->info:           2
@@ -26,7 +27,7 @@ ellipt->marker[0]->MSGamma:        0.5
 ellipt->adapt[0]->tolerance:          1e-4
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:         10
+ellipt->adapt->max iteration:         0
 
 ellipt->output->filename:        output/ellipt.1d
 ellipt->output->ParaView format: 1

demo/init/ellipt.dat.2d

 dimension of world:             2
 
 elliptMesh->macro file name:    ./macro/macro.stand.2d
-elliptMesh->global refinements: 5
+elliptMesh->global refinements: 10
 
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    2
 ellipt->components:             1
-ellipt->polynomial degree[0]:   1
+ellipt->polynomial degree[0]:   3
+ellipt->polynomial degree[1]:   1
+ellipt->polynomial degree[2]:   1
  
-ellipt->solver:                 cg
+ellipt->solver:                 umfpack
 ellipt->solver->ell:        1
 ellipt->solver->max iteration:  1000
 ellipt->solver->tolerance:      1.e-8
@@ -16,18 +18,18 @@ 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:       2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
+ellipt->marker[0]->strategy:       0 %2 % 0: no adaption 1: GR 2: MS 3: ES 4:GERS
 ellipt->marker[0]->MSGamma:        0.5
 
 ellipt->adapt[0]->tolerance:          1e-6
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:         10
+ellipt->adapt->max iteration:         0
 
 ellipt->output->filename:       output/ellipt.2d
 ellipt->output->ParaView format: 1

demo/init/heat.dat.2d

 dimension of world:   2
 
 heatMesh->macro file name:            ./macro/macro.stand.2d
-heatMesh->global refinements:         0
+heatMesh->global refinements:         10
 
 heat->space->polynomial degree[0]:    1
 heat->space->dim:                     2
@@ -21,7 +21,7 @@ heat->space->estimator[0]->C0:       1.0
 heat->space->estimator[0]->C1:       1.0
 heat->space->estimator[0]->C3:       1.0
 
-heat->theta:                         1.0
+heat->theta:                         0.5
 
 heat->adapt->timestep:               0.1
 heat->adapt->start time:             0.0
@@ -30,21 +30,21 @@ heat->adapt->end time:               1.0
 heat->adapt[0]->tolerance:           0.05
 heat->adapt[0]->time tolerance:      0.05
 
-heat->adapt->strategy:               1   % 0=explicit, 1=implicit
-heat->adapt->max iteration:          100
+heat->adapt->strategy:               0   % 0=explicit, 1=implicit
+heat->adapt->max iteration:          0
 
 heat->adapt[0]->coarsen allowed:        1
 heat->adapt[0]->refine bisections:      2
 heat->adapt[0]->coarsen bisections:     2
 
-heat->space->marker[0]->strategy:    2   % 0=none, 1=GR, 2=MS, 3=ES, 4=GERS
+heat->space->marker[0]->strategy:    0   % 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.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->write every i-th timestep:   1
 heat->space->output->append index:                1
 heat->space->output->index length:                6
 heat->space->output->index decimals:              3

demo/init/navierStokes_TaylorHood.inc.2d

+
+ns->space->mesh: ${mesh_name}
+
+% ============ USER_PARAMETERS - NS =================================
+ns->viscosity: 1
+ns->beta: 1
+ns->sigma: 0.072
+ns->beta: 1
+ns->exponent: 2
+ns->theta: 0.5
+%ns->force: [0.0, -9.81] % gravitational force
+
+ns->viscosity1: 1
+ns->viscosity2: ${ns->viscosity1}/1000
+
+ns->force dirichlet bc: 0
+ns->poisson problem pertubation: 0 % 1..applySingularPertubation, 2..applySingularDBC, 0..nothing
+ns->simple algorithm: 1
+ns->calculate pressure: 0
+ns->initial velocity: 3
+ns->initial velocity value: 0.1
+ns->laplace operator: 1  % 0... div(nu*grad(u)), 1... div(0.5*nu*(grad(u)+grad(u)^T)) [sehr langsam]
+ns->non-linear term: 2 % 0... u^old*grad(u_i^old), 1... u'*grad(u_i^old), 2... u^old*grad(u'_i)
+
+% =========== OUTPUT ==============================================
+
+ns->velocity->output->filename: ${output_folder}/velocity${output_postfix}_
+ns->space->output[2]->filename: ${output_folder}/pressure${output_postfix}_
+
+% ============= PROBLEM-SPACES ==================================
+ns->space->components: 3
+
+ns->space->polynomial degree[0]: ${polynomial-degree}+1
+ns->space->polynomial degree[1]: ${polynomial-degree}+1
+ns->space->polynomial degree[2]: ${polynomial-degree}
+
+ns->space->dim: 2
+
+% ================== SOLVER ======================================
+ns->space->solver: umfpack
+ns->space->solver->symmetric strategy: 0
+ns->space->solver->ell:               3
+ns->space->solver->max iteration:     500
+ns->space->solver->restart:           10  %  only used for GMRES
+ns->space->solver->tolerance:         1.e-8
+ns->space->solver->info:              1
+ns->space->solver->left precon:       ilu
+
+% =================== OUTPUT =========================================
+ns->velocity->output->ParaView animation: 1
+ns->velocity->output->ParaView vector format: 1
+ns->velocity->output->write vector as 3d vector: 1
+ns->velocity->output->write every i-th timestep: 1
+%ns->velocity->output->compression:  gzip
+ns->velocity->output->append index: 1
+ns->velocity->output->index length: 9
+ns->velocity->output->index decimals: 7
+
+ns->space->output[2]->ParaView animation: 0
+ns->space->output[2]->ParaView format: 0
+ns->space->output[2]->write every i-th timestep: 1
+%ns->space->output[2]->compression:  gzip
+ns->space->output[2]->append index: 1
+ns->space->output[2]->index length: 9
+ns->space->output[2]->index decimals: 7

demo/init/reinit.inc.2d

+reinit->tolerance: 1.e-4
+reinit->maximal number of iteration steps: 100
+reinit->Gauss-Seidel iteration: 1
+reinit->infinity value: 1.e8
+reinit->boundary initialization: 3

demo/macro/macro.drivenCavity.2d

+DIM: 2
+DIM_OF_WORLD: 2
+
+number of elements: 4  
+number of vertices: 5  
+
+element vertices:
+0 1 4 
+1 2 4  
+2 3 4 
+3 0 4 
+
+element boundaries:
+0 0 1 
+0 0 1
+0 0 2 
+0 0 1 
+
+vertex coordinates:
+ 0.0 0.0  
+ 1.0 0.0
+ 1.0 1.0
+ 0.0 1.0
+ 0.5 0.5
+
+element neighbours:
+1 3 -1 
+2 0 -1 
+3 1 -1 
+0 2 -1
\ No newline at end of file

demo/macro/macro.stand.1d

@@ -8,7 +8,7 @@ element vertices:
 0 1 
 
 element boundaries:
-1 1
+2 3
 
 vertex coordinates:
  0.0  

demo/macro/macro.stand.2d

@@ -12,9 +12,9 @@ element vertices:
 
 element boundaries:
 0 0 1 
-0 0 1
-0 0 1 
+0 0 3
 0 0 1 
+0 0 2 
 
 vertex coordinates:
  0.0 0.0  

demo/src/heat.cc

@@ -206,7 +206,9 @@ int main(int argc, char** argv)
   G *boundaryFct = new G;
   boundaryFct->setTimePtr(heat.getTime());
   heat.setExactSolution(boundaryFct);
-  heatSpace.addDirichletBC(1, 0, 0, boundaryFct);
+  DOFVector<double> G_dof(ellipt.getFeSpace(), "G");
+  G_dof.interpol(boundaryFct);
+  heatSpace.addDirichletBC(1, 0, 0, &G_dof);
 
 
   // ===== start adaption loop =====