Share table between hyperball and torus

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index e1e99e2d4460d3163e871032cb3d3ca3447e72f0..d02d13c3bf41f74190d10991dcb90546fd9ed488 100644 (file)
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -1990,6 +1990,17 @@ namespace GridGenerator
 
 
 
+  namespace
+  {
+    static constexpr int circle_cell_vertices[5][4] = {{0, 1, 2, 3},
+                                                       {0, 2, 6, 4},
+                                                       {2, 3, 4, 5},
+                                                       {1, 7, 3, 5},
+                                                       {6, 4, 7, 5}};
+  }
+
+
+
   template <>
   void
   torus<3, 3>(Triangulation<3, 3> &tria,
@@ -2052,37 +2063,17 @@ namespace GridGenerator
             const unsigned int offset =
               (8 * (c + j)) % (8 * n_point_layers_toroidal);
 
-            // cell 0 in x-y-plane
-            cells[5 * c].vertices[0 + j * 4] = offset + 0;
-            cells[5 * c].vertices[1 + j * 4] = offset + 1;
-            cells[5 * c].vertices[2 + j * 4] = offset + 2;
-            cells[5 * c].vertices[3 + j * 4] = offset + 3;
-            // cell 1 in x-y-plane (cell on torus centerline)
-            cells[5 * c + 1].vertices[0 + j * 4] = offset + 2;
-            cells[5 * c + 1].vertices[1 + j * 4] = offset + 3;
-            cells[5 * c + 1].vertices[2 + j * 4] = offset + 4;
-            cells[5 * c + 1].vertices[3 + j * 4] = offset + 5;
-            // cell 2 in x-y-plane
-            cells[5 * c + 2].vertices[0 + j * 4] = offset + 6;
-            cells[5 * c + 2].vertices[1 + j * 4] = offset + 4;
-            cells[5 * c + 2].vertices[2 + j * 4] = offset + 7;
-            cells[5 * c + 2].vertices[3 + j * 4] = offset + 5;
-            // cell 3 in x-y-plane
-            cells[5 * c + 3].vertices[0 + j * 4] = offset + 0;
-            cells[5 * c + 3].vertices[1 + j * 4] = offset + 2;
-            cells[5 * c + 3].vertices[2 + j * 4] = offset + 6;
-            cells[5 * c + 3].vertices[3 + j * 4] = offset + 4;
-            // cell 4 in x-y-plane
-            cells[5 * c + 4].vertices[0 + j * 4] = offset + 1;
-            cells[5 * c + 4].vertices[1 + j * 4] = offset + 7;
-            cells[5 * c + 4].vertices[2 + j * 4] = offset + 3;
-            cells[5 * c + 4].vertices[3 + j * 4] = offset + 5;
+            // cells in x-y-plane
+            for (unsigned int c2 = 0; c2 < 5; ++c2)
+              for (unsigned int i = 0; i < 4; ++i)
+                cells[5 * c + c2].vertices[i + j * 4] =
+                  offset + circle_cell_vertices[c2][i];
           }
 
         cells[5 * c].material_id = 0;
         // mark cell on torus centerline
-        cells[5 * c + 1].material_id = 1;
-        cells[5 * c + 2].material_id = 0;
+        cells[5 * c + 1].material_id = 0;
+        cells[5 * c + 2].material_id = 1;
         cells[5 * c + 3].material_id = 0;
         cells[5 * c + 4].material_id = 0;
       }
@@ -4318,15 +4309,12 @@ namespace GridGenerator
       p + Point<2>(-1, +1) * (radius / std::sqrt(2.0)),
       p + Point<2>(+1, +1) * (radius / std::sqrt(2.0))};
 
-    const int cell_vertices[5][4] = {
-      {0, 1, 2, 3}, {0, 2, 6, 4}, {2, 3, 4, 5}, {1, 7, 3, 5}, {6, 4, 7, 5}};
-
     std::vector<CellData<2>> cells(5, CellData<2>());
 
     for (unsigned int i = 0; i < 5; ++i)
       {
         for (unsigned int j = 0; j < 4; ++j)
-          cells[i].vertices[j] = cell_vertices[i][j];
+          cells[i].vertices[j] = circle_cell_vertices[i][j];
         cells[i].material_id = 0;
         cells[i].manifold_id = i == 2 ? numbers::flat_manifold_id : 1;
       }

diff --git a/tests/grid/torus_01.output b/tests/grid/torus_01.output
index ae495b97bb69e46b7b46a3a75225da500d9f903f..0fe7985de8f753ad623dfba1747b89dcb7eb0b75 100644 (file)
--- a/tests/grid/torus_01.output
+++ b/tests/grid/torus_01.output
@@ -24,29 +24,11 @@ set arrow from 1.03923, -0.200000, 0.600000 to -0.0765756, 0.253757, 0.971517
 set arrow from 0.866025, -0.258579, 0.500000 to 0.186242, -0.141421, 0.953967
 set view equal xyz
 splot '-' w l
