[Cleanup] Grid: Refactor construction

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