Replace StraightBoundary by FlatManifold in tests

diff --git a/tests/dofs/dof_test.cc b/tests/dofs/dof_test.cc
index 067fedd46f3e973794b7b7618bef039bbce1ab48..542028925132175bf68f18814c7ef687dccfbdb5 100644 (file)
--- a/tests/dofs/dof_test.cc
+++ b/tests/dofs/dof_test.cc
@@ -20,7 +20,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/fe/fe_q.h>
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -41,13 +41,13 @@ std::ofstream logfile("output");
 template <int dim>
 class Ball
   :
-  public StraightBoundary<dim>
+  public FlatManifold<dim>
 {
 public:
   virtual Point<dim>
   get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
   {
-    Point<dim> middle = StraightBoundary<dim>::get_new_point_on_line(line);
+    Point<dim> middle = FlatManifold<dim>::get_new_point_on_line(line);
 
     for (int i=0; i<dim; ++i)
       middle(i) -= .5;
@@ -62,7 +62,7 @@ public:
   virtual Point<dim>
   get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const
   {
-    Point<dim> middle = StraightBoundary<dim>::get_new_point_on_quad(quad);
+    Point<dim> middle = FlatManifold<dim>::get_new_point_on_quad(quad);
 
     for (int i=0; i<dim; ++i)
       middle(i) -= .5;
@@ -78,7 +78,7 @@ public:
 template <int dim>
 class CurvedLine
   :
-  public StraightBoundary<dim>
+  public FlatManifold<dim>
 {
 public:
   virtual Point<dim>
@@ -93,7 +93,7 @@ template <int dim>
 Point<dim>
 CurvedLine<dim>::get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
 {
-  Point<dim> middle = StraightBoundary<dim>::get_new_point_on_line (line);
+  Point<dim> middle = FlatManifold<dim>::get_new_point_on_line (line);
 
   // if the line is at the top of bottom
   // face: do a special treatment on
@@ -142,7 +142,7 @@ template <int dim>
 Point<dim>
 CurvedLine<dim>::get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const
 {
-  Point<dim> middle = StraightBoundary<dim>::get_new_point_on_quad (quad);
+  Point<dim> middle = FlatManifold<dim>::get_new_point_on_quad (quad);
 
   // if the face is at the top of bottom
   // face: do not move the midpoint in
@@ -261,13 +261,13 @@ void TestCases<dim>::run (const unsigned int test_case)
     {
       if (dim==3)
         {
-          tria->begin_active()->face(4)->set_boundary_id(1);
-          tria->begin_active()->face(5)->set_boundary_id(1);
+          tria->begin_active()->face(4)->set_manifold_id(1);
+          tria->begin_active()->face(5)->set_manifold_id(1);
         };
 
       // set the boundary function
-      tria->set_boundary(1, (test_case==2)
-                         ? ((Boundary<dim> &)ball) : ((Boundary<dim> &)curved_line));
+      tria->set_manifold(1, (test_case==2)
+                         ? ((Manifold<dim> &)ball) : ((Manifold<dim> &)curved_line));
 
       // refine once
       tria->begin_active()->set_refine_flag();

diff --git a/tests/grid/grid_test.cc b/tests/grid/grid_test.cc
index 6747eb43b28c8af4479ef7290f838e366113fac2..c15aa899298c8035cc7d8d16fb146241472a86fd 100644 (file)
--- a/tests/grid/grid_test.cc
+++ b/tests/grid/grid_test.cc
@@ -16,7 +16,7 @@
 
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -33,28 +33,14 @@ std::ofstream logfile("output");
 
 template <int dim>
 class Ball :
-  public StraightBoundary<dim>
+  public FlatManifold<dim>
 {
 public:
   virtual Point<dim>
-  get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
+  get_new_point (const ArrayView<const Point<dim>> &surrounding_points,
+                 const ArrayView<const double>     &weights) const
   {
-    Point<dim> middle = StraightBoundary<dim>::get_new_point_on_line(line);
-
-    for (int i=0; i<dim; ++i)
-      middle(i) -= .5;
-    middle *= std::sqrt(static_cast<double>(dim)) / (std::sqrt(middle.square())*2);
-    for (int i=0; i<dim; ++i)
-      middle(i) += .5;
-
-    return middle;
-  }
-
-
-  virtual Point<dim>
-  get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const
-  {
-    Point<dim> middle = StraightBoundary<dim>::get_new_point_on_quad(quad);
+    Point<dim> middle = FlatManifold<dim>::get_new_point(surrounding_points, weights);
 
     for (int i=0; i<dim; ++i)
       middle(i) -= .5;
@@ -69,7 +55,7 @@ public:
 
 template <int dim>
 class CurvedLine :
-  public StraightBoundary<dim>
+  public FlatManifold<dim>
 {
 public:
   virtual Point<dim>
@@ -84,7 +70,7 @@ template <int dim>
 Point<dim>
 CurvedLine<dim>::get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
 {
-  Point<dim> middle = StraightBoundary<dim>::get_new_point_on_line (line);
+  Point<dim> middle = FlatManifold<dim>::get_new_point_on_line (line);
 
   // if the line is at the top of bottom
   // face: do a special treatment on
@@ -106,7 +92,7 @@ CurvedLine<dim>::get_new_point_on_line (const typename Triangulation<dim>::line_
         // id was invented after the above was
         // written, so we are not very strict
         // here with using these flags
-        && (line->boundary_id() == 1))
+        && (line->manifold_id() == 1))
       return middle;
 
 
@@ -132,7 +118,7 @@ template <int dim>
 Point<dim>
 CurvedLine<dim>::get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const
 {
-  Point<dim> middle = StraightBoundary<dim>::get_new_point_on_quad (quad);
+  Point<dim> middle = FlatManifold<dim>::get_new_point_on_quad (quad);
 
   // if the face is at the top of bottom
   // face: do not move the midpoint in
@@ -215,18 +201,18 @@ void test (const int test_case)
     {
       if (dim==3)
         {
-          tria.begin_active()->face(4)->set_boundary_id(1);
-          tria.begin_active()->face(5)->set_boundary_id(1);
+          tria.begin_active()->face(4)->set_manifold_id(1);
+          tria.begin_active()->face(5)->set_manifold_id(1);
         };
 
 
-// set the boundary function
+      // set the manifold function
       Ball<dim>       ball;
       CurvedLine<dim> curved_line;
       if (test_case==2)
-        tria.set_boundary (1, ball);
+        tria.set_manifold (1, ball);
       else
-        tria.set_boundary (1, curved_line);
+        tria.set_manifold (1, curved_line);
 
       // refine once
       tria.begin_active()->set_refine_flag();
@@ -248,7 +234,7 @@ void test (const int test_case)
           tria.execute_coarsening_and_refinement();
         };
 
-      tria.set_boundary (1);
+      tria.set_manifold (1);
       break;
     }
     }

diff --git a/tests/grid/grid_test.output b/tests/grid/grid_test.output
index f299d370ad2de4e1a65f57be5118ee9ff9e63c31..39eaad3987378a6f9283ca097b93cff5b94cff8c 100644 (file)
--- a/tests/grid/grid_test.output
+++ b/tests/grid/grid_test.output
@@ -836,10 +836,10 @@ DEAL:Test2.dim3::Start
 83  0.25000000 0.0000000 0.75000000
 84  0.75000000 0.0000000 0.25000000
 85  0.75000000 0.0000000 0.75000000
-86  0.19274799 0.19274799 -0.24912777
-87  0.80725201 0.19274799 -0.24912777
-88  0.19274799 0.80725201 -0.24912777
-89  0.80725201 0.80725201 -0.24912777
+86  0.21047012 0.21047012 -0.26311526
+87  0.78952988 0.21047012 -0.26311526
+88  0.21047012 0.78952988 -0.26311526
+89  0.78952988 0.78952988 -0.26311526
 90  0.0000000 0.25000000 0.25000000
 91  0.0000000 0.75000000 0.25000000
 92  0.0000000 0.25000000 0.75000000
@@ -852,10 +852,10 @@ DEAL:Test2.dim3::Start
 99  0.25000000 1.0000000 0.75000000
 100  0.75000000 1.0000000 0.25000000
 101  0.75000000 1.0000000 0.75000000
-102  0.19274799 0.19274799 1.2491278
-103  0.80725201 0.19274799 1.2491278
-104  0.19274799 0.80725201 1.2491278
-105  0.80725201 0.80725201 1.2491278
+102  0.21047012 0.21047012 1.2631153
+103  0.78952988 0.21047012 1.2631153
+104  0.21047012 0.78952988 1.2631153
+105  0.78952988 0.78952988 1.2631153
 106  0.75000000 0.75000000 0.50000000
 107  0.25000000 0.75000000 0.50000000
 108  0.75000000 0.25000000 0.50000000
@@ -868,14 +868,14 @@ DEAL:Test2.dim3::Start
 115  0.50000000 0.22616324 0.90662959
 116  0.50000000 0.77383676 0.093370415
 117  0.50000000 0.22616324 0.093370415
-118  0.22137400 0.22137400 0.12543612
-119  0.77862600 0.22137400 0.12543612
-120  0.22137400 0.77862600 0.12543612
-121  0.77862600 0.77862600 0.12543612
-122  0.22137400 0.22137400 0.87456388
-123  0.77862600 0.22137400 0.87456388
-124  0.22137400 0.77862600 0.87456388
-125  0.77862600 0.77862600 0.87456388
+118  0.23023506 0.23023506 0.11844237
+119  0.76976494 0.23023506 0.11844237
+120  0.23023506 0.76976494 0.11844237
+121  0.76976494 0.76976494 0.11844237
+122  0.23023506 0.23023506 0.88155763
+123  0.76976494 0.23023506 0.88155763
+124  0.23023506 0.76976494 0.88155763
+125  0.76976494 0.76976494 0.88155763
 126  0.12500000 0.0000000 0.0000000
 127  0.37500000 0.0000000 0.0000000
 128  0.62500000 0.0000000 0.0000000
@@ -994,22 +994,22 @@ DEAL:Test2.dim3::Start
 241  0.87500000 0.0000000 0.75000000
 242  0.75000000 0.0000000 0.62500000
 243  0.75000000 0.0000000 0.87500000
-244  0.19614514 0.059826715 -0.18111651
-245  0.19244035 0.34378520 -0.29435760
-246  0.059826715 0.19614514 -0.18111651
-247  0.34378520 0.19244035 -0.29435760
-248  0.80385486 0.059826715 -0.18111651
-249  0.80755965 0.34378520 -0.29435760
-250  0.65621480 0.19244035 -0.29435760
-251  0.94017328 0.19614514 -0.18111651
-252  0.19244035 0.65621480 -0.29435760
-253  0.19614514 0.94017328 -0.18111651
-254  0.059826715 0.80385486 -0.18111651
-255  0.34378520 0.80755965 -0.29435760
-256  0.80755965 0.65621480 -0.29435760
-257  0.80385486 0.94017328 -0.18111651
-258  0.65621480 0.80755965 -0.29435760
-259  0.94017328 0.80385486 -0.18111651
+244  0.20507129 0.068411244 -0.19046955
+245  0.20207644 0.35310410 -0.29978944
+246  0.068411244 0.20507129 -0.19046955
+247  0.35310410 0.20207644 -0.29978944
+248  0.79492871 0.068411244 -0.19046955
+249  0.79792356 0.35310410 -0.29978944
+250  0.64689590 0.20207644 -0.29978944
+251  0.93158876 0.20507129 -0.19046955
+252  0.20207644 0.64689590 -0.29978944
+253  0.20507129 0.93158876 -0.19046955
+254  0.068411244 0.79492871 -0.19046955
+255  0.35310410 0.79792356 -0.29978944
+256  0.79792356 0.64689590 -0.29978944
+257  0.79492871 0.93158876 -0.19046955
+258  0.64689590 0.79792356 -0.29978944
+259  0.93158876 0.79492871 -0.19046955
 260  0.0000000 0.25000000 0.12500000
 261  0.0000000 0.25000000 0.37500000
 262  0.0000000 0.12500000 0.25000000
@@ -1058,22 +1058,22 @@ DEAL:Test2.dim3::Start
 305  0.87500000 1.0000000 0.75000000
 306  0.75000000 1.0000000 0.62500000
 307  0.75000000 1.0000000 0.87500000
-308  0.19614514 0.059826715 1.1811165
-309  0.19244035 0.34378520 1.2943576
-310  0.059826715 0.19614514 1.1811165
-311  0.34378520 0.19244035 1.2943576
-312  0.80385486 0.059826715 1.1811165
-313  0.80755965 0.34378520 1.2943576
-314  0.65621480 0.19244035 1.2943576
-315  0.94017328 0.19614514 1.1811165
-316  0.19244035 0.65621480 1.2943576
-317  0.19614514 0.94017328 1.1811165
-318  0.059826715 0.80385486 1.1811165
-319  0.34378520 0.80755965 1.2943576
-320  0.80755965 0.65621480 1.2943576
-321  0.80385486 0.94017328 1.1811165
-322  0.65621480 0.80755965 1.2943576
-323  0.94017328 0.80385486 1.1811165
+308  0.20507129 0.068411244 1.1904696
+309  0.20207644 0.35310410 1.2997894
+310  0.068411244 0.20507129 1.1904696
+311  0.35310410 0.20207644 1.2997894
+312  0.79492871 0.068411244 1.1904696
+313  0.79792356 0.35310410 1.2997894
+314  0.64689590 0.20207644 1.2997894
+315  0.93158876 0.20507129 1.1904696
+316  0.20207644 0.64689590 1.2997894
+317  0.20507129 0.93158876 1.1904696
+318  0.068411244 0.79492871 1.1904696
+319  0.35310410 0.79792356 1.2997894
+320  0.79792356 0.64689590 1.2997894
+321  0.79492871 0.93158876 1.1904696
+322  0.64689590 0.79792356 1.2997894
+323  0.93158876 0.79492871 1.1904696
 324  0.75000000 0.62500000 0.50000000
 325  0.75000000 0.87500000 0.50000000
 326  0.62500000 0.75000000 0.50000000
@@ -1122,54 +1122,54 @@ DEAL:Test2.dim3::Start
 369  0.50000000 0.23808162 0.29668521
 370  0.50000000 0.11308162 0.17168521
 371  0.50000000 0.36308162 0.080178857
-372  0.79293901 0.79293901 1.0618458
-373  0.76431300 0.76431300 0.68728194
-374  0.88931300 0.76431300 0.81228194
-375  0.63931300 0.77623138 0.89059673
-376  0.76431300 0.88931300 0.81228194
-377  0.77623138 0.63931300 0.89059673
-378  0.20706099 0.79293901 1.0618458
-379  0.23568700 0.76431300 0.68728194
-380  0.36068700 0.77623138 0.89059673
-381  0.11068700 0.76431300 0.81228194
-382  0.23568700 0.88931300 0.81228194
-383  0.22376862 0.63931300 0.89059673
-384  0.79293901 0.20706099 1.0618458
-385  0.76431300 0.23568700 0.68728194
-386  0.88931300 0.23568700 0.81228194
-387  0.63931300 0.22376862 0.89059673
-388  0.77623138 0.36068700 0.89059673
-389  0.76431300 0.11068700 0.81228194
-390  0.20706099 0.20706099 1.0618458
-391  0.23568700 0.23568700 0.68728194
-392  0.36068700 0.22376862 0.89059673
-393  0.11068700 0.23568700 0.81228194
-394  0.22376862 0.36068700 0.89059673
-395  0.23568700 0.11068700 0.81228194
-396  0.76431300 0.76431300 0.31271806
-397  0.79293901 0.79293901 -0.061845824
-398  0.88931300 0.76431300 0.18771806
-399  0.63931300 0.77623138 0.10940327
-400  0.76431300 0.88931300 0.18771806
-401  0.77623138 0.63931300 0.10940327
-402  0.23568700 0.76431300 0.31271806
-403  0.20706099 0.79293901 -0.061845824
-404  0.36068700 0.77623138 0.10940327
-405  0.11068700 0.76431300 0.18771806
-406  0.23568700 0.88931300 0.18771806
-407  0.22376862 0.63931300 0.10940327
-408  0.76431300 0.23568700 0.31271806
-409  0.79293901 0.20706099 -0.061845824
-410  0.88931300 0.23568700 0.18771806
-411  0.63931300 0.22376862 0.10940327
-412  0.77623138 0.36068700 0.10940327
-413  0.76431300 0.11068700 0.18771806
-414  0.23568700 0.23568700 0.31271806
-415  0.20706099 0.20706099 -0.061845824
-416  0.36068700 0.22376862 0.10940327
-417  0.11068700 0.23568700 0.18771806
-418  0.22376862 0.36068700 0.10940327
-419  0.23568700 0.11068700 0.18771806
+372  0.77964741 0.77964741 1.0723364
+373  0.75988247 0.75988247 0.69077881
+374  0.88488247 0.75988247 0.81577881
+375  0.63488247 0.77180085 0.89409361
+376  0.75988247 0.88488247 0.81577881
+377  0.77180085 0.63488247 0.89409361
+378  0.22035259 0.77964741 1.0723364
+379  0.24011753 0.75988247 0.69077881
+380  0.36511753 0.77180085 0.89409361
+381  0.11511753 0.75988247 0.81577881
+382  0.24011753 0.88488247 0.81577881
+383  0.22819915 0.63488247 0.89409361
+384  0.77964741 0.22035259 1.0723364
+385  0.75988247 0.24011753 0.69077881
+386  0.88488247 0.24011753 0.81577881
+387  0.63488247 0.22819915 0.89409361
+388  0.77180085 0.36511753 0.89409361
+389  0.75988247 0.11511753 0.81577881
+390  0.22035259 0.22035259 1.0723364
+391  0.24011753 0.24011753 0.69077881
+392  0.36511753 0.22819915 0.89409361
+393  0.11511753 0.24011753 0.81577881
+394  0.22819915 0.36511753 0.89409361
+395  0.24011753 0.11511753 0.81577881
+396  0.75988247 0.75988247 0.30922119
+397  0.77964741 0.77964741 -0.072336443
+398  0.88488247 0.75988247 0.18422119
+399  0.63488247 0.77180085 0.10590639
+400  0.75988247 0.88488247 0.18422119
+401  0.77180085 0.63488247 0.10590639
+402  0.24011753 0.75988247 0.30922119
+403  0.22035259 0.77964741 -0.072336443
+404  0.36511753 0.77180085 0.10590639
+405  0.11511753 0.75988247 0.18422119
+406  0.24011753 0.88488247 0.18422119
+407  0.22819915 0.63488247 0.10590639
+408  0.75988247 0.24011753 0.30922119
+409  0.77964741 0.22035259 -0.072336443
+410  0.88488247 0.24011753 0.18422119
+411  0.63488247 0.22819915 0.10590639
+412  0.77180085 0.36511753 0.10590639
+413  0.75988247 0.11511753 0.18422119
+414  0.24011753 0.24011753 0.30922119
+415  0.22035259 0.22035259 -0.072336443
+416  0.36511753 0.22819915 0.10590639
+417  0.11511753 0.24011753 0.18422119
+418  0.22819915 0.36511753 0.10590639
+419  0.24011753 0.11511753 0.18422119
 420  0.12500000 0.0000000 0.12500000
 421  0.12500000 0.0000000 0.37500000
 422  0.37500000 0.0000000 0.12500000
@@ -1186,22 +1186,22 @@ DEAL:Test2.dim3::Start
 433  0.62500000 0.0000000 0.87500000
 434  0.87500000 0.0000000 0.62500000
 435  0.87500000 0.0000000 0.87500000
-436  0.072704575 0.072704575 -0.12035251
-437  0.34371293 0.048202298 -0.22211716
-438  0.048202298 0.34371293 -0.22211716
-439  0.34371668 0.34371668 -0.33734763
-440  0.65628707 0.048202298 -0.22211716
-441  0.92729543 0.072704575 -0.12035251
-442  0.65628332 0.34371668 -0.33734763
-443  0.95179770 0.34371293 -0.22211716
-444  0.048202298 0.65628707 -0.22211716
-445  0.34371668 0.65628332 -0.33734763
-446  0.072704575 0.92729543 -0.12035251
-447  0.34371293 0.95179770 -0.22211716
-448  0.65628332 0.65628332 -0.33734763
-449  0.95179770 0.65628707 -0.22211716
-450  0.65628707 0.95179770 -0.22211716
-451  0.92729543 0.92729543 -0.12035251
+436  0.080228272 0.080228272 -0.13054214
+437  0.35027890 0.053700050 -0.22691124
+438  0.053700050 0.35027890 -0.22691124
+439  0.34870930 0.34870930 -0.33917951
+440  0.64972110 0.053700050 -0.22691124
+441  0.91977173 0.080228272 -0.13054214
+442  0.65129070 0.34870930 -0.33917951
+443  0.94629995 0.35027890 -0.22691124
+444  0.053700050 0.64972110 -0.22691124
+445  0.34870930 0.65129070 -0.33917951
+446  0.080228272 0.91977173 -0.13054214
+447  0.35027890 0.94629995 -0.22691124
+448  0.65129070 0.65129070 -0.33917951
+449  0.94629995 0.64972110 -0.22691124
+450  0.64972110 0.94629995 -0.22691124
+451  0.91977173 0.91977173 -0.13054214
 452  0.0000000 0.12500000 0.12500000
 453  0.0000000 0.37500000 0.12500000
 454  0.0000000 0.12500000 0.37500000
@@ -1250,22 +1250,22 @@ DEAL:Test2.dim3::Start
 497  0.62500000 1.0000000 0.87500000
 498  0.87500000 1.0000000 0.62500000
 499  0.87500000 1.0000000 0.87500000
-500  0.072704575 0.072704575 1.1203525
-501  0.34371293 0.048202298 1.2221172
-502  0.048202298 0.34371293 1.2221172
-503  0.34371668 0.34371668 1.3373476
-504  0.65628707 0.048202298 1.2221172
-505  0.92729543 0.072704575 1.1203525
-506  0.65628332 0.34371668 1.3373476
-507  0.95179770 0.34371293 1.2221172
-508  0.048202298 0.65628707 1.2221172
-509  0.34371668 0.65628332 1.3373476
-510  0.072704575 0.92729543 1.1203525
-511  0.34371293 0.95179770 1.2221172
-512  0.65628332 0.65628332 1.3373476
-513  0.95179770 0.65628707 1.2221172
-514  0.65628707 0.95179770 1.2221172
-515  0.92729543 0.92729543 1.1203525
+500  0.080228272 0.080228272 1.1305421
+501  0.35027890 0.053700050 1.2269112
+502  0.053700050 0.35027890 1.2269112
+503  0.34870930 0.34870930 1.3391795
+504  0.64972110 0.053700050 1.2269112
+505  0.91977173 0.080228272 1.1305421
+506  0.65129070 0.34870930 1.3391795
+507  0.94629995 0.35027890 1.2269112
+508  0.053700050 0.64972110 1.2269112
+509  0.34870930 0.65129070 1.3391795
+510  0.080228272 0.91977173 1.1305421
+511  0.35027890 0.94629995 1.2269112
+512  0.65129070 0.65129070 1.3391795
+513  0.94629995 0.64972110 1.2269112
+514  0.64972110 0.94629995 1.2269112
+515  0.91977173 0.91977173 1.1305421
 516  0.87500000 0.62500000 0.50000000
 517  0.62500000 0.87500000 0.50000000
 518  0.87500000 0.87500000 0.50000000
@@ -1302,158 +1302,158 @@ DEAL:Test2.dim3::Start
 549  0.50000000 0.081747177 -0.034249037
 550  0.50000000 0.35596229 -0.13627648
 551  0.50000000 0.11904081 0.33584260
-552  0.88215650 0.88215650 0.78114097
-553  0.63215650 0.88811569 0.82029837
-554  0.88811569 0.63215650 0.82029837
-555  0.63811569 0.63811569 0.90520894
-556  0.91474314 0.78408393 0.99669923
-557  0.88215650 0.75715650 0.65614097
-558  0.64776390 0.79189552 1.0924772
-559  0.63215650 0.76311569 0.69529837
-560  0.78408393 0.91474314 0.99669923
-561  0.79189552 0.64776390 1.0924772
-562  0.75715650 0.88215650 0.65614097
-563  0.76311569 0.63215650 0.69529837
-564  0.36784350 0.88811569 0.82029837
-565  0.11784350 0.88215650 0.78114097
-566  0.36188431 0.63811569 0.90520894
-567  0.11188431 0.63215650 0.82029837
-568  0.35223610 0.79189552 1.0924772
-569  0.36784350 0.76311569 0.69529837
-570  0.085256857 0.78408393 0.99669923
-571  0.11784350 0.75715650 0.65614097
-572  0.21591607 0.91474314 0.99669923
-573  0.20810448 0.64776390 1.0924772
-574  0.24284350 0.88215650 0.65614097
-575  0.23688431 0.63215650 0.69529837
-576  0.88811569 0.36784350 0.82029837
-577  0.63811569 0.36188431 0.90520894
-578  0.88215650 0.11784350 0.78114097
-579  0.63215650 0.11188431 0.82029837
-580  0.91474314 0.21591607 0.99669923
-581  0.88215650 0.24284350 0.65614097
-582  0.64776390 0.20810448 1.0924772
-583  0.63215650 0.23688431 0.69529837
-584  0.79189552 0.35223610 1.0924772
-585  0.78408393 0.085256857 0.99669923
-586  0.76311569 0.36784350 0.69529837
-587  0.75715650 0.11784350 0.65614097
-588  0.36188431 0.36188431 0.90520894
-589  0.11188431 0.36784350 0.82029837
-590  0.36784350 0.11188431 0.82029837
-591  0.11784350 0.11784350 0.78114097
-592  0.35223610 0.20810448 1.0924772
-593  0.36784350 0.23688431 0.69529837
-594  0.085256857 0.21591607 0.99669923
-595  0.11784350 0.24284350 0.65614097
-596  0.20810448 0.35223610 1.0924772
-597  0.21591607 0.085256857 0.99669923
-598  0.23688431 0.36784350 0.69529837
-599  0.24284350 0.11784350 0.65614097
-600  0.88215650 0.88215650 0.21885903
-601  0.63215650 0.88811569 0.17970163
-602  0.88811569 0.63215650 0.17970163
-603  0.63811569 0.63811569 0.094791061
-604  0.88215650 0.75715650 0.34385903
-605  0.91474314 0.78408393 0.0033007733
-606  0.63215650 0.76311569 0.30470163
-607  0.64776390 0.79189552 -0.092477166
-608  0.75715650 0.88215650 0.34385903
-609  0.76311569 0.63215650 0.30470163
-610  0.78408393 0.91474314 0.0033007733
-611  0.79189552 0.64776390 -0.092477166
-612  0.36784350 0.88811569 0.17970163
-613  0.11784350 0.88215650 0.21885903
-614  0.36188431 0.63811569 0.094791061
-615  0.11188431 0.63215650 0.17970163
-616  0.36784350 0.76311569 0.30470163
-617  0.35223610 0.79189552 -0.092477166
-618  0.11784350 0.75715650 0.34385903
-619  0.085256857 0.78408393 0.0033007733
-620  0.24284350 0.88215650 0.34385903
-621  0.23688431 0.63215650 0.30470163
-622  0.21591607 0.91474314 0.0033007733
-623  0.20810448 0.64776390 -0.092477166
-624  0.88811569 0.36784350 0.17970163
-625  0.63811569 0.36188431 0.094791061
-626  0.88215650 0.11784350 0.21885903
-627  0.63215650 0.11188431 0.17970163
-628  0.88215650 0.24284350 0.34385903
-629  0.91474314 0.21591607 0.0033007733
-630  0.63215650 0.23688431 0.30470163
-631  0.64776390 0.20810448 -0.092477166
-632  0.76311569 0.36784350 0.30470163
-633  0.75715650 0.11784350 0.34385903
-634  0.79189552 0.35223610 -0.092477166
-635  0.78408393 0.085256857 0.0033007733
-636  0.36188431 0.36188431 0.094791061
-637  0.11188431 0.36784350 0.17970163
-638  0.36784350 0.11188431 0.17970163
-639  0.11784350 0.11784350 0.21885903
-640  0.36784350 0.23688431 0.30470163
-641  0.35223610 0.20810448 -0.092477166
-642  0.11784350 0.24284350 0.34385903
-643  0.085256857 0.21591607 0.0033007733
-644  0.23688431 0.36784350 0.30470163
-645  0.24284350 0.11784350 0.34385903
-646  0.20810448 0.35223610 -0.092477166
-647  0.21591607 0.085256857 0.0033007733
-648  0.095274037 0.095274037 0.049253259
-649  0.35577822 0.080043304 -0.021207762
-650  0.080043304 0.35577822 -0.021207762
-651  0.35280050 0.35280050 -0.12127828
-652  0.12142175 0.12142175 0.35942951
-653  0.37142175 0.11844215 0.33985082
-654  0.11844215 0.37142175 0.33985082
-655  0.64422178 0.080043304 -0.021207762
-656  0.90472596 0.095274037 0.049253259
-657  0.64719950 0.35280050 -0.12127828
-658  0.91995670 0.35577822 -0.021207762
-659  0.62857825 0.11844215 0.33985082
-660  0.87857825 0.12142175 0.35942951
-661  0.88155785 0.37142175 0.33985082
-662  0.080043304 0.64422178 -0.021207762
-663  0.35280050 0.64719950 -0.12127828
-664  0.095274037 0.90472596 0.049253259
-665  0.35577822 0.91995670 -0.021207762
-666  0.11844215 0.62857825 0.33985082
-667  0.12142175 0.87857825 0.35942951
-668  0.37142175 0.88155785 0.33985082
-669  0.64719950 0.64719950 -0.12127828
-670  0.91995670 0.64422178 -0.021207762
-671  0.64422178 0.91995670 -0.021207762
-672  0.90472596 0.90472596 0.049253259
-673  0.88155785 0.62857825 0.33985082
-674  0.62857825 0.88155785 0.33985082
-675  0.87857825 0.87857825 0.35942951
-676  0.12142175 0.12142175 0.64057049
-677  0.37142175 0.11844215 0.66014918
-678  0.11844215 0.37142175 0.66014918
-679  0.095274037 0.095274037 0.95074674
-680  0.35577822 0.080043304 1.0212078
-681  0.080043304 0.35577822 1.0212078
-682  0.35280050 0.35280050 1.1212783
-683  0.62857825 0.11844215 0.66014918
-684  0.87857825 0.12142175 0.64057049
-685  0.88155785 0.37142175 0.66014918
-686  0.64422178 0.080043304 1.0212078
-687  0.90472596 0.095274037 0.95074674
-688  0.64719950 0.35280050 1.1212783
-689  0.91995670 0.35577822 1.0212078
-690  0.11844215 0.62857825 0.66014918
-691  0.12142175 0.87857825 0.64057049
-692  0.37142175 0.88155785 0.66014918
-693  0.080043304 0.64422178 1.0212078
-694  0.35280050 0.64719950 1.1212783
-695  0.095274037 0.90472596 0.95074674
-696  0.35577822 0.91995670 1.0212078
-697  0.88155785 0.62857825 0.66014918
-698  0.62857825 0.88155785 0.66014918
-699  0.87857825 0.87857825 0.64057049
-700  0.64719950 0.64719950 1.1212783
-701  0.91995670 0.64422178 1.0212078
-702  0.64422178 0.91995670 1.0212078
-703  0.90472596 0.90472596 0.95074674
+552  0.87994124 0.87994124 0.78288941
+553  0.62994124 0.88590042 0.82204680
+554  0.88590042 0.62994124 0.82204680
+555  0.63590042 0.63590042 0.90695738
+556  0.90823561 0.77740559 1.0031242
+557  0.87994124 0.75494124 0.65788941
+558  0.64088919 0.78486220 1.0969415
+559  0.62994124 0.76090042 0.69704680
+560  0.77740559 0.90823561 1.0031242
+561  0.78486220 0.64088919 1.0969415
+562  0.75494124 0.87994124 0.65788941
+563  0.76090042 0.62994124 0.69704680
+564  0.37005876 0.88590042 0.82204680
+565  0.12005876 0.87994124 0.78288941
+566  0.36409958 0.63590042 0.90695738
+567  0.11409958 0.62994124 0.82204680
+568  0.35911081 0.78486220 1.0969415
+569  0.37005876 0.76090042 0.69704680
+570  0.091764387 0.77740559 1.0031242
+571  0.12005876 0.75494124 0.65788941
+572  0.22259441 0.90823561 1.0031242
+573  0.21513780 0.64088919 1.0969415
+574  0.24505876 0.87994124 0.65788941
+575  0.23909958 0.62994124 0.69704680
+576  0.88590042 0.37005876 0.82204680
+577  0.63590042 0.36409958 0.90695738
+578  0.87994124 0.12005876 0.78288941
+579  0.62994124 0.11409958 0.82204680
+580  0.90823561 0.22259441 1.0031242
+581  0.87994124 0.24505876 0.65788941
+582  0.64088919 0.21513780 1.0969415
+583  0.62994124 0.23909958 0.69704680
+584  0.78486220 0.35911081 1.0969415
+585  0.77740559 0.091764387 1.0031242
+586  0.76090042 0.37005876 0.69704680
+587  0.75494124 0.12005876 0.65788941
+588  0.36409958 0.36409958 0.90695738
+589  0.11409958 0.37005876 0.82204680
+590  0.37005876 0.11409958 0.82204680
+591  0.12005876 0.12005876 0.78288941
+592  0.35911081 0.21513780 1.0969415
+593  0.37005876 0.23909958 0.69704680
+594  0.091764387 0.22259441 1.0031242
+595  0.12005876 0.24505876 0.65788941
+596  0.21513780 0.35911081 1.0969415
+597  0.22259441 0.091764387 1.0031242
+598  0.23909958 0.37005876 0.69704680
+599  0.24505876 0.12005876 0.65788941
+600  0.87994124 0.87994124 0.21711059
+601  0.62994124 0.88590042 0.17795320
+602  0.88590042 0.62994124 0.17795320
+603  0.63590042 0.63590042 0.093042625
+604  0.87994124 0.75494124 0.34211059
+605  0.90823561 0.77740559 -0.0031241827
+606  0.62994124 0.76090042 0.30295320
+607  0.64088919 0.78486220 -0.096941523
+608  0.75494124 0.87994124 0.34211059
+609  0.76090042 0.62994124 0.30295320
+610  0.77740559 0.90823561 -0.0031241827
+611  0.78486220 0.64088919 -0.096941523
+612  0.37005876 0.88590042 0.17795320
+613  0.12005876 0.87994124 0.21711059
+614  0.36409958 0.63590042 0.093042625
+615  0.11409958 0.62994124 0.17795320
+616  0.37005876 0.76090042 0.30295320
+617  0.35911081 0.78486220 -0.096941523
+618  0.12005876 0.75494124 0.34211059
+619  0.091764387 0.77740559 -0.0031241827
+620  0.24505876 0.87994124 0.34211059
+621  0.23909958 0.62994124 0.30295320
+622  0.22259441 0.90823561 -0.0031241827
+623  0.21513780 0.64088919 -0.096941523
+624  0.88590042 0.37005876 0.17795320
+625  0.63590042 0.36409958 0.093042625
+626  0.87994124 0.12005876 0.21711059
+627  0.62994124 0.11409958 0.17795320
+628  0.87994124 0.24505876 0.34211059
+629  0.90823561 0.22259441 -0.0031241827
+630  0.62994124 0.23909958 0.30295320
+631  0.64088919 0.21513780 -0.096941523
+632  0.76090042 0.37005876 0.30295320
+633  0.75494124 0.12005876 0.34211059
+634  0.78486220 0.35911081 -0.096941523
+635  0.77740559 0.091764387 -0.0031241827
+636  0.36409958 0.36409958 0.093042625
+637  0.11409958 0.37005876 0.17795320
+638  0.37005876 0.11409958 0.17795320
+639  0.12005876 0.12005876 0.21711059
+640  0.37005876 0.23909958 0.30295320
+641  0.35911081 0.21513780 -0.096941523
+642  0.12005876 0.24505876 0.34211059
+643  0.091764387 0.22259441 -0.0031241827
+644  0.23909958 0.37005876 0.30295320
+645  0.24505876 0.12005876 0.34211059
+646  0.21513780 0.35911081 -0.096941523
+647  0.22259441 0.091764387 -0.0031241827
+648  0.10014352 0.10014352 0.043284225
+649  0.36016883 0.083899813 -0.024479020
+650  0.083899813 0.36016883 -0.024479020
+651  0.35640444 0.35640444 -0.12306844
+652  0.12252938 0.12252938 0.35855530
+653  0.37252938 0.11954979 0.33897660
+654  0.11954979 0.37252938 0.33897660
+655  0.63983117 0.083899813 -0.024479020
+656  0.89985648 0.10014352 0.043284225
+657  0.64359556 0.35640444 -0.12306844
+658  0.91610019 0.36016883 -0.024479020
+659  0.62747062 0.11954979 0.33897660
+660  0.87747062 0.12252938 0.35855530
+661  0.88045021 0.37252938 0.33897660
+662  0.083899813 0.63983117 -0.024479020
+663  0.35640444 0.64359556 -0.12306844
+664  0.10014352 0.89985648 0.043284225
+665  0.36016883 0.91610019 -0.024479020
+666  0.11954979 0.62747062 0.33897660
+667  0.12252938 0.87747062 0.35855530
+668  0.37252938 0.88045021 0.33897660
+669  0.64359556 0.64359556 -0.12306844
+670  0.91610019 0.63983117 -0.024479020
+671  0.63983117 0.91610019 -0.024479020
+672  0.89985648 0.89985648 0.043284225
+673  0.88045021 0.62747062 0.33897660
+674  0.62747062 0.88045021 0.33897660
+675  0.87747062 0.87747062 0.35855530
+676  0.12252938 0.12252938 0.64144470
+677  0.37252938 0.11954979 0.66102340
+678  0.11954979 0.37252938 0.66102340
+679  0.10014352 0.10014352 0.95671577
+680  0.36016883 0.083899813 1.0244790
+681  0.083899813 0.36016883 1.0244790
+682  0.35640444 0.35640444 1.1230684
+683  0.62747062 0.11954979 0.66102340
+684  0.87747062 0.12252938 0.64144470
+685  0.88045021 0.37252938 0.66102340
+686  0.63983117 0.083899813 1.0244790
+687  0.89985648 0.10014352 0.95671577
+688  0.64359556 0.35640444 1.1230684
+689  0.91610019 0.36016883 1.0244790
+690  0.11954979 0.62747062 0.66102340
+691  0.12252938 0.87747062 0.64144470
+692  0.37252938 0.88045021 0.66102340
+693  0.083899813 0.63983117 1.0244790
+694  0.35640444 0.64359556 1.1230684
+695  0.10014352 0.89985648 0.95671577
+696  0.36016883 0.91610019 1.0244790
+697  0.88045021 0.62747062 0.66102340
+698  0.62747062 0.88045021 0.66102340
+699  0.87747062 0.87747062 0.64144470
+700  0.64359556 0.64359556 1.1230684
+701  0.91610019 0.63983117 1.0244790
+702  0.63983117 0.91610019 1.0244790
+703  0.89985648 0.89985648 0.95671577
 1 3 hex     118 117 81 109 113 77 27 79 
 2 3 hex     117 119 108 81 77 111 78 27 
 3 3 hex     113 77 27 79 120 116 80 107 

diff --git a/tests/grid/grid_transform_3d.cc b/tests/grid/grid_transform_3d.cc
index 0a9adc1b7163d92a7019bd430e513236bbaad84c..fa79438dc740492639ef1b47f519f24102047186 100644 (file)
--- a/tests/grid/grid_transform_3d.cc
+++ b/tests/grid/grid_transform_3d.cc
@@ -62,6 +62,14 @@ int main ()
       cell->set_coarsen_flag ();
   tria.execute_coarsening_and_refinement();
 
+  {
+    GridOut grid_out;
+    std::ofstream out("output_before.vtk");
+    out.precision (5);
+    out << std::fixed;
+    grid_out.write_vtk(tria, out);
+  }
+
 
   Triangulation<dim>::face_iterator face;
   for (cell=tria.begin_active(); cell!=endc; ++cell)
@@ -84,6 +92,14 @@ int main ()
             }
       }
 
+  {
+    GridOut grid_out;
+    std::ofstream out("output_after.vtk");
+    out.precision (5);
+    out << std::fixed;
+    grid_out.write_vtk(tria, out);
+  }
+
   GridTools::laplace_transform<dim> (new_points, tria, nullptr, true);
 
 

diff --git a/tests/grid/normal_vector_01.cc b/tests/grid/normal_vector_01.cc
index 933d4fbc110b82cd02aaf2317f8855c1bf006659..4a24a16c7ce9fecb6d10c3a51a918841dac74d2b 100644 (file)
--- a/tests/grid/normal_vector_01.cc
+++ b/tests/grid/normal_vector_01.cc
@@ -23,7 +23,7 @@
 #include "../tests.h"
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_generator.h>
@@ -63,8 +63,8 @@ int main ()
   deallog.attach(logfile);
 
   Triangulation<3> tria;
-  StraightBoundary<3> boundary;
-  Boundary<3>::FaceVertexNormals normals;
+  FlatManifold<3> boundary;
+  Manifold<3>::FaceVertexNormals normals;
   for (unsigned int case_no=0; case_no<2; ++case_no)
     {
       deallog << "Case" << case_no << std::endl;

diff --git a/tests/grid/normal_vector_01_2d.cc b/tests/grid/normal_vector_01_2d.cc
index c48b5173f7c1a19a4a07d5537375c2c8232a86fa..c8d9a1ceb683116302200cb0da1d35e6f22ac492 100644 (file)
--- a/tests/grid/normal_vector_01_2d.cc
+++ b/tests/grid/normal_vector_01_2d.cc
@@ -15,15 +15,15 @@
 
 
 
-// test that at the vertices, Boundary::normal_vector returns the same as
-// Boundary::get_normals_at_vertices once the latter vectors are normalized
+// test that at the vertices, Manifold::normal_vector returns the same as
+// Manifold::get_normals_at_vertices once the latter vectors are normalized
 
 
 
 #include "../tests.h"
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_generator.h>
@@ -63,8 +63,8 @@ int main ()
   deallog.attach(logfile);
 
   Triangulation<2> tria;
-  StraightBoundary<2> boundary;
-  Boundary<2>::FaceVertexNormals normals;
+  FlatManifold<2> boundary;
+  Manifold<2>::FaceVertexNormals normals;
   for (unsigned int case_no=0; case_no<2; ++case_no)
     {
       deallog << "Case" << case_no << std::endl;

diff --git a/tests/grid/normal_vector_03.cc b/tests/grid/normal_vector_03.cc
index e2ece1d968c5e3ec96a2dd32096585bf8a66d8ab..8020f896768d9764e278eed194baf22b25d46fc1 100644 (file)
--- a/tests/grid/normal_vector_03.cc
+++ b/tests/grid/normal_vector_03.cc
@@ -23,7 +23,7 @@
 #include "../tests.h"
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_generator.h>
@@ -66,8 +66,8 @@ int main ()
   FE_Q<2> linear_interpolator(1);
 
   Triangulation<3> tria;
-  StraightBoundary<3> boundary;
-  Boundary<3>::FaceVertexNormals normals;
+  FlatManifold<3> boundary;
+  Manifold<3>::FaceVertexNormals normals;
   for (unsigned int case_no=0; case_no<2; ++case_no)
     {
       deallog << "Case" << case_no << std::endl;

diff --git a/tests/grid/normal_vector_03_2d.cc b/tests/grid/normal_vector_03_2d.cc
index 8663a533b70fa96dd7d3a9bf5690427fc5baf78c..cef80545099b5352372a8e665dec6f1026db7d11 100644 (file)
--- a/tests/grid/normal_vector_03_2d.cc
+++ b/tests/grid/normal_vector_03_2d.cc
@@ -66,8 +66,8 @@ int main ()
   FE_Q<2> linear_interpolator(1);
 
   Triangulation<2> tria;
-  StraightBoundary<2> boundary;
-  Boundary<2>::FaceVertexNormals normals;
+  FlatManifold<2> boundary;
+  Manifold<2>::FaceVertexNormals normals;
   for (unsigned int case_no=0; case_no<2; ++case_no)
     {
       deallog << "Case" << case_no << std::endl;

diff --git a/tests/grid/normals_at_vertices_01.cc b/tests/grid/normals_at_vertices_01.cc
index ee12e2944318aedf377d3db3207d30107a21c1af..5b3b84f7743b1aee60361ea552e5e14bb9276268 100644 (file)
--- a/tests/grid/normals_at_vertices_01.cc
+++ b/tests/grid/normals_at_vertices_01.cc
@@ -22,7 +22,7 @@
 #include "../tests.h"
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/grid_generator.h>
@@ -62,8 +62,8 @@ int main ()
   deallog.attach(logfile);
 
   Triangulation<3> tria;
-  StraightBoundary<3> boundary;
-  Boundary<3>::FaceVertexNormals normals;
+  FlatManifold<3> boundary;
+  Manifold<3>::FaceVertexNormals normals;
   for (unsigned int case_no=0; case_no<2; ++case_no)
     {
       deallog << "Case" << case_no << std::endl;

diff --git a/tests/mappings/mapping_real_to_unit_q4_straight.cc b/tests/mappings/mapping_real_to_unit_q4_straight.cc
index a449abec0f8245a69247f7af2a7f5794e08f3dd0..d286f84bba46f713b04bb52ba42c4e19a9ed9555 100644 (file)
--- a/tests/mappings/mapping_real_to_unit_q4_straight.cc
+++ b/tests/mappings/mapping_real_to_unit_q4_straight.cc
@@ -21,7 +21,7 @@
 // we had in the beginning.
 //
 // this test is like the _q1 test but uses a Q4 mapping. however,
-// since we use StraightBoundary objects to describe the boundary, we
+// since we use FlatManifold objects to describe the boundary, we
 // should really get nothing different since the mapping is, in
 // reality, still (bi-/tri-)linear
 

diff --git a/tests/numerics/no_flux_14.output b/tests/numerics/no_flux_14.output
index a34b5e2424698f735e84faa4bda3aa49efce4b00..c08b12a1e5f5bb9c4293669bb0f6307a7b776fa3 100644 (file)
--- a/tests/numerics/no_flux_14.output
+++ b/tests/numerics/no_flux_14.output
@@ -19,26 +19,26 @@
     46 = 0
     45 43:  -0.4142
     47 = 0
-    68 66:  -0.4889
-    68 70:  -0.9881
-    69 67:  -0.4929
-    69 71:  -1.0000
-    86 84:  -0.4142
+    68 66:  -0.4790
+    68 70:  -0.9589
+    69 67:  -0.4576
+    69 71:  -0.8955
+    86 84:  -0.3845
     86 88:  -0.4142
-    87 85:  -0.2948
+    87 85:  -0.3313
     87 89:  -0.4142
     92 90:  -1.0000
     92 94:  -0.3789
     93 91:  -1.0000
     93 95:  -0.3789
-    136 132:  -0.2825
-    136 140:  -0.3778
-    137 133:  -0.4142
-    137 141:  -0.3831
-    138 134:  -0.3716
-    138 142:  -0.2599
-    139 135:  -0.2916
-    139 143:  -0.2447
+    136 132:  -0.3818
+    136 140:  -0.3818
+    137 133:  -0.3232
+    137 141:  -0.3794
+    138 134:  -0.3762
+    138 142:  -0.3146
+    139 135:  -0.3059
+    139 143:  -0.3059
     152 = 0
     153 = 0
     154 = 0
@@ -63,10 +63,10 @@
     221 = 0
     224 = 0
     225 = 0
-    234 236:  -0.4929
-    234 238:  -1.0000
-    235 237:  -0.4889
-    235 239:  -0.9881
+    234 236:  -0.4576
+    234 238:  -0.8955
+    235 237:  -0.4790
+    235 239:  -0.9589
     242 = 0
     243 = 0
     246 250:  -0.4142
@@ -77,14 +77,14 @@
     257 = 0
     258 = 0
     259 = 0
-    276 280:  -0.3716
-    276 284:  -0.2599
-    277 281:  -0.2916
-    277 285:  -0.2447
-    278 282:  -0.2825
-    278 286:  -0.3778
-    279 283:  -0.4142
-    279 287:  -0.3831
+    276 280:  -0.3762
+    276 284:  -0.3146
+    277 281:  -0.3059
+    277 285:  -0.3059
+    278 282:  -0.3818
+    278 286:  -0.3818
+    279 283:  -0.3232
+    279 287:  -0.3794
     296 = 0
     297 = 0
     298 = 0
@@ -100,18 +100,18 @@
     358 354:  -0.4142
     357 = 0
     359 355:  -0.4142
-    370 366:  -0.4023
+    370 366:  -0.4059
     370 368:  -0.4142
-    371 367:  -0.4142
+    371 367:  -0.4112
     371 369:  -0.4142
-    404 396:  -0.4142
-    404 400:  -0.4112
-    405 397:  -0.4112
-    405 401:  -0.4142
-    406 398:  -0.4059
-    406 402:  -0.4142
-    407 399:  -0.4112
-    407 403:  -0.4142
+    404 396:  -0.4056
+    404 400:  -0.4109
+    405 397:  -0.4111
+    405 401:  -0.4111
+    406 398:  -0.4049
+    406 402:  -0.4049
+    407 399:  -0.4109
+    407 403:  -0.4056
     412 = 0
     413 = 0
     414 = 0