+0.717157 -0.282843 0.00000 0 0
 0.882843 -0.117157 0.00000 0 0
-1.11716 -0.117157 0.00000 0 0
-0.558579 -0.117157 0.967487 0 0
-0.441421 -0.117157 0.764564 0 0
-0.882843 -0.117157 0.00000 0 0
-
-0.882843 0.117157 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
-0.558579 0.117157 0.967487 0 0
-0.441421 0.117157 0.764564 0 0
-0.882843 0.117157 0.00000 0 0
-
-0.882843 -0.117157 0.00000 0 0
-0.882843 0.117157 0.00000 0 0
-
-1.11716 -0.117157 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
-
-0.558579 -0.117157 0.967487 0 0
-0.558579 0.117157 0.967487 0 0
-
 0.441421 -0.117157 0.764564 0 0
-0.441421 0.117157 0.764564 0 0
+0.358579 -0.282843 0.621076 0 0
+0.717157 -0.282843 0.00000 0 0
 
 0.717157 0.282843 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
@@ -54,48 +36,42 @@ splot '-' w l
 0.358579 0.282843 0.621076 0 0
 0.717157 0.282843 0.00000 0 0
 
-1.28284 0.282843 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
-0.558579 0.117157 0.967487 0 0
-0.641421 0.282843 1.11097 0 0
-1.28284 0.282843 0.00000 0 0
-
+0.717157 -0.282843 0.00000 0 0
 0.717157 0.282843 0.00000 0 0
-1.28284 0.282843 0.00000 0 0
 
+0.882843 -0.117157 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
 
+0.441421 -0.117157 0.764564 0 0
 0.441421 0.117157 0.764564 0 0
-0.558579 0.117157 0.967487 0 0
 
+0.358579 -0.282843 0.621076 0 0
 0.358579 0.282843 0.621076 0 0
-0.641421 0.282843 1.11097 0 0
 
-0.717157 -0.282843 0.00000 0 0
 0.882843 -0.117157 0.00000 0 0
+1.11716 -0.117157 0.00000 0 0
+0.558579 -0.117157 0.967487 0 0
 0.441421 -0.117157 0.764564 0 0
-0.358579 -0.282843 0.621076 0 0
-0.717157 -0.282843 0.00000 0 0
+0.882843 -0.117157 0.00000 0 0
 
-0.717157 0.282843 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+0.558579 0.117157 0.967487 0 0
 0.441421 0.117157 0.764564 0 0
-0.358579 0.282843 0.621076 0 0
-0.717157 0.282843 0.00000 0 0
-
-0.717157 -0.282843 0.00000 0 0
-0.717157 0.282843 0.00000 0 0
+0.882843 0.117157 0.00000 0 0
 
 0.882843 -0.117157 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
 
+1.11716 -0.117157 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+
+0.558579 -0.117157 0.967487 0 0
+0.558579 0.117157 0.967487 0 0
+
 0.441421 -0.117157 0.764564 0 0
 0.441421 0.117157 0.764564 0 0
 
-0.358579 -0.282843 0.621076 0 0
-0.358579 0.282843 0.621076 0 0
-
 1.28284 -0.282843 0.00000 0 0
 1.28284 0.282843 0.00000 0 0
 0.641421 0.282843 1.11097 0 0
@@ -120,6 +96,30 @@ splot '-' w l
 0.641421 -0.282843 1.11097 0 0
 0.558579 -0.117157 0.967487 0 0
 
+0.717157 0.282843 0.00000 0 0
+0.882843 0.117157 0.00000 0 0
+0.441421 0.117157 0.764564 0 0
+0.358579 0.282843 0.621076 0 0
+0.717157 0.282843 0.00000 0 0
+
+1.28284 0.282843 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+0.558579 0.117157 0.967487 0 0
+0.641421 0.282843 1.11097 0 0
+1.28284 0.282843 0.00000 0 0
+
+0.717157 0.282843 0.00000 0 0
+1.28284 0.282843 0.00000 0 0
+
+0.882843 0.117157 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+
+0.441421 0.117157 0.764564 0 0
+0.558579 0.117157 0.967487 0 0
+
+0.358579 0.282843 0.621076 0 0
+0.641421 0.282843 1.11097 0 0
+
 0.358579 -0.282843 0.621076 0 0
 0.641421 -0.282843 1.11097 0 0
 -0.641421 -0.282843 1.11097 0 0
@@ -144,29 +144,11 @@ splot '-' w l
 -0.358579 -0.282843 0.621076 0 0
 -0.441421 -0.117157 0.764564 0 0
 
