Demo roleback to old version.

demo/init/ellipt.dat.3d

@@ -5,7 +5,7 @@ elliptMesh->global refinements: 0
 
 ellipt->mesh:                   elliptMesh
 ellipt->dim:                    3
-ellipt->polynomial degree[0]:   4
+ellipt->polynomial degree[0]:   0
 ellipt->components:             1
 
 ellipt->solver:                 cg
@@ -25,7 +25,7 @@ ellipt->marker[0]->MSGamma:        0.5
 ellipt->adapt[0]->tolerance:          1e-4
 ellipt->adapt[0]->refine bisections:  2
 
-ellipt->adapt->max iteration:         0
+ellipt->adapt->max iteration:         10
 
 ellipt->output->filename:        output/ellipt.3d
 ellipt->output->ParaView format: 1

demo/init/vecellipt.dat.2d

 dimension of world:                      2
 
 vecelliptMesh->macro file name:          ./macro/macro.stand.2d
-vecelliptMesh->global refinements:       6
+vecelliptMesh->global refinements:       2
 
 vecellipt->mesh:                         vecelliptMesh
 vecellipt->dim:                          2
@@ -21,7 +21,7 @@ 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->marker[0]->strategy:          0   % 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[0]->MSGamma:           0.5
 
 vecellipt->estimator[1]:                 0
@@ -30,7 +30,7 @@ vecellipt->marker[1]->strategy:          0   % 0: no adaption 1: GR 2: MS 3: ES
 vecellipt->adapt[0]->tolerance:          1e-2
 vecellipt->adapt[1]->tolerance:          1e-3
 
-vecellipt->adapt->max iteration:         0
+vecellipt->adapt->max iteration:         100
 vecellipt->adapt->refine bisections:     2
 
 vecellipt->output[0]->filename:             output/vecellipt.2d

demo/src/ellipt.cc

@@ -76,10 +76,8 @@ int main(int argc, char* argv[])
 
 
   // ===== start adaption loop =====
-  //  adapt.adapt();
-
-  MSG("TEST: %d\n", ellipt.getFeSpace()->getBasisFcts()->getNumber());
-
+  adapt.adapt();
+  
   ellipt.writeFiles(adaptInfo, true);
 
   AMDiS::finalize();

demo/src/vecellipt.cc

@@ -58,23 +58,14 @@ int main(int argc, char* argv[])
 
   
   // ===== create matrix operators =====
-  Operator matrixOperator00a(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0));
-  matrixOperator00a.addTerm(new Simple_ZOT);
-  vecellipt.addMatrixOperator(matrixOperator00a, 0, 0);
-
-  Operator matrixOperator00b(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0));
-  matrixOperator00b.addTerm(new Simple_SOT);
-  vecellipt.addMatrixOperator(matrixOperator00b, 0, 0);
-
+  Operator matrixOperator00(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0));
+  matrixOperator00.addTerm(new Simple_ZOT);
+  vecellipt.addMatrixOperator(matrixOperator00, 0, 0);
 
   Operator matrixOperator10(vecellipt.getFeSpace(1), vecellipt.getFeSpace(0));
   matrixOperator10.addTerm(new Simple_ZOT);
   vecellipt.addMatrixOperator(matrixOperator10, 1, 0);
 
-  Operator matrixOperator01(vecellipt.getFeSpace(1), vecellipt.getFeSpace(1));
-  matrixOperator01.addTerm(new Simple_ZOT);
-    vecellipt.addMatrixOperator(matrixOperator01, 0, 1);
-
   Operator matrixOperator11(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0));
   matrixOperator11.addTerm(new Simple_SOT);
   vecellipt.addMatrixOperator(matrixOperator11, 1, 1);
@@ -85,13 +76,13 @@ int main(int argc, char* argv[])
   vecellipt.addVectorOperator(rhsOperator0, 0);
 
   // ===== add boundary conditions =====
-  //  vecellipt.addDirichletBC(1, 0, 0, new G);
+  vecellipt.addDirichletBC(1, 0, 0, new G);
 
 
   // ===== start adaption loop =====
   adapt.adapt();
 
-  //  vecellipt.writeFiles(adaptInfo, true);
+  vecellipt.writeFiles(adaptInfo, true);
 
   AMDiS::finalize();
 }