From 6febba8b8bb62135e18d05e20de0035996ad76f0 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 23 Aug 2012 08:26:23 +0000
Subject: [PATCH] Demo roleback to old version.
---
demo/init/ellipt.dat.3d | 4 ++--
demo/init/vecellipt.dat.2d | 6 +++---
demo/src/ellipt.cc | 6 ++----
demo/src/vecellipt.cc | 19 +++++--------------
4 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/demo/init/ellipt.dat.3d b/demo/init/ellipt.dat.3d
index 7bff29c3..b1fa6203 100644
--- a/demo/init/ellipt.dat.3d
+++ b/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
diff --git a/demo/init/vecellipt.dat.2d b/demo/init/vecellipt.dat.2d
index 77b0fff4..5188cd48 100644
--- a/demo/init/vecellipt.dat.2d
+++ b/demo/init/vecellipt.dat.2d
@@ -1,7 +1,7 @@
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
diff --git a/demo/src/ellipt.cc b/demo/src/ellipt.cc
index 8779154d..213a91d0 100644
--- a/demo/src/ellipt.cc
+++ b/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();
diff --git a/demo/src/vecellipt.cc b/demo/src/vecellipt.cc
index 926b3dcf..5556905b 100644
--- a/demo/src/vecellipt.cc
+++ b/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();
}
--
GitLab