+0.358579 -0.282843 0.621076 0 0
 0.441421 -0.117157 0.764564 0 0
-0.558579 -0.117157 0.967487 0 0
--0.558579 -0.117157 0.967487 0 0
--0.441421 -0.117157 0.764564 0 0
-0.441421 -0.117157 0.764564 0 0
-
-0.441421 0.117157 0.764564 0 0
-0.558579 0.117157 0.967487 0 0
--0.558579 0.117157 0.967487 0 0
--0.441421 0.117157 0.764564 0 0
-0.441421 0.117157 0.764564 0 0
-
-0.441421 -0.117157 0.764564 0 0
-0.441421 0.117157 0.764564 0 0
-
-0.558579 -0.117157 0.967487 0 0
-0.558579 0.117157 0.967487 0 0
-
--0.558579 -0.117157 0.967487 0 0
--0.558579 0.117157 0.967487 0 0
-
 -0.441421 -0.117157 0.764564 0 0
--0.441421 0.117157 0.764564 0 0
+-0.358579 -0.282843 0.621076 0 0
+0.358579 -0.282843 0.621076 0 0
 
 0.358579 0.282843 0.621076 0 0
 0.441421 0.117157 0.764564 0 0
@@ -174,48 +156,42 @@ splot '-' w l
 -0.358579 0.282843 0.621076 0 0
 0.358579 0.282843 0.621076 0 0
 
-0.641421 0.282843 1.11097 0 0
-0.558579 0.117157 0.967487 0 0
--0.558579 0.117157 0.967487 0 0
--0.641421 0.282843 1.11097 0 0
-0.641421 0.282843 1.11097 0 0
-
+0.358579 -0.282843 0.621076 0 0
 0.358579 0.282843 0.621076 0 0
-0.641421 0.282843 1.11097 0 0
 
+0.441421 -0.117157 0.764564 0 0
 0.441421 0.117157 0.764564 0 0
-0.558579 0.117157 0.967487 0 0
 
+-0.441421 -0.117157 0.764564 0 0
 -0.441421 0.117157 0.764564 0 0
--0.558579 0.117157 0.967487 0 0
 
+-0.358579 -0.282843 0.621076 0 0
 -0.358579 0.282843 0.621076 0 0
--0.641421 0.282843 1.11097 0 0
 
-0.358579 -0.282843 0.621076 0 0
 0.441421 -0.117157 0.764564 0 0
+0.558579 -0.117157 0.967487 0 0
+-0.558579 -0.117157 0.967487 0 0
 -0.441421 -0.117157 0.764564 0 0
--0.358579 -0.282843 0.621076 0 0
-0.358579 -0.282843 0.621076 0 0
+0.441421 -0.117157 0.764564 0 0
 
-0.358579 0.282843 0.621076 0 0
 0.441421 0.117157 0.764564 0 0
+0.558579 0.117157 0.967487 0 0
+-0.558579 0.117157 0.967487 0 0
 -0.441421 0.117157 0.764564 0 0
--0.358579 0.282843 0.621076 0 0
-0.358579 0.282843 0.621076 0 0
-
-0.358579 -0.282843 0.621076 0 0
-0.358579 0.282843 0.621076 0 0
+0.441421 0.117157 0.764564 0 0
 
 0.441421 -0.117157 0.764564 0 0
 0.441421 0.117157 0.764564 0 0
 
+0.558579 -0.117157 0.967487 0 0
+0.558579 0.117157 0.967487 0 0
+
+-0.558579 -0.117157 0.967487 0 0
+-0.558579 0.117157 0.967487 0 0
+
 -0.441421 -0.117157 0.764564 0 0
 -0.441421 0.117157 0.764564 0 0
 
--0.358579 -0.282843 0.621076 0 0
--0.358579 0.282843 0.621076 0 0
-
 0.641421 -0.282843 1.11097 0 0
 0.641421 0.282843 1.11097 0 0
 -0.641421 0.282843 1.11097 0 0
@@ -240,6 +216,30 @@ splot '-' w l
 -0.641421 -0.282843 1.11097 0 0
 -0.558579 -0.117157 0.967487 0 0
 
+0.358579 0.282843 0.621076 0 0
+0.441421 0.117157 0.764564 0 0
+-0.441421 0.117157 0.764564 0 0
+-0.358579 0.282843 0.621076 0 0
+0.358579 0.282843 0.621076 0 0
+
+0.641421 0.282843 1.11097 0 0
+0.558579 0.117157 0.967487 0 0
+-0.558579 0.117157 0.967487 0 0
+-0.641421 0.282843 1.11097 0 0
+0.641421 0.282843 1.11097 0 0
+
+0.358579 0.282843 0.621076 0 0
+0.641421 0.282843 1.11097 0 0
+
+0.441421 0.117157 0.764564 0 0
+0.558579 0.117157 0.967487 0 0
+
+-0.441421 0.117157 0.764564 0 0
+-0.558579 0.117157 0.967487 0 0
+
+-0.358579 0.282843 0.621076 0 0
+-0.641421 0.282843 1.11097 0 0
+
 -0.358579 -0.282843 0.621076 0 0
 -0.641421 -0.282843 1.11097 0 0
 -1.28284 -0.282843 1.57103e-16 0 0
