From 6edb44929e016ad417608fa70d7c4414a2677b9c Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 6 Sep 2014 19:30:56 +0200
Subject: [PATCH] [Cleanup] Grid: Refactor construction
---
src/sand-wedge-data/mygrid.cc | 55 ++++++++++++++---------------------
1 file changed, 22 insertions(+), 33 deletions(-)
diff --git a/src/sand-wedge-data/mygrid.cc b/src/sand-wedge-data/mygrid.cc
index b19d1648..6cda76f6 100644
--- a/src/sand-wedge-data/mygrid.cc
+++ b/src/sand-wedge-data/mygrid.cc
@@ -73,41 +73,30 @@ template <class Grid> GridConstructor<Grid>::GridConstructor() {
Dune::FieldMatrix<double, vc, MY_DIM> vertices;
#endif
for (size_t i = 0; i < 2; ++i) {
- size_t k = 0;
- vertices[k++][i] = A[i];
- vertices[k++][i] = AAB[i];
- vertices[k++][i] = AB[i];
- vertices[k++][i] = ABB[i];
- vertices[k++][i] = B[i];
- vertices[k++][i] = AAC[i];
- vertices[k++][i] = ABAC[i];
- vertices[k++][i] = ABBC[i];
- vertices[k++][i] = BBC[i];
- vertices[k++][i] = AC[i];
- vertices[k++][i] = ACBC[i];
- vertices[k++][i] = BC[i];
- vertices[k++][i] = ACC[i];
- vertices[k++][i] = BCC[i];
- vertices[k++][i] = C[i];
- assert(k == vc);
#if MY_DIM == 3
- vertices[k++][i] = A[i];
- vertices[k++][i] = AAB[i];
- vertices[k++][i] = AB[i];
- vertices[k++][i] = ABB[i];
- vertices[k++][i] = B[i];
- vertices[k++][i] = AAC[i];
- vertices[k++][i] = ABAC[i];
- vertices[k++][i] = ABBC[i];
- vertices[k++][i] = BBC[i];
- vertices[k++][i] = AC[i];
- vertices[k++][i] = ACBC[i];
- vertices[k++][i] = BC[i];
- vertices[k++][i] = ACC[i];
- vertices[k++][i] = BCC[i];
- vertices[k++][i] = C[i];
- assert(k == 2 * vc);
+ size_t numXYplanes = 2;
+#else
+ size_t numXYplanes = 1;
#endif
+ size_t k = 0;
+ for (size_t j = 1; j <= numXYplanes; ++j) {
+ vertices[k++][i] = A[i];
+ vertices[k++][i] = AAB[i];
+ vertices[k++][i] = AB[i];
+ vertices[k++][i] = ABB[i];
+ vertices[k++][i] = B[i];
+ vertices[k++][i] = AAC[i];
+ vertices[k++][i] = ABAC[i];
+ vertices[k++][i] = ABBC[i];
+ vertices[k++][i] = BBC[i];
+ vertices[k++][i] = AC[i];
+ vertices[k++][i] = ACBC[i];
+ vertices[k++][i] = BC[i];
+ vertices[k++][i] = ACC[i];
+ vertices[k++][i] = BCC[i];
+ vertices[k++][i] = C[i];
+ assert(k == j * vc);
+ }
}
#if MY_DIM == 3
--
GitLab