@@ -264,29 +264,11 @@ splot '-' w l
 -0.717157 -0.282843 8.78264e-17 0 0
 -0.882843 -0.117157 1.08117e-16 0 0
 
+-0.358579 -0.282843 0.621076 0 0
 -0.441421 -0.117157 0.764564 0 0
--0.558579 -0.117157 0.967487 0 0
--1.11716 -0.117157 1.36812e-16 0 0
--0.882843 -0.117157 1.08117e-16 0 0
--0.441421 -0.117157 0.764564 0 0
-
--0.441421 0.117157 0.764564 0 0
--0.558579 0.117157 0.967487 0 0
--1.11716 0.117157 1.36812e-16 0 0
--0.882843 0.117157 1.08117e-16 0 0
--0.441421 0.117157 0.764564 0 0
-
--0.441421 -0.117157 0.764564 0 0
--0.441421 0.117157 0.764564 0 0
-
--0.558579 -0.117157 0.967487 0 0
--0.558579 0.117157 0.967487 0 0
-
--1.11716 -0.117157 1.36812e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
-
 -0.882843 -0.117157 1.08117e-16 0 0
--0.882843 0.117157 1.08117e-16 0 0
+-0.717157 -0.282843 8.78264e-17 0 0
+-0.358579 -0.282843 0.621076 0 0
 
 -0.358579 0.282843 0.621076 0 0
 -0.441421 0.117157 0.764564 0 0
@@ -294,48 +276,42 @@ splot '-' w l
 -0.717157 0.282843 8.78264e-17 0 0
 -0.358579 0.282843 0.621076 0 0
 
--0.641421 0.282843 1.11097 0 0
--0.558579 0.117157 0.967487 0 0
--1.11716 0.117157 1.36812e-16 0 0
--1.28284 0.282843 1.57103e-16 0 0
--0.641421 0.282843 1.11097 0 0
-
+-0.358579 -0.282843 0.621076 0 0
 -0.358579 0.282843 0.621076 0 0
--0.641421 0.282843 1.11097 0 0
 
+-0.441421 -0.117157 0.764564 0 0
 -0.441421 0.117157 0.764564 0 0
--0.558579 0.117157 0.967487 0 0
 
+-0.882843 -0.117157 1.08117e-16 0 0
 -0.882843 0.117157 1.08117e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
 
+-0.717157 -0.282843 8.78264e-17 0 0
 -0.717157 0.282843 8.78264e-17 0 0
--1.28284 0.282843 1.57103e-16 0 0
 
--0.358579 -0.282843 0.621076 0 0
 -0.441421 -0.117157 0.764564 0 0
+-0.558579 -0.117157 0.967487 0 0
+-1.11716 -0.117157 1.36812e-16 0 0
 -0.882843 -0.117157 1.08117e-16 0 0
--0.717157 -0.282843 8.78264e-17 0 0
--0.358579 -0.282843 0.621076 0 0
+-0.441421 -0.117157 0.764564 0 0
 
--0.358579 0.282843 0.621076 0 0
 -0.441421 0.117157 0.764564 0 0
+-0.558579 0.117157 0.967487 0 0
+-1.11716 0.117157 1.36812e-16 0 0
 -0.882843 0.117157 1.08117e-16 0 0
--0.717157 0.282843 8.78264e-17 0 0
--0.358579 0.282843 0.621076 0 0
-
--0.358579 -0.282843 0.621076 0 0
--0.358579 0.282843 0.621076 0 0
+-0.441421 0.117157 0.764564 0 0
 
 -0.441421 -0.117157 0.764564 0 0
 -0.441421 0.117157 0.764564 0 0
 
+-0.558579 -0.117157 0.967487 0 0
+-0.558579 0.117157 0.967487 0 0
+
+-1.11716 -0.117157 1.36812e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+
 -0.882843 -0.117157 1.08117e-16 0 0
 -0.882843 0.117157 1.08117e-16 0 0
 
--0.717157 -0.282843 8.78264e-17 0 0
--0.717157 0.282843 8.78264e-17 0 0
-
 -0.641421 -0.282843 1.11097 0 0
 -0.641421 0.282843 1.11097 0 0
 -1.28284 0.282843 1.57103e-16 0 0
@@ -360,29 +336,35 @@ splot '-' w l
 -1.28284 -0.282843 1.57103e-16 0 0
 -1.11716 -0.117157 1.36812e-16 0 0
 
--0.717157 -0.282843 8.78264e-17 0 0
--1.28284 -0.282843 1.57103e-16 0 0
--0.641421 -0.282843 -1.11097 0 0
--0.358579 -0.282843 -0.621076 0 0
--0.717157 -0.282843 8.78264e-17 0 0
+-0.358579 0.282843 0.621076 0 0
+-0.441421 0.117157 0.764564 0 0
+-0.882843 0.117157 1.08117e-16 0 0
+-0.717157 0.282843 8.78264e-17 0 0
+-0.358579 0.282843 0.621076 0 0
 
--0.882843 -0.117157 1.08117e-16 0 0
--1.11716 -0.117157 1.36812e-16 0 0
--0.558579 -0.117157 -0.967487 0 0
--0.441421 -0.117157 -0.764564 0 0
--0.882843 -0.117157 1.08117e-16 0 0
+-0.641421 0.282843 1.11097 0 0
+-0.558579 0.117157 0.967487 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+-1.28284 0.282843 1.57103e-16 0 0
+-0.641421 0.282843 1.11097 0 0
 
--0.717157 -0.282843 8.78264e-17 0 0
--0.882843 -0.117157 1.08117e-16 0 0
+-0.358579 0.282843 0.621076 0 0
+-0.641421 0.282843 1.11097 0 0
 
--1.28284 -0.282843 1.57103e-16 0 0
--1.11716 -0.117157 1.36812e-16 0 0
+-0.441421 0.117157 0.764564 0 0
+-0.558579 0.117157 0.967487 0 0
 
--0.641421 -0.282843 -1.11097 0 0
--0.558579 -0.117157 -0.967487 0 0
+-0.882843 0.117157 1.08117e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+
+-0.717157 0.282843 8.78264e-17 0 0
+-1.28284 0.282843 1.57103e-16 0 0
 
+-0.717157 -0.282843 8.78264e-17 0 0
+-1.28284 -0.282843 1.57103e-16 0 0
+-0.641421 -0.282843 -1.11097 0 0
 -0.358579 -0.282843 -0.621076 0 0
--0.441421 -0.117157 -0.764564 0 0
+-0.717157 -0.282843 8.78264e-17 0 0
 
 -0.882843 -0.117157 1.08117e-16 0 0
 -1.11716 -0.117157 1.36812e-16 0 0
@@ -390,23 +372,23 @@ splot '-' w l
 -0.441421 -0.117157 -0.764564 0 0
 -0.882843 -0.117157 1.08117e-16 0 0
 
--0.882843 0.117157 1.08117e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
--0.558579 0.117157 -0.967487 0 0
--0.441421 0.117157 -0.764564 0 0
--0.882843 0.117157 1.08117e-16 0 0
-
+-0.717157 -0.282843 8.78264e-17 0 0
 -0.882843 -0.117157 1.08117e-16 0 0
--0.882843 0.117157 1.08117e-16 0 0
 
+-1.28284 -0.282843 1.57103e-16 0 0
 -1.11716 -0.117157 1.36812e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
 
+-0.641421 -0.282843 -1.11097 0 0
 -0.558579 -0.117157 -0.967487 0 0
--0.558579 0.117157 -0.967487 0 0
 
+-0.358579 -0.282843 -0.621076 0 0
 -0.441421 -0.117157 -0.764564 0 0
--0.441421 0.117157 -0.764564 0 0
+
+-0.717157 -0.282843 8.78264e-17 0 0
+-0.882843 -0.117157 1.08117e-16 0 0
+-0.441421 -0.117157 -0.764564 0 0
+-0.358579 -0.282843 -0.621076 0 0
+-0.717157 -0.282843 8.78264e-17 0 0
 
 -0.717157 0.282843 8.78264e-17 0 0
 -0.882843 0.117157 1.08117e-16 0 0
@@ -414,48 +396,42 @@ splot '-' w l
 -0.358579 0.282843 -0.621076 0 0
 -0.717157 0.282843 8.78264e-17 0 0
 
--1.28284 0.282843 1.57103e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
--0.558579 0.117157 -0.967487 0 0
--0.641421 0.282843 -1.11097 0 0
--1.28284 0.282843 1.57103e-16 0 0
-
+-0.717157 -0.282843 8.78264e-17 0 0
 -0.717157 0.282843 8.78264e-17 0 0
--1.28284 0.282843 1.57103e-16 0 0
 
+-0.882843 -0.117157 1.08117e-16 0 0
 -0.882843 0.117157 1.08117e-16 0 0
--1.11716 0.117157 1.36812e-16 0 0
 
+-0.441421 -0.117157 -0.764564 0 0
 -0.441421 0.117157 -0.764564 0 0
--0.558579 0.117157 -0.967487 0 0
 
+-0.358579 -0.282843 -0.621076 0 0
 -0.358579 0.282843 -0.621076 0 0
--0.641421 0.282843 -1.11097 0 0
 
--0.717157 -0.282843 8.78264e-17 0 0
 -0.882843 -0.117157 1.08117e-16 0 0
+-1.11716 -0.117157 1.36812e-16 0 0
+-0.558579 -0.117157 -0.967487 0 0
 -0.441421 -0.117157 -0.764564 0 0
--0.358579 -0.282843 -0.621076 0 0
--0.717157 -0.282843 8.78264e-17 0 0
+-0.882843 -0.117157 1.08117e-16 0 0
 
--0.717157 0.282843 8.78264e-17 0 0
 -0.882843 0.117157 1.08117e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+-0.558579 0.117157 -0.967487 0 0
 -0.441421 0.117157 -0.764564 0 0
--0.358579 0.282843 -0.621076 0 0
--0.717157 0.282843 8.78264e-17 0 0
-
--0.717157 -0.282843 8.78264e-17 0 0
--0.717157 0.282843 8.78264e-17 0 0
+-0.882843 0.117157 1.08117e-16 0 0
 
 -0.882843 -0.117157 1.08117e-16 0 0
 -0.882843 0.117157 1.08117e-16 0 0
 
+-1.11716 -0.117157 1.36812e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+
+-0.558579 -0.117157 -0.967487 0 0
+-0.558579 0.117157 -0.967487 0 0
+
 -0.441421 -0.117157 -0.764564 0 0
 -0.441421 0.117157 -0.764564 0 0
 
--0.358579 -0.282843 -0.621076 0 0
--0.358579 0.282843 -0.621076 0 0
-
 -1.28284 -0.282843 1.57103e-16 0 0
 -1.28284 0.282843 1.57103e-16 0 0
 -0.641421 0.282843 -1.11097 0 0
@@ -480,6 +456,30 @@ splot '-' w l
 -0.641421 -0.282843 -1.11097 0 0
 -0.558579 -0.117157 -0.967487 0 0
 
+-0.717157 0.282843 8.78264e-17 0 0
+-0.882843 0.117157 1.08117e-16 0 0
+-0.441421 0.117157 -0.764564 0 0
+-0.358579 0.282843 -0.621076 0 0
+-0.717157 0.282843 8.78264e-17 0 0
+
+-1.28284 0.282843 1.57103e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+-0.558579 0.117157 -0.967487 0 0
+-0.641421 0.282843 -1.11097 0 0
+-1.28284 0.282843 1.57103e-16 0 0
+
+-0.717157 0.282843 8.78264e-17 0 0
+-1.28284 0.282843 1.57103e-16 0 0
+
+-0.882843 0.117157 1.08117e-16 0 0
+-1.11716 0.117157 1.36812e-16 0 0
+
+-0.441421 0.117157 -0.764564 0 0
+-0.558579 0.117157 -0.967487 0 0
+
+-0.358579 0.282843 -0.621076 0 0
+-0.641421 0.282843 -1.11097 0 0
+
 -0.358579 -0.282843 -0.621076 0 0
 -0.641421 -0.282843 -1.11097 0 0
 0.641421 -0.282843 -1.11097 0 0
@@ -504,29 +504,11 @@ splot '-' w l
 0.358579 -0.282843 -0.621076 0 0
 0.441421 -0.117157 -0.764564 0 0
 
+-0.358579 -0.282843 -0.621076 0 0
 -0.441421 -0.117157 -0.764564 0 0
--0.558579 -0.117157 -0.967487 0 0
-0.558579 -0.117157 -0.967487 0 0
-0.441421 -0.117157 -0.764564 0 0
--0.441421 -0.117157 -0.764564 0 0
-
--0.441421 0.117157 -0.764564 0 0
--0.558579 0.117157 -0.967487 0 0
-0.558579 0.117157 -0.967487 0 0
-0.441421 0.117157 -0.764564 0 0
--0.441421 0.117157 -0.764564 0 0
-
--0.441421 -0.117157 -0.764564 0 0
--0.441421 0.117157 -0.764564 0 0
-
--0.558579 -0.117157 -0.967487 0 0
--0.558579 0.117157 -0.967487 0 0
-
-0.558579 -0.117157 -0.967487 0 0
-0.558579 0.117157 -0.967487 0 0
-
 0.441421 -0.117157 -0.764564 0 0
-0.441421 0.117157 -0.764564 0 0
+0.358579 -0.282843 -0.621076 0 0
+-0.358579 -0.282843 -0.621076 0 0
 
 -0.358579 0.282843 -0.621076 0 0
 -0.441421 0.117157 -0.764564 0 0
@@ -534,48 +516,42 @@ splot '-' w l
 0.358579 0.282843 -0.621076 0 0
 -0.358579 0.282843 -0.621076 0 0
 
--0.641421 0.282843 -1.11097 0 0
--0.558579 0.117157 -0.967487 0 0
-0.558579 0.117157 -0.967487 0 0
-0.641421 0.282843 -1.11097 0 0
--0.641421 0.282843 -1.11097 0 0
-
+-0.358579 -0.282843 -0.621076 0 0
 -0.358579 0.282843 -0.621076 0 0
--0.641421 0.282843 -1.11097 0 0
 
+-0.441421 -0.117157 -0.764564 0 0
 -0.441421 0.117157 -0.764564 0 0
--0.558579 0.117157 -0.967487 0 0
 
+0.441421 -0.117157 -0.764564 0 0
 0.441421 0.117157 -0.764564 0 0
-0.558579 0.117157 -0.967487 0 0
 
+0.358579 -0.282843 -0.621076 0 0
 0.358579 0.282843 -0.621076 0 0
-0.641421 0.282843 -1.11097 0 0
 
--0.358579 -0.282843 -0.621076 0 0
 -0.441421 -0.117157 -0.764564 0 0
+-0.558579 -0.117157 -0.967487 0 0
+0.558579 -0.117157 -0.967487 0 0
 0.441421 -0.117157 -0.764564 0 0
-0.358579 -0.282843 -0.621076 0 0
--0.358579 -0.282843 -0.621076 0 0
+-0.441421 -0.117157 -0.764564 0 0
 
--0.358579 0.282843 -0.621076 0 0
 -0.441421 0.117157 -0.764564 0 0
+-0.558579 0.117157 -0.967487 0 0
+0.558579 0.117157 -0.967487 0 0
 0.441421 0.117157 -0.764564 0 0
-0.358579 0.282843 -0.621076 0 0
--0.358579 0.282843 -0.621076 0 0
-
--0.358579 -0.282843 -0.621076 0 0
--0.358579 0.282843 -0.621076 0 0
+-0.441421 0.117157 -0.764564 0 0
 
 -0.441421 -0.117157 -0.764564 0 0
 -0.441421 0.117157 -0.764564 0 0
 
+-0.558579 -0.117157 -0.967487 0 0
+-0.558579 0.117157 -0.967487 0 0
+
+0.558579 -0.117157 -0.967487 0 0
+0.558579 0.117157 -0.967487 0 0
+
 0.441421 -0.117157 -0.764564 0 0
 0.441421 0.117157 -0.764564 0 0
 
-0.358579 -0.282843 -0.621076 0 0
-0.358579 0.282843 -0.621076 0 0
-
 -0.641421 -0.282843 -1.11097 0 0
 -0.641421 0.282843 -1.11097 0 0
 0.641421 0.282843 -1.11097 0 0
@@ -600,6 +576,30 @@ splot '-' w l
 0.641421 -0.282843 -1.11097 0 0
 0.558579 -0.117157 -0.967487 0 0
 
+-0.358579 0.282843 -0.621076 0 0
+-0.441421 0.117157 -0.764564 0 0
+0.441421 0.117157 -0.764564 0 0
+0.358579 0.282843 -0.621076 0 0
+-0.358579 0.282843 -0.621076 0 0
+
+-0.641421 0.282843 -1.11097 0 0
+-0.558579 0.117157 -0.967487 0 0
+0.558579 0.117157 -0.967487 0 0
+0.641421 0.282843 -1.11097 0 0
+-0.641421 0.282843 -1.11097 0 0
+
+-0.358579 0.282843 -0.621076 0 0
+-0.641421 0.282843 -1.11097 0 0
+
+-0.441421 0.117157 -0.764564 0 0
+-0.558579 0.117157 -0.967487 0 0
+
+0.441421 0.117157 -0.764564 0 0
+0.558579 0.117157 -0.967487 0 0
+
+0.358579 0.282843 -0.621076 0 0
+0.641421 0.282843 -1.11097 0 0
+
 0.358579 -0.282843 -0.621076 0 0
 0.641421 -0.282843 -1.11097 0 0
 1.28284 -0.282843 0.00000 0 0
@@ -624,29 +624,11 @@ splot '-' w l
 0.717157 -0.282843 0.00000 0 0
 0.882843 -0.117157 0.00000 0 0
 
+0.358579 -0.282843 -0.621076 0 0
 0.441421 -0.117157 -0.764564 0 0
-0.558579 -0.117157 -0.967487 0 0
-1.11716 -0.117157 0.00000 0 0
-0.882843 -0.117157 0.00000 0 0
-0.441421 -0.117157 -0.764564 0 0
-
-0.441421 0.117157 -0.764564 0 0
-0.558579 0.117157 -0.967487 0 0
-1.11716 0.117157 0.00000 0 0
-0.882843 0.117157 0.00000 0 0
-0.441421 0.117157 -0.764564 0 0
-
-0.441421 -0.117157 -0.764564 0 0
-0.441421 0.117157 -0.764564 0 0
-
-0.558579 -0.117157 -0.967487 0 0
-0.558579 0.117157 -0.967487 0 0
-
-1.11716 -0.117157 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
-
 0.882843 -0.117157 0.00000 0 0
-0.882843 0.117157 0.00000 0 0
+0.717157 -0.282843 0.00000 0 0
+0.358579 -0.282843 -0.621076 0 0
 
 0.358579 0.282843 -0.621076 0 0
 0.441421 0.117157 -0.764564 0 0
@@ -654,48 +636,42 @@ splot '-' w l
 0.717157 0.282843 0.00000 0 0
 0.358579 0.282843 -0.621076 0 0
 
-0.641421 0.282843 -1.11097 0 0
-0.558579 0.117157 -0.967487 0 0
-1.11716 0.117157 0.00000 0 0
-1.28284 0.282843 0.00000 0 0
-0.641421 0.282843 -1.11097 0 0
-
+0.358579 -0.282843 -0.621076 0 0
 0.358579 0.282843 -0.621076 0 0
-0.641421 0.282843 -1.11097 0 0
 
+0.441421 -0.117157 -0.764564 0 0
 0.441421 0.117157 -0.764564 0 0
-0.558579 0.117157 -0.967487 0 0
 
+0.882843 -0.117157 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
-1.11716 0.117157 0.00000 0 0
 
+0.717157 -0.282843 0.00000 0 0
 0.717157 0.282843 0.00000 0 0
-1.28284 0.282843 0.00000 0 0
 
-0.358579 -0.282843 -0.621076 0 0
 0.441421 -0.117157 -0.764564 0 0
+0.558579 -0.117157 -0.967487 0 0
+1.11716 -0.117157 0.00000 0 0
 0.882843 -0.117157 0.00000 0 0
-0.717157 -0.282843 0.00000 0 0
-0.358579 -0.282843 -0.621076 0 0
+0.441421 -0.117157 -0.764564 0 0
 
-0.358579 0.282843 -0.621076 0 0
 0.441421 0.117157 -0.764564 0 0
+0.558579 0.117157 -0.967487 0 0
+1.11716 0.117157 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
-0.717157 0.282843 0.00000 0 0
-0.358579 0.282843 -0.621076 0 0
-
-0.358579 -0.282843 -0.621076 0 0
-0.358579 0.282843 -0.621076 0 0
+0.441421 0.117157 -0.764564 0 0
 
 0.441421 -0.117157 -0.764564 0 0
 0.441421 0.117157 -0.764564 0 0
 
+0.558579 -0.117157 -0.967487 0 0
+0.558579 0.117157 -0.967487 0 0
+
+1.11716 -0.117157 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+
 0.882843 -0.117157 0.00000 0 0
 0.882843 0.117157 0.00000 0 0
 
-0.717157 -0.282843 0.00000 0 0
-0.717157 0.282843 0.00000 0 0
-
 0.641421 -0.282843 -1.11097 0 0
 0.641421 0.282843 -1.11097 0 0
 1.28284 0.282843 0.00000 0 0
@@ -720,6 +696,30 @@ splot '-' w l
 1.28284 -0.282843 0.00000 0 0
 1.11716 -0.117157 0.00000 0 0
 
+0.358579 0.282843 -0.621076 0 0
+0.441421 0.117157 -0.764564 0 0
+0.882843 0.117157 0.00000 0 0
+0.717157 0.282843 0.00000 0 0
+0.358579 0.282843 -0.621076 0 0
+
+0.641421 0.282843 -1.11097 0 0
+0.558579 0.117157 -0.967487 0 0
+1.11716 0.117157 0.00000 0 0
+1.28284 0.282843 0.00000 0 0
+0.641421 0.282843 -1.11097 0 0
+
+0.358579 0.282843 -0.621076 0 0
+0.641421 0.282843 -1.11097 0 0
+
+0.441421 0.117157 -0.764564 0 0
+0.558579 0.117157 -0.967487 0 0
+
+0.882843 0.117157 0.00000 0 0
+1.11716 0.117157 0.00000 0 0
+
+0.717157 0.282843 0.00000 0 0
+1.28284 0.282843 0.00000 0 0
+
 0.717157 -0.282843 0.00000 1 0
 1.00000 -0.400000 0.00000 1 0
 0.866025 -0.400000 0.500000 1 0