From 39a06f9f23ffccf91794397307207277e9e207a5 Mon Sep 17 00:00:00 2001 From: heltai Date: Wed, 15 Jan 2014 00:25:27 +0000 Subject: [PATCH] Reverted back to trunk/tests, dropping explicit changes from Boundary to Manifold. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32209 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/cone_01.cc | 4 +- tests/bits/cylinder_01.cc | 8 +- tests/bits/cylinder_02.cc | 6 +- tests/bits/cylinder_03.cc | 6 +- tests/bits/cylinder_04.cc | 7 +- tests/bits/distorted_cells_03.cc | 6 +- tests/bits/distorted_cells_04.cc | 6 +- tests/bits/distorted_cells_05.cc | 6 +- tests/bits/distorted_cells_06.cc | 6 +- tests/bits/distorted_mapped_cells_02.cc | 6 +- tests/bits/fe_field_function_04.cc | 6 +- tests/bits/fe_field_function_04_vector.cc | 6 +- tests/bits/fe_field_function_05.cc | 6 +- tests/bits/fe_field_function_05_vector.cc | 6 +- tests/bits/fe_field_function_06_vector.cc | 6 +- tests/bits/fe_field_function_07_vector.cc | 6 +- tests/bits/fe_field_function_08_vector.cc | 6 +- tests/bits/joa_1.cc | 6 +- tests/bits/step-10-high-order.cc | 10 +- tests/bits/step-10.cc | 14 +- tests/bits/step-11.cc | 6 +- tests/bits/step-5.cc | 6 +- tests/bits/step-6.cc | 6 +- tests/codim_one/boundary_indicator_01.cc | 14 +- tests/codim_one/data_out_03.cc | 17 +- tests/codim_one/extract_boundary_mesh_02.cc | 10 +- tests/codim_one/extract_boundary_mesh_03.cc | 10 +- tests/codim_one/extract_boundary_mesh_04.cc | 14 +- tests/codim_one/grid_refinement.cc | 4 +- tests/codim_one/mapping_01.cc | 6 +- tests/codim_one/mapping_02.cc | 6 +- tests/codim_one/torus_01.cc | 4 +- tests/deal.II/boundaries.cc | 6 +- tests/deal.II/dof_test.cc | 20 +- tests/deal.II/fe_values_view_01.cc | 6 +- tests/deal.II/fe_values_view_02.cc | 6 +- tests/deal.II/fe_values_view_03.cc | 6 +- tests/deal.II/fe_values_view_04.cc | 6 +- tests/deal.II/fe_values_view_05.cc | 6 +- tests/deal.II/fe_values_view_06.cc | 6 +- tests/deal.II/fe_values_view_07.cc | 6 +- tests/deal.II/fe_values_view_08.cc | 6 +- tests/deal.II/fe_values_view_09.cc | 6 +- tests/deal.II/fe_values_view_10.cc | 6 +- tests/deal.II/fe_values_view_10_single_01.cc | 6 +- tests/deal.II/fe_values_view_10_single_02.cc | 6 +- tests/deal.II/fe_values_view_10_single_03.cc | 6 +- tests/deal.II/fe_values_view_10_single_04.cc | 6 +- tests/deal.II/fe_values_view_11.cc | 6 +- tests/deal.II/fe_values_view_12.cc | 6 +- tests/deal.II/fe_values_view_13.cc | 6 +- tests/deal.II/fe_values_view_14.cc | 6 +- tests/deal.II/fe_values_view_15.cc | 6 +- tests/deal.II/fe_values_view_16.cc | 6 +- tests/deal.II/fe_values_view_17.cc | 6 +- tests/deal.II/fe_values_view_18.cc | 6 +- tests/deal.II/fe_values_view_19.cc | 6 +- tests/deal.II/fe_values_view_20.cc | 6 +- tests/deal.II/fe_values_view_23.cc | 6 +- .../deal.II/fe_values_view_23_nonsymmetric.cc | 6 +- tests/deal.II/fe_values_view_24.cc | 6 +- .../deal.II/fe_values_view_24_nonsymmetric.cc | 6 +- tests/deal.II/grid_hyper_shell.cc | 6 +- tests/deal.II/grid_hyper_shell_02.cc | 6 +- tests/deal.II/grid_hyper_shell_03.cc | 6 +- tests/deal.II/grid_hyper_shell_04.cc | 6 +- tests/deal.II/grid_out.cc | 8 +- tests/deal.II/grid_output_input.cc | 12 +- tests/deal.II/grid_test.cc | 24 +- tests/deal.II/grid_tools_03.cc | 6 +- tests/deal.II/grid_transform.cc | 12 +- tests/deal.II/grid_transform_3d.cc | 6 +- tests/deal.II/memory_consumption_01.cc | 6 +- tests/deal.II/no_flux_03.cc | 6 +- tests/deal.II/no_flux_04.cc | 6 +- tests/deal.II/no_flux_05.cc | 6 +- tests/deal.II/no_flux_10.cc | 30 +- tests/deal.II/no_flux_hp_03.cc | 6 +- tests/deal.II/no_flux_hp_04.cc | 6 +- tests/deal.II/no_flux_hp_05.cc | 6 +- tests/deal.II/normal_flux_03.cc | 6 +- tests/deal.II/project_01_curved_boundary.cc | 6 +- tests/deal.II/project_to_surface_01.cc | 4 +- tests/deal.II/project_to_surface_02.cc | 4 +- tests/deal.II/project_to_surface_03.cc | 4 +- tests/fe/cell_similarity_01.cc | 8 +- tests/fe/cell_similarity_02.cc | 8 +- tests/fe/cell_similarity_03.cc | 8 +- tests/fe/cell_similarity_04.cc | 8 +- tests/fe/cell_similarity_05.cc | 8 +- tests/fe/cell_similarity_06.cc | 8 +- tests/fe/cell_similarity_07.cc | 8 +- tests/fe/cell_similarity_08.cc | 8 +- tests/fe/cell_similarity_09.cc | 8 +- tests/fe/cell_similarity_10.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_01.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_02.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_03.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_04.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_05.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_06.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_07.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_08.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_09.cc | 8 +- tests/fe/cell_similarity_dgp_monomial_10.cc | 8 +- .../cell_similarity_dgp_nonparametric_01.cc | 8 +- .../cell_similarity_dgp_nonparametric_02.cc | 8 +- .../cell_similarity_dgp_nonparametric_03.cc | 8 +- .../cell_similarity_dgp_nonparametric_04.cc | 8 +- .../cell_similarity_dgp_nonparametric_05.cc | 8 +- .../cell_similarity_dgp_nonparametric_06.cc | 8 +- .../cell_similarity_dgp_nonparametric_07.cc | 8 +- .../cell_similarity_dgp_nonparametric_08.cc | 8 +- .../cell_similarity_dgp_nonparametric_09.cc | 8 +- .../cell_similarity_dgp_nonparametric_10.cc | 8 +- tests/fe/jacobians.cc | 6 +- tests/fe/mapping.cc | 18 +- tests/fe/mapping_real_to_unit_02.cc | 8 +- tests/fe/mapping_real_to_unit_q4_curved.cc | 6 +- .../mapping_real_to_unit_q4_curved_codim.cc | 6 +- tests/fe/mapping_real_to_unit_q4_sphere.cc | 6 +- tests/fe/mapping_real_to_unit_q4_sphere_x.cc | 6 +- tests/fe/mapping_real_to_unit_q4_sphere_y.cc | 6 +- tests/fe/mapping_real_to_unit_q4_sphere_z.cc | 6 +- tests/grid/grid_generator_01a.cc | 6 +- tests/hp/project_01_curved_boundary.cc | 6 +- tests/hp/step-10.cc | 14 +- tests/hp/step-11.cc | 6 +- tests/hp/step-11_compressed_set_sparsity.cc | 6 +- tests/hp/step-5.cc | 6 +- tests/hp/step-6.cc | 6 +- tests/lac/precondition_chebyshev_01.output | 6 - tests/manifold/CMakeLists.txt | 5 - tests/manifold/manifold_id_01.cc | 66 - tests/manifold/manifold_id_01.output | 114 -- tests/manifold/manifold_id_02.cc | 74 - tests/manifold/manifold_id_02.output | 114 -- tests/manifold/manifold_id_03.cc | 73 - tests/manifold/manifold_id_03.output | 114 -- tests/manifold/manifold_id_04.cc | 72 - tests/manifold/manifold_id_04.output | 114 -- tests/manifold/manifold_id_05.cc | 81 - tests/manifold/manifold_id_05.output | 957 ---------- tests/manifold/manifold_id_06.cc | 82 - tests/manifold/manifold_id_06.output | 1601 ----------------- tests/manifold/manifold_id_07.cc | 84 - tests/manifold/manifold_id_07.output | 957 ---------- tests/matrix_free/get_functions_circle.cc | 4 +- tests/matrix_free/get_functions_gl.cc | 4 +- tests/matrix_free/get_functions_mappingq.cc | 4 +- .../get_functions_q_hierarchical.cc | 4 +- tests/matrix_free/get_functions_rect.cc | 4 +- tests/matrix_free/get_values_plain.cc | 8 +- tests/matrix_free/integrate_functions.cc | 6 +- .../integrate_functions_multife.cc | 6 +- tests/matrix_free/matrix_vector_04.cc | 6 +- tests/matrix_free/matrix_vector_07.cc | 4 +- tests/matrix_free/matrix_vector_curl.cc | 6 +- tests/matrix_free/matrix_vector_hp.cc | 4 +- tests/matrix_free/matrix_vector_mg.cc | 4 +- .../matrix_vector_stokes_noflux.cc | 8 +- tests/matrix_free/no_index_initialize.cc | 6 +- tests/matrix_free/quadrature_points.cc | 6 +- tests/mpi/multigrid_adaptive.cc | 6 +- tests/mpi/multigrid_uniform.cc | 6 +- tests/mpi/p4est_2d_constraintmatrix_03.cc | 12 +- tests/mpi/p4est_2d_constraintmatrix_04.cc | 12 +- tests/mpi/p4est_3d_constraintmatrix_03.cc | 12 +- tests/multigrid/step-16-02.cc | 6 +- tests/multigrid/step-16.cc | 6 +- 170 files changed, 561 insertions(+), 5073 deletions(-) delete mode 100644 tests/lac/precondition_chebyshev_01.output delete mode 100644 tests/manifold/CMakeLists.txt delete mode 100644 tests/manifold/manifold_id_01.cc delete mode 100644 tests/manifold/manifold_id_01.output delete mode 100644 tests/manifold/manifold_id_02.cc delete mode 100644 tests/manifold/manifold_id_02.output delete mode 100644 tests/manifold/manifold_id_03.cc delete mode 100644 tests/manifold/manifold_id_03.output delete mode 100644 tests/manifold/manifold_id_04.cc delete mode 100644 tests/manifold/manifold_id_04.output delete mode 100644 tests/manifold/manifold_id_05.cc delete mode 100644 tests/manifold/manifold_id_05.output delete mode 100644 tests/manifold/manifold_id_06.cc delete mode 100644 tests/manifold/manifold_id_06.output delete mode 100644 tests/manifold/manifold_id_07.cc delete mode 100644 tests/manifold/manifold_id_07.output diff --git a/tests/bits/cone_01.cc b/tests/bits/cone_01.cc index ce008405b7..b3f8ecf095 100644 --- a/tests/bits/cone_01.cc +++ b/tests/bits/cone_01.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ void check () p1[0] = -1; p2[0] = 1; static const ConeBoundary boundary (1, 0.5, p1, p2); - triangulation.set_manifold (0, boundary); + triangulation.set_boundary (0, boundary); triangulation.refine_global (2); diff --git a/tests/bits/cylinder_01.cc b/tests/bits/cylinder_01.cc index 553a8d3bc1..0a758c26b5 100644 --- a/tests/bits/cylinder_01.cc +++ b/tests/bits/cylinder_01.cc @@ -16,14 +16,14 @@ -// check the cells generated by the CylinderManifold the default +// check the cells generated by the CylinderBoundary the default // axiparallel cylinder #include "../tests.h" #include #include #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ void check () { Triangulation triangulation; GridGenerator::cylinder (triangulation); - static const CylinderManifold boundary (0); - triangulation.set_manifold (0, boundary); + static const CylinderBoundary boundary (1,0); + triangulation.set_boundary (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_02.cc b/tests/bits/cylinder_02.cc index 6430842c34..00ad1f9c19 100644 --- a/tests/bits/cylinder_02.cc +++ b/tests/bits/cylinder_02.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,8 +54,8 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderManifold boundary (1); - triangulation.set_manifold (0, boundary); + static const CylinderBoundary boundary (1,1); + triangulation.set_boundary (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_03.cc b/tests/bits/cylinder_03.cc index b7c93e5323..b61ad237c3 100644 --- a/tests/bits/cylinder_03.cc +++ b/tests/bits/cylinder_03.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,8 +51,8 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderManifold boundary (2); - triangulation.set_manifold (0, boundary); + static const CylinderBoundary boundary (1,2); + triangulation.set_boundary (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_04.cc b/tests/bits/cylinder_04.cc index 34572de73f..ea6ffa2f34 100644 --- a/tests/bits/cylinder_04.cc +++ b/tests/bits/cylinder_04.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,9 +55,10 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderManifold boundary (Point(std::cos(xy_angle), std::sin(xy_angle), 0), + static const CylinderBoundary boundary (1, + Point(std::cos(xy_angle), std::sin(xy_angle), 0), Point()); - triangulation.set_manifold (0, boundary); + triangulation.set_boundary (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/distorted_cells_03.cc b/tests/bits/distorted_cells_03.cc index 5f1eca12c3..0e16552ed8 100644 --- a/tests/bits/distorted_cells_03.cc +++ b/tests/bits/distorted_cells_03.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,8 +86,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); - coarse_grid.set_manifold (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); + coarse_grid.set_boundary (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_04.cc b/tests/bits/distorted_cells_04.cc index b6c693af6a..715cbd5759 100644 --- a/tests/bits/distorted_cells_04.cc +++ b/tests/bits/distorted_cells_04.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,8 +119,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); - coarse_grid.set_manifold (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); + coarse_grid.set_boundary (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_05.cc b/tests/bits/distorted_cells_05.cc index bc03396ff8..7fe258c245 100644 --- a/tests/bits/distorted_cells_05.cc +++ b/tests/bits/distorted_cells_05.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,8 +121,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); - coarse_grid.set_manifold (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); + coarse_grid.set_boundary (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_06.cc b/tests/bits/distorted_cells_06.cc index 8c433a0e49..7e8bae09bf 100644 --- a/tests/bits/distorted_cells_06.cc +++ b/tests/bits/distorted_cells_06.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,8 +79,8 @@ void check () if (coarse_grid.begin_active()->face(f)->line(e)->center()[0] == 0) if (coarse_grid.begin_active()->face(f)->line(e)->center()[1] == 0.5) if (coarse_grid.begin_active()->face(f)->line(e)->center()[2] == 0) - coarse_grid.begin_active()->face(f)->line(e)->set_manifold_indicator (99); - coarse_grid.set_manifold (99, my_boundary); + coarse_grid.begin_active()->face(f)->line(e)->set_boundary_indicator (99); + coarse_grid.set_boundary (99, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_mapped_cells_02.cc b/tests/bits/distorted_mapped_cells_02.cc index dafdce0272..14c0128241 100644 --- a/tests/bits/distorted_mapped_cells_02.cc +++ b/tests/bits/distorted_mapped_cells_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include void test() @@ -35,8 +35,8 @@ void test() // shell is so narrow that MappingQ(2) distorts the cell GridGenerator::quarter_hyper_shell (tria, Point(), 0.95, 1, 1); - static PolarManifold boundary; - tria.set_manifold (0, boundary); + static HyperShellBoundary boundary; + tria.set_boundary (0, boundary); FE_Nothing dummy; MappingQ mapping(2); diff --git a/tests/bits/fe_field_function_04.cc b/tests/bits/fe_field_function_04.cc index 4db00c3473..cfbe9d6906 100644 --- a/tests/bits/fe_field_function_04.cc +++ b/tests/bits/fe_field_function_04.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,11 +48,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FE_Q fe(2); diff --git a/tests/bits/fe_field_function_04_vector.cc b/tests/bits/fe_field_function_04_vector.cc index 321151aa24..1d5876637b 100644 --- a/tests/bits/fe_field_function_04_vector.cc +++ b/tests/bits/fe_field_function_04_vector.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,11 +51,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_05.cc b/tests/bits/fe_field_function_05.cc index 230d70d612..080b703436 100644 --- a/tests/bits/fe_field_function_05.cc +++ b/tests/bits/fe_field_function_05.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,11 +52,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FE_Q fe(2); diff --git a/tests/bits/fe_field_function_05_vector.cc b/tests/bits/fe_field_function_05_vector.cc index e81bcc21a5..3bbc04d690 100644 --- a/tests/bits/fe_field_function_05_vector.cc +++ b/tests/bits/fe_field_function_05_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,11 +56,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_06_vector.cc b/tests/bits/fe_field_function_06_vector.cc index 5adcc3bcdf..dba992f305 100644 --- a/tests/bits/fe_field_function_06_vector.cc +++ b/tests/bits/fe_field_function_06_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,11 +56,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_07_vector.cc b/tests/bits/fe_field_function_07_vector.cc index fce7cb69cd..1b77cd426a 100644 --- a/tests/bits/fe_field_function_07_vector.cc +++ b/tests/bits/fe_field_function_07_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,11 +65,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_08_vector.cc b/tests/bits/fe_field_function_08_vector.cc index c29a84c8c4..39d88e7be3 100644 --- a/tests/bits/fe_field_function_08_vector.cc +++ b/tests/bits/fe_field_function_08_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,11 +65,11 @@ public: template void test() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (4),2); diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index 2962c4ce99..8c5b45a5aa 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -1044,8 +1044,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } diff --git a/tests/bits/step-10-high-order.cc b/tests/bits/step-10-high-order.cc index ff422ac458..c88304ad58 100644 --- a/tests/bits/step-10-high-order.cc +++ b/tests/bits/step-10-high-order.cc @@ -32,7 +32,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -62,8 +62,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); MappingQ mapping(degree); const FE_Q dummy_fe (1); @@ -134,8 +134,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); const MappingQ mapping (degree); const FE_Q fe (1); diff --git a/tests/bits/step-10.cc b/tests/bits/step-10.cc index bacdb62d74..2e855f4f6d 100644 --- a/tests/bits/step-10.cc +++ b/tests/bits/step-10.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ void gnuplot_output() Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); for (unsigned int refinement=0; refinement<2; ++refinement, triangulation.refine_global(1)) @@ -99,8 +99,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); MappingQ mapping(degree); @@ -166,8 +166,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); const MappingQ mapping (degree); const FE_Q fe (1); diff --git a/tests/bits/step-11.cc b/tests/bits/step-11.cc index a88b70875c..28d97a1eab 100644 --- a/tests/bits/step-11.cc +++ b/tests/bits/step-11.cc @@ -35,7 +35,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -197,8 +197,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc index e183d669c0..2a825122fd 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -48,7 +48,7 @@ std::ofstream logfile("output"); #include -#include +#include #include #include @@ -306,8 +306,8 @@ void LaplaceProblem::run () grid_in.read_ucd (input_file); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); } deallog << " Number of active cells: " diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index d61122cc32..8fa10830c4 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -39,7 +39,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -338,8 +338,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc index adc0c4c592..5f9d260a38 100644 --- a/tests/codim_one/boundary_indicator_01.cc +++ b/tests/codim_one/boundary_indicator_01.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -59,10 +59,10 @@ int main () const int dim = 3; deallog << "Testing hyper_cube in dim: " << dim << "..."<< endl; - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - volume_mesh.set_manifold (0, boundary_description); + volume_mesh.set_boundary (0, boundary_description); // exclude one of the 6 faces // from the surface mesh @@ -75,7 +75,7 @@ int main () for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) { - cell->face(f)->set_manifold_id(1); + cell->face(f)->set_boundary_indicator(1); done = true; break; } @@ -83,9 +83,9 @@ int main () break; } - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (0, surface_description); + boundary_mesh.set_boundary (0, surface_description); // now extract a mesh of the 5 // surface faces @@ -108,7 +108,7 @@ int main () cell != boundary_mesh.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) - cell->face(f)->set_manifold_id(1); + cell->face(f)->set_boundary_indicator(1); boundary_mesh.refine_global (2); diff --git a/tests/codim_one/data_out_03.cc b/tests/codim_one/data_out_03.cc index f37697cf27..b37193f334 100644 --- a/tests/codim_one/data_out_03.cc +++ b/tests/codim_one/data_out_03.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -79,17 +79,17 @@ int main () std::map< Triangulation<2,3>::cell_iterator, Triangulation<3,3>::face_iterator> surface_to_volume_mapping; - PolarManifold<3> boundary_description; + HyperBallBoundary<3> boundary_description; Triangulation<3> volume_mesh; GridGenerator::half_hyper_ball(volume_mesh); - volume_mesh.set_manifold (1, boundary_description); - volume_mesh.set_manifold (0, boundary_description); + volume_mesh.set_boundary (1, boundary_description); + volume_mesh.set_boundary (0, boundary_description); - static PolarManifold<3> surface_description; - tria.set_manifold (1, surface_description); - tria.set_manifold (0, surface_description); + static HyperBallBoundary<2,3> surface_description; + tria.set_boundary (1, surface_description); + tria.set_boundary (0, surface_description); std::set boundary_ids; boundary_ids.insert(0); @@ -124,8 +124,9 @@ int main () data_out.write_gnuplot (deallog.get_file_stream()); + dh_test.clear(); - tria.set_manifold(0); + tria.set_boundary(0); return 0; } diff --git a/tests/codim_one/extract_boundary_mesh_02.cc b/tests/codim_one/extract_boundary_mesh_02.cc index 391f848382..573a45066d 100644 --- a/tests/codim_one/extract_boundary_mesh_02.cc +++ b/tests/codim_one/extract_boundary_mesh_02.cc @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -96,15 +96,15 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - volume_mesh.set_manifold (0, boundary_description); + volume_mesh.set_boundary (0, boundary_description); volume_mesh.refine_global (1); - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (0, surface_description); + boundary_mesh.set_boundary (0, surface_description); surface_to_volume_mapping = GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/extract_boundary_mesh_03.cc b/tests/codim_one/extract_boundary_mesh_03.cc index 532555ca71..b820cb4391 100644 --- a/tests/codim_one/extract_boundary_mesh_03.cc +++ b/tests/codim_one/extract_boundary_mesh_03.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); for (Triangulation::active_cell_iterator @@ -113,12 +113,12 @@ int main () for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) cell->face(f)->set_all_boundary_indicators (1); - volume_mesh.set_manifold (1, boundary_description); + volume_mesh.set_boundary (1, boundary_description); volume_mesh.refine_global (1); - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (1, surface_description); + boundary_mesh.set_boundary (1, surface_description); surface_to_volume_mapping = GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/extract_boundary_mesh_04.cc b/tests/codim_one/extract_boundary_mesh_04.cc index d63557c293..942651a808 100644 --- a/tests/codim_one/extract_boundary_mesh_04.cc +++ b/tests/codim_one/extract_boundary_mesh_04.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); for (Triangulation::active_cell_iterator @@ -114,14 +114,14 @@ int main () if (cell->at_boundary(f) && (cell->center()[dim-1]>0)) cell->face(f)->set_all_boundary_indicators (1); - volume_mesh.set_manifold (1, boundary_description); - volume_mesh.set_manifold (0, boundary_description); + volume_mesh.set_boundary (1, boundary_description); + volume_mesh.set_boundary (0, boundary_description); volume_mesh.refine_global (1); - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (1, surface_description); - boundary_mesh.set_manifold (0, surface_description); + boundary_mesh.set_boundary (1, surface_description); + boundary_mesh.set_boundary (0, surface_description); set boundary_ids; boundary_ids.insert(1); diff --git a/tests/codim_one/grid_refinement.cc b/tests/codim_one/grid_refinement.cc index f74f631e62..9815e30965 100644 --- a/tests/codim_one/grid_refinement.cc +++ b/tests/codim_one/grid_refinement.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ void test(std::string filename) { HyperBallBoundary boundary; Triangulation tria; - tria.set_manifold(1, boundary); + tria.set_boundary(1, boundary); GridIn gi; gi.attach_triangulation (tria); std::ifstream in (filename.c_str()); diff --git a/tests/codim_one/mapping_01.cc b/tests/codim_one/mapping_01.cc index b26fa257b6..fd527e3d1b 100644 --- a/tests/codim_one/mapping_01.cc +++ b/tests/codim_one/mapping_01.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,9 +44,9 @@ void test () Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (0, surface_description); + boundary_mesh.set_boundary (0, surface_description); GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/mapping_02.cc b/tests/codim_one/mapping_02.cc index 9a077a4282..0849d7b8af 100644 --- a/tests/codim_one/mapping_02.cc +++ b/tests/codim_one/mapping_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,9 +41,9 @@ void test () Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - const PolarManifold surface_description; + const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_manifold (0, surface_description); + boundary_mesh.set_boundary (0, surface_description); GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/torus_01.cc b/tests/codim_one/torus_01.cc index 1c4b86e762..af63da020b 100644 --- a/tests/codim_one/torus_01.cc +++ b/tests/codim_one/torus_01.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ int main () TorusBoundary boundary (1.5, .5); Triangulation tria; - tria.set_manifold (0, boundary); + tria.set_boundary (0, boundary); GridGenerator::torus (tria, 1.5, .5); tria.refine_global(2); diff --git a/tests/deal.II/boundaries.cc b/tests/deal.II/boundaries.cc index a9188fa4fc..60372d4f29 100644 --- a/tests/deal.II/boundaries.cc +++ b/tests/deal.II/boundaries.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -99,10 +99,10 @@ check () } else GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast(dim)),1./std::sqrt(static_cast(dim))); - static const PolarManifold boundary; + static const HyperBallBoundary boundary; if (dim != 1) { - tr.set_manifold (0, boundary); + tr.set_boundary (0, boundary); } tr.refine_global (1); tr.begin_active()->set_refine_flag (); diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index 6b3c8d2a69..bf41611661 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,13 +46,13 @@ std::ofstream logfile("output"); template class Ball : - public FlatManifold + public StraightBoundary { public: virtual Point get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = FlatManifold::get_new_point_on_line(line); + Point middle = StraightBoundary::get_new_point_on_line(line); for (int i=0; i get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = FlatManifold::get_new_point_on_quad(quad); + Point middle = StraightBoundary::get_new_point_on_quad(quad); for (int i=0; i class CurvedLine : - public FlatManifold + public StraightBoundary { public: virtual Point @@ -98,7 +98,7 @@ template Point CurvedLine::get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = FlatManifold::get_new_point_on_line (line); + Point middle = StraightBoundary::get_new_point_on_line (line); // if the line is at the top of bottom // face: do a special treatment on @@ -147,7 +147,7 @@ template Point CurvedLine::get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = FlatManifold::get_new_point_on_quad (quad); + Point middle = StraightBoundary::get_new_point_on_quad (quad); // if the face is at the top of bottom // face: do not move the midpoint in @@ -266,12 +266,12 @@ void TestCases::run (const unsigned int test_case) { if (dim==3) { - tria->begin_active()->face(4)->set_manifold_indicator(1); - tria->begin_active()->face(5)->set_manifold_indicator(1); + tria->begin_active()->face(4)->set_boundary_indicator(1); + tria->begin_active()->face(5)->set_boundary_indicator(1); }; // set the boundary function - tria->set_manifold(1, (test_case==2) + tria->set_boundary(1, (test_case==2) ? ((Boundary &)ball) : ((Boundary &)curved_line)); // refine once diff --git a/tests/deal.II/fe_values_view_01.cc b/tests/deal.II/fe_values_view_01.cc index b669f007bd..e0f3e1d58a 100644 --- a/tests/deal.II/fe_values_view_01.cc +++ b/tests/deal.II/fe_values_view_01.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -95,8 +95,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_02.cc b/tests/deal.II/fe_values_view_02.cc index d1eaf98248..32c32e9a23 100644 --- a/tests/deal.II/fe_values_view_02.cc +++ b/tests/deal.II/fe_values_view_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -120,8 +120,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_03.cc b/tests/deal.II/fe_values_view_03.cc index 8d1d98949b..f0e57a117c 100644 --- a/tests/deal.II/fe_values_view_03.cc +++ b/tests/deal.II/fe_values_view_03.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -101,8 +101,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_04.cc b/tests/deal.II/fe_values_view_04.cc index 66634f246f..74eee71807 100644 --- a/tests/deal.II/fe_values_view_04.cc +++ b/tests/deal.II/fe_values_view_04.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,8 +121,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_05.cc b/tests/deal.II/fe_values_view_05.cc index 3280b8e23b..97fc058ebd 100644 --- a/tests/deal.II/fe_values_view_05.cc +++ b/tests/deal.II/fe_values_view_05.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,8 +87,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_06.cc b/tests/deal.II/fe_values_view_06.cc index 6c2e7ebacf..a4fb1c78ce 100644 --- a/tests/deal.II/fe_values_view_06.cc +++ b/tests/deal.II/fe_values_view_06.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,8 +88,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_07.cc b/tests/deal.II/fe_values_view_07.cc index c2f2ef5019..d0ce6a04ef 100644 --- a/tests/deal.II/fe_values_view_07.cc +++ b/tests/deal.II/fe_values_view_07.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,8 +88,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_08.cc b/tests/deal.II/fe_values_view_08.cc index 75c9e11a4c..9215f4c530 100644 --- a/tests/deal.II/fe_values_view_08.cc +++ b/tests/deal.II/fe_values_view_08.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -89,8 +89,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_09.cc b/tests/deal.II/fe_values_view_09.cc index 32598a8761..2f2cff48c0 100644 --- a/tests/deal.II/fe_values_view_09.cc +++ b/tests/deal.II/fe_values_view_09.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,8 +92,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_10.cc b/tests/deal.II/fe_values_view_10.cc index 357f764086..b1436f6df9 100644 --- a/tests/deal.II/fe_values_view_10.cc +++ b/tests/deal.II/fe_values_view_10.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -93,8 +93,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_10_single_01.cc b/tests/deal.II/fe_values_view_10_single_01.cc index ffd8f40071..4ac711fffa 100644 --- a/tests/deal.II/fe_values_view_10_single_01.cc +++ b/tests/deal.II/fe_values_view_10_single_01.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FE_RaviartThomas fe(1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_02.cc b/tests/deal.II/fe_values_view_10_single_02.cc index 253cda5821..20ecbbe073 100644 --- a/tests/deal.II/fe_values_view_10_single_02.cc +++ b/tests/deal.II/fe_values_view_10_single_02.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FE_Nedelec fe(1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_03.cc b/tests/deal.II/fe_values_view_10_single_03.cc index 4806ae1e99..0d0cb82d17 100644 --- a/tests/deal.II/fe_values_view_10_single_03.cc +++ b/tests/deal.II/fe_values_view_10_single_03.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe(FE_RaviartThomas(1),1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_04.cc b/tests/deal.II/fe_values_view_10_single_04.cc index c26ee8e24c..923ab6b65a 100644 --- a/tests/deal.II/fe_values_view_10_single_04.cc +++ b/tests/deal.II/fe_values_view_10_single_04.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -95,8 +95,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_11.cc b/tests/deal.II/fe_values_view_11.cc index eaa03e4eac..42328f17e8 100644 --- a/tests/deal.II/fe_values_view_11.cc +++ b/tests/deal.II/fe_values_view_11.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -93,8 +93,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_12.cc b/tests/deal.II/fe_values_view_12.cc index 42fc0cc381..3a26c309e5 100644 --- a/tests/deal.II/fe_values_view_12.cc +++ b/tests/deal.II/fe_values_view_12.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -94,8 +94,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_13.cc b/tests/deal.II/fe_values_view_13.cc index f0ce11914c..e357f01904 100644 --- a/tests/deal.II/fe_values_view_13.cc +++ b/tests/deal.II/fe_values_view_13.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -94,8 +94,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_14.cc b/tests/deal.II/fe_values_view_14.cc index d543530d1f..8346626253 100644 --- a/tests/deal.II/fe_values_view_14.cc +++ b/tests/deal.II/fe_values_view_14.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_15.cc b/tests/deal.II/fe_values_view_15.cc index 4aa6b44bee..7104b9ef35 100644 --- a/tests/deal.II/fe_values_view_15.cc +++ b/tests/deal.II/fe_values_view_15.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_16.cc b/tests/deal.II/fe_values_view_16.cc index 099e49abfd..e906d800df 100644 --- a/tests/deal.II/fe_values_view_16.cc +++ b/tests/deal.II/fe_values_view_16.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -99,8 +99,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_17.cc b/tests/deal.II/fe_values_view_17.cc index beb2352df7..498fa3dae7 100644 --- a/tests/deal.II/fe_values_view_17.cc +++ b/tests/deal.II/fe_values_view_17.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_18.cc b/tests/deal.II/fe_values_view_18.cc index 0fcc9bf268..59dec4c5d3 100644 --- a/tests/deal.II/fe_values_view_18.cc +++ b/tests/deal.II/fe_values_view_18.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -103,8 +103,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_19.cc b/tests/deal.II/fe_values_view_19.cc index a22f30773c..25e40dac85 100644 --- a/tests/deal.II/fe_values_view_19.cc +++ b/tests/deal.II/fe_values_view_19.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_20.cc b/tests/deal.II/fe_values_view_20.cc index 8a954b58a8..06efab4146 100644 --- a/tests/deal.II/fe_values_view_20.cc +++ b/tests/deal.II/fe_values_view_20.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -102,8 +102,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_23.cc b/tests/deal.II/fe_values_view_23.cc index 071d9cd11f..3f99ca5ceb 100644 --- a/tests/deal.II/fe_values_view_23.cc +++ b/tests/deal.II/fe_values_view_23.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,8 +91,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), SymmetricTensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_23_nonsymmetric.cc b/tests/deal.II/fe_values_view_23_nonsymmetric.cc index 775dec95b6..2e17287429 100644 --- a/tests/deal.II/fe_values_view_23_nonsymmetric.cc +++ b/tests/deal.II/fe_values_view_23_nonsymmetric.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,8 +91,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), Tensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_24.cc b/tests/deal.II/fe_values_view_24.cc index 1a8e9c45b4..dbf9c01df3 100644 --- a/tests/deal.II/fe_values_view_24.cc +++ b/tests/deal.II/fe_values_view_24.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), SymmetricTensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_24_nonsymmetric.cc b/tests/deal.II/fe_values_view_24_nonsymmetric.cc index c37d411f5f..fc0f020cb3 100644 --- a/tests/deal.II/fe_values_view_24_nonsymmetric.cc +++ b/tests/deal.II/fe_values_view_24_nonsymmetric.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); FESystem fe (FE_Q(1), Tensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/grid_hyper_shell.cc b/tests/deal.II/grid_hyper_shell.cc index 5d8054282c..0b196be527 100644 --- a/tests/deal.II/grid_hyper_shell.cc +++ b/tests/deal.II/grid_hyper_shell.cc @@ -20,7 +20,7 @@ // refinement #include "../tests.h" -#include +#include #include #include #include @@ -46,8 +46,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none, true); GridGenerator::hyper_shell (tria, center, r1, r2, n, true); - static const PolarManifold boundary(center); - tria.set_manifold(0, boundary); + static const HyperShellBoundary boundary(center); + tria.set_boundary(0, boundary); for (unsigned int i=0; i<2; ++i) { diff --git a/tests/deal.II/grid_hyper_shell_02.cc b/tests/deal.II/grid_hyper_shell_02.cc index 322b3452c1..9ae80cc543 100644 --- a/tests/deal.II/grid_hyper_shell_02.cc +++ b/tests/deal.II/grid_hyper_shell_02.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const PolarManifold boundary(center); - tria.set_manifold(0, boundary); + static const HyperShellBoundary boundary(center); + tria.set_boundary(0, boundary); tria.refine_global(1); GridOut grid_out; diff --git a/tests/deal.II/grid_hyper_shell_03.cc b/tests/deal.II/grid_hyper_shell_03.cc index 27561c9449..ae1ac3d012 100644 --- a/tests/deal.II/grid_hyper_shell_03.cc +++ b/tests/deal.II/grid_hyper_shell_03.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const PolarManifold boundary(center); - tria.set_manifold(0, boundary); + static const HyperShellBoundary boundary(center); + tria.set_boundary(0, boundary); tria.refine_global(1); GridOut grid_out; diff --git a/tests/deal.II/grid_hyper_shell_04.cc b/tests/deal.II/grid_hyper_shell_04.cc index 7c802f2af6..e51778c728 100644 --- a/tests/deal.II/grid_hyper_shell_04.cc +++ b/tests/deal.II/grid_hyper_shell_04.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const PolarManifold boundary(center); - tria.set_manifold(0, boundary); + static const HyperShellBoundary boundary(center); + tria.set_boundary(0, boundary); GridOut grid_out; grid_out.write_gnuplot (tria, logfile); diff --git a/tests/deal.II/grid_out.cc b/tests/deal.II/grid_out.cc index d2a65a538c..be84422aae 100644 --- a/tests/deal.II/grid_out.cc +++ b/tests/deal.II/grid_out.cc @@ -19,8 +19,8 @@ #include "../tests.h" #include #include -#include -#include +#include +#include #include #include #include @@ -36,10 +36,10 @@ template void test () { Triangulation tria; - static const PolarManifold x; + static const HyperBallBoundary x; if (dim == 2) { - tria.set_manifold (0, x); + tria.set_boundary (0, x); GridGenerator::hyper_ball (tria); } else diff --git a/tests/deal.II/grid_output_input.cc b/tests/deal.II/grid_output_input.cc index e5bd47ea9d..7ec3897f18 100644 --- a/tests/deal.II/grid_output_input.cc +++ b/tests/deal.II/grid_output_input.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -40,8 +40,8 @@ void test(std::ostream &out) Triangulation tr; GridGenerator::hyper_cube_with_cylindrical_hole(tr, .3, .4, 1, 1, false); - CylinderManifold boundary(2); - tr.set_manifold(1, boundary); + CylinderBoundary boundary(.3, 2); + tr.set_boundary(1, boundary); { std::ofstream grid_file("coarse_grid.inp"); go.write_ucd(tr, grid_file); @@ -51,7 +51,7 @@ void test(std::ostream &out) deallog << "Writing refined from constructor" << std::endl; go.write_ucd(tr, out); - tr.set_manifold(1); + tr.set_boundary(1); tr.clear(); GridIn gi; @@ -63,7 +63,7 @@ void test(std::ostream &out) grid_file.close(); } - tr.set_manifold(1, boundary); + tr.set_boundary(1, boundary); tr.refine_global(1); deallog << "Writing refined from file" << std::endl; go.write_ucd(tr, out); @@ -74,7 +74,7 @@ void test(std::ostream &out) grid_file.close(); } - tr.set_manifold(1); + tr.set_boundary(1); tr.clear(); } diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index f6b447073d..1b333ea250 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -17,7 +17,7 @@ #include "../tests.h" -#include +#include #include #include #include @@ -40,13 +40,13 @@ std::ofstream logfile("output"); template class Ball : - public FlatManifold + public StraightBoundary { public: virtual Point get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = FlatManifold::get_new_point_on_line(line); + Point middle = StraightBoundary::get_new_point_on_line(line); for (int i=0; i get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = FlatManifold::get_new_point_on_quad(quad); + Point middle = StraightBoundary::get_new_point_on_quad(quad); for (int i=0; i class CurvedLine : - public FlatManifold + public StraightBoundary { public: virtual Point @@ -91,7 +91,7 @@ template Point CurvedLine::get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = FlatManifold::get_new_point_on_line (line); + Point middle = StraightBoundary::get_new_point_on_line (line); // if the line is at the top of bottom // face: do a special treatment on @@ -139,7 +139,7 @@ template Point CurvedLine::get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = FlatManifold::get_new_point_on_quad (quad); + Point middle = StraightBoundary::get_new_point_on_quad (quad); // if the face is at the top of bottom // face: do not move the midpoint in @@ -222,8 +222,8 @@ void test (const int test_case) { if (dim==3) { - tria.begin_active()->face(4)->set_manifold_indicator(1); - tria.begin_active()->face(5)->set_manifold_indicator(1); + tria.begin_active()->face(4)->set_boundary_indicator(1); + tria.begin_active()->face(5)->set_boundary_indicator(1); }; @@ -231,9 +231,9 @@ void test (const int test_case) Ball ball; CurvedLine curved_line; if (test_case==2) - tria.set_manifold (1, ball); + tria.set_boundary (1, ball); else - tria.set_manifold (1, curved_line); + tria.set_boundary (1, curved_line); // refine once tria.begin_active()->set_refine_flag(); @@ -255,7 +255,7 @@ void test (const int test_case) tria.execute_coarsening_and_refinement(); }; - tria.set_manifold (1); + tria.set_boundary (1); break; } } diff --git a/tests/deal.II/grid_tools_03.cc b/tests/deal.II/grid_tools_03.cc index 795bf7d07b..b342d00ef7 100644 --- a/tests/deal.II/grid_tools_03.cc +++ b/tests/deal.II/grid_tools_03.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -60,8 +60,8 @@ void test1 () Triangulation tria; GridGenerator::hyper_ball(tria, Point(), 1); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); for (unsigned int i=0; i<4; ++i) { diff --git a/tests/deal.II/grid_transform.cc b/tests/deal.II/grid_transform.cc index cf76d1edc7..b417626514 100644 --- a/tests/deal.II/grid_transform.cc +++ b/tests/deal.II/grid_transform.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,10 +34,10 @@ int main () { const unsigned int dim=2; Point origin; - PolarManifold boundary(origin); + HyperShellBoundary boundary(origin); MappingQ mapping(2); Triangulation tria; - tria.set_manifold(0, boundary); + tria.set_boundary(0, boundary); const double inner_radius=1.; const double outer_radius=5.; GridGenerator::hyper_shell(tria, origin, inner_radius, outer_radius, 8); @@ -88,7 +88,7 @@ int main () // circle. new_points.insert(std::pair > ( face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center)); - face->set_manifold_indicator(1); + face->set_boundary_indicator(1); } else Assert(false, ExcInternalError()); @@ -97,8 +97,8 @@ int main () } GridGenerator::laplace_transformation (tria, new_points); - PolarManifold inner_ball(n_center, n_radius); - tria.set_manifold(1, inner_ball); + HyperBallBoundary inner_ball(n_center, n_radius); + tria.set_boundary(1, inner_ball); GridOut grid_out; std::ofstream eps_stream2("output"); diff --git a/tests/deal.II/grid_transform_3d.cc b/tests/deal.II/grid_transform_3d.cc index 3a312a240f..72f86fd928 100644 --- a/tests/deal.II/grid_transform_3d.cc +++ b/tests/deal.II/grid_transform_3d.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -35,9 +35,9 @@ int main () { const unsigned int dim=3; Point origin; - CylinderManifold boundary; + CylinderBoundary boundary; Triangulation tria; - tria.set_manifold(0, boundary); + tria.set_boundary(0, boundary); GridGenerator::cylinder(tria, 1, .7); tria.refine_global(2); diff --git a/tests/deal.II/memory_consumption_01.cc b/tests/deal.II/memory_consumption_01.cc index 49e8dde817..804e2d24e4 100644 --- a/tests/deal.II/memory_consumption_01.cc +++ b/tests/deal.II/memory_consumption_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -319,8 +319,8 @@ void Step6::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } diff --git a/tests/deal.II/no_flux_03.cc b/tests/deal.II/no_flux_03.cc index b0f590dcbc..b1aa01fbd4 100644 --- a/tests/deal.II/no_flux_03.cc +++ b/tests/deal.II/no_flux_03.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,8 +66,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_04.cc b/tests/deal.II/no_flux_04.cc index 8f8c9a634a..19a06cd992 100644 --- a/tests/deal.II/no_flux_04.cc +++ b/tests/deal.II/no_flux_04.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -125,8 +125,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_05.cc b/tests/deal.II/no_flux_05.cc index 5325aee1bd..6050fc89af 100644 --- a/tests/deal.II/no_flux_05.cc +++ b/tests/deal.II/no_flux_05.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,8 +79,8 @@ void test_hyper_cube() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(1); diff --git a/tests/deal.II/no_flux_10.cc b/tests/deal.II/no_flux_10.cc index 5e93d8eb94..347e2f79db 100644 --- a/tests/deal.II/no_flux_10.cc +++ b/tests/deal.II/no_flux_10.cc @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -68,51 +68,51 @@ colorize_sixty_deg_hyper_shell(Triangulation<3> &tria, double radius = cell->face(f)->center().norm() - center.norm(); if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(0)) < eps ) // z = sqrt(3)x set boundary 2 { - cell->face(f)->set_manifold_indicator(2); + cell->face(f)->set_boundary_indicator(2); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_manifold_indicator(2); + cell->face(f)->line(j)->set_boundary_indicator(2); } else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(0)) < eps) // z = -sqrt(3)x set boundary 3 { - cell->face(f)->set_manifold_indicator(3); + cell->face(f)->set_boundary_indicator(3); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_manifold_indicator(3); + cell->face(f)->line(j)->set_boundary_indicator(3); } else if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = sqrt(3)y set boundary 4 { - cell->face(f)->set_manifold_indicator(4); + cell->face(f)->set_boundary_indicator(4); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_manifold_indicator(4); + cell->face(f)->line(j)->set_boundary_indicator(4); } else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = -sqrt(3)y set boundary 5 { - cell->face(f)->set_manifold_indicator(5); + cell->face(f)->set_boundary_indicator(5); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_manifold_indicator(5); + cell->face(f)->line(j)->set_boundary_indicator(5); } else if (radius < middle) // inner radius set boundary 0 { - cell->face(f)->set_manifold_indicator(0); + cell->face(f)->set_boundary_indicator(0); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps) - cell->face(f)->line(j)->set_manifold_indicator(0); + cell->face(f)->line(j)->set_boundary_indicator(0); } else if (radius > middle) // outer radius set boundary 1 { - cell->face(f)->set_manifold_indicator(1); + cell->face(f)->set_boundary_indicator(1); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps) - cell->face(f)->line(j)->set_manifold_indicator(1); + cell->face(f)->line(j)->set_boundary_indicator(1); } else AssertThrow (false, ExcInternalError()); @@ -171,8 +171,8 @@ void run() 0.5, 1.0); - static PolarManifold boundary((Point())); - triangulation.set_manifold (0, boundary); + static HyperShellBoundary boundary((Point())); + triangulation.set_boundary (0, boundary); // write out the mesh. may not be // strictly necessary here, but is diff --git a/tests/deal.II/no_flux_hp_03.cc b/tests/deal.II/no_flux_hp_03.cc index a264c80bc1..f304cf9387 100644 --- a/tests/deal.II/no_flux_hp_03.cc +++ b/tests/deal.II/no_flux_hp_03.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,8 +60,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_hp_04.cc b/tests/deal.II/no_flux_hp_04.cc index 42fb80ada1..9fdda0c549 100644 --- a/tests/deal.II/no_flux_hp_04.cc +++ b/tests/deal.II/no_flux_hp_04.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -118,8 +118,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_hp_05.cc b/tests/deal.II/no_flux_hp_05.cc index 9f06c311ad..a4e7e9e4a8 100644 --- a/tests/deal.II/no_flux_hp_05.cc +++ b/tests/deal.II/no_flux_hp_05.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,8 +70,8 @@ void test_hyper_cube() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(1); diff --git a/tests/deal.II/normal_flux_03.cc b/tests/deal.II/normal_flux_03.cc index 114b91766f..152aef1b23 100644 --- a/tests/deal.II/normal_flux_03.cc +++ b/tests/deal.II/normal_flux_03.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -61,8 +61,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const PolarManifold boundary; - tr.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tr.set_boundary (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/project_01_curved_boundary.cc b/tests/deal.II/project_01_curved_boundary.cc index 5bb0cd2ec2..13a3d0a592 100644 --- a/tests/deal.II/project_01_curved_boundary.cc +++ b/tests/deal.II/project_01_curved_boundary.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -63,14 +63,14 @@ public: template void test() { - PolarManifold boundary; + HyperBallBoundary boundary; // create 2 triangulations with the // same coarse grid, and refine // them differently Triangulation tria; GridGenerator::hyper_ball (tria); - tria.set_manifold (0, boundary); + tria.set_boundary (0, boundary); FE_Q fe(1); diff --git a/tests/deal.II/project_to_surface_01.cc b/tests/deal.II/project_to_surface_01.cc index 3c57a88d24..7fda38c7ae 100644 --- a/tests/deal.II/project_to_surface_01.cc +++ b/tests/deal.II/project_to_surface_01.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - FlatManifold boundary; + StraightBoundary boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { diff --git a/tests/deal.II/project_to_surface_02.cc b/tests/deal.II/project_to_surface_02.cc index bdfabddcf9..9e42fc3a6c 100644 --- a/tests/deal.II/project_to_surface_02.cc +++ b/tests/deal.II/project_to_surface_02.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - FlatManifold boundary; + StraightBoundary boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { diff --git a/tests/deal.II/project_to_surface_03.cc b/tests/deal.II/project_to_surface_03.cc index 7ee11c5231..f99a6de525 100644 --- a/tests/deal.II/project_to_surface_03.cc +++ b/tests/deal.II/project_to_surface_03.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - FlatManifold boundary; + StraightBoundary boundary; GridGenerator::hyper_cube(tria, 0, 1); diff --git a/tests/fe/cell_similarity_01.cc b/tests/fe/cell_similarity_01.cc index f3c349b0f7..a775f42e01 100644 --- a/tests/fe/cell_similarity_01.cc +++ b/tests/fe/cell_similarity_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_02.cc b/tests/fe/cell_similarity_02.cc index 853870ea9f..f3abedbaa3 100644 --- a/tests/fe/cell_similarity_02.cc +++ b/tests/fe/cell_similarity_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_03.cc b/tests/fe/cell_similarity_03.cc index e9df1e8eb0..560e370884 100644 --- a/tests/fe/cell_similarity_03.cc +++ b/tests/fe/cell_similarity_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_04.cc b/tests/fe/cell_similarity_04.cc index 0563c9b404..06a44e2fa3 100644 --- a/tests/fe/cell_similarity_04.cc +++ b/tests/fe/cell_similarity_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc index 84007365d9..92f3e798a9 100644 --- a/tests/fe/cell_similarity_05.cc +++ b/tests/fe/cell_similarity_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc index a901b9e4a8..ea25342768 100644 --- a/tests/fe/cell_similarity_06.cc +++ b/tests/fe/cell_similarity_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc index 3eb1c9760e..d68ce7406b 100644 --- a/tests/fe/cell_similarity_07.cc +++ b/tests/fe/cell_similarity_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc index abb4f77398..5ec35b03d1 100644 --- a/tests/fe/cell_similarity_08.cc +++ b/tests/fe/cell_similarity_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_09.cc b/tests/fe/cell_similarity_09.cc index 7eaafa9eac..f168c575ef 100644 --- a/tests/fe/cell_similarity_09.cc +++ b/tests/fe/cell_similarity_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_10.cc b/tests/fe/cell_similarity_10.cc index a274ab7503..d595473a6d 100644 --- a/tests/fe/cell_similarity_10.cc +++ b/tests/fe/cell_similarity_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_01.cc b/tests/fe/cell_similarity_dgp_monomial_01.cc index b9acb42c19..2d17109e8b 100644 --- a/tests/fe/cell_similarity_dgp_monomial_01.cc +++ b/tests/fe/cell_similarity_dgp_monomial_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_02.cc b/tests/fe/cell_similarity_dgp_monomial_02.cc index e15c9eccd3..c92552b924 100644 --- a/tests/fe/cell_similarity_dgp_monomial_02.cc +++ b/tests/fe/cell_similarity_dgp_monomial_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_03.cc b/tests/fe/cell_similarity_dgp_monomial_03.cc index f704a30cff..667829ef93 100644 --- a/tests/fe/cell_similarity_dgp_monomial_03.cc +++ b/tests/fe/cell_similarity_dgp_monomial_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_04.cc b/tests/fe/cell_similarity_dgp_monomial_04.cc index 2b409d59bc..cc293f730e 100644 --- a/tests/fe/cell_similarity_dgp_monomial_04.cc +++ b/tests/fe/cell_similarity_dgp_monomial_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc index 6f6b6383a7..d0d8b7308d 100644 --- a/tests/fe/cell_similarity_dgp_monomial_05.cc +++ b/tests/fe/cell_similarity_dgp_monomial_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc index e168167578..320a751f4f 100644 --- a/tests/fe/cell_similarity_dgp_monomial_06.cc +++ b/tests/fe/cell_similarity_dgp_monomial_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc index 4ecbfe877b..2e7ea87b06 100644 --- a/tests/fe/cell_similarity_dgp_monomial_07.cc +++ b/tests/fe/cell_similarity_dgp_monomial_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc index 14a2086268..5a7a1c0241 100644 --- a/tests/fe/cell_similarity_dgp_monomial_08.cc +++ b/tests/fe/cell_similarity_dgp_monomial_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_09.cc b/tests/fe/cell_similarity_dgp_monomial_09.cc index 742e259968..70fc0c2cd2 100644 --- a/tests/fe/cell_similarity_dgp_monomial_09.cc +++ b/tests/fe/cell_similarity_dgp_monomial_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_10.cc b/tests/fe/cell_similarity_dgp_monomial_10.cc index 8ba9536a05..2674c78f07 100644 --- a/tests/fe/cell_similarity_dgp_monomial_10.cc +++ b/tests/fe/cell_similarity_dgp_monomial_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01.cc b/tests/fe/cell_similarity_dgp_nonparametric_01.cc index 195619b92e..9f8408ecf8 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_01.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02.cc b/tests/fe/cell_similarity_dgp_nonparametric_02.cc index cf446f5ffc..a0cedea1dc 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_02.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03.cc b/tests/fe/cell_similarity_dgp_nonparametric_03.cc index faeb144e61..c9b5976413 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_03.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04.cc b/tests/fe/cell_similarity_dgp_nonparametric_04.cc index 2dd9fda0ae..3a61ff3d76 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_04.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc index c824830b5c..0a97684c97 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc index f670050322..e8524ccbf4 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc index 87728dd148..956719459c 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc index f0fe0a5150..75e708153b 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09.cc b/tests/fe/cell_similarity_dgp_nonparametric_09.cc index feac5e995b..79262451cb 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_09.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10.cc b/tests/fe/cell_similarity_dgp_nonparametric_10.cc index 3d82e22eed..73262ee965 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_10.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const PolarManifold boundary(tr.begin_active()->center()); - tr.set_manifold (1, boundary); + static const HyperBallBoundary boundary(tr.begin_active()->center()); + tr.set_boundary (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_manifold_indicator (1); + tr.begin_active()->face(f)->set_boundary_indicator (1); test(tr); } diff --git a/tests/fe/jacobians.cc b/tests/fe/jacobians.cc index fe77dd4677..4351b19054 100644 --- a/tests/fe/jacobians.cc +++ b/tests/fe/jacobians.cc @@ -25,15 +25,15 @@ #include #include #include -#include +#include template void test() { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); MappingQ mapping(3); FE_Nothing dummy; diff --git a/tests/fe/mapping.cc b/tests/fe/mapping.cc index 80cfdc3e32..d646edf3aa 100644 --- a/tests/fe/mapping.cc +++ b/tests/fe/mapping.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -306,10 +306,10 @@ void create_triangulations(std::vector *> &tria_ptr, v2(1) = 3.; v3(0) = 3.; v3(1) = 3.; - tria->set_manifold(1,*boundary1); - tria->set_manifold(2,*boundary2); - tria->begin_active()->face(1)->set_manifold_indicator(1); - tria->begin_active()->face(3)->set_manifold_indicator(2); + tria->set_boundary(1,*boundary1); + tria->set_boundary(2,*boundary2); + tria->begin_active()->face(1)->set_boundary_indicator(1); + tria->begin_active()->face(3)->set_boundary_indicator(2); double pi=std::acos(-1.); double alpha=2*std::atan(0.5); exact_areas.push_back(4+pi-2.5*(alpha-std::sin(alpha))); @@ -346,8 +346,8 @@ void create_triangulations(std::vector *> &tria_ptr, v2(1) = 1.; v3(0) = 0.5; v3(1) = 1.5; - tria->set_manifold(1,*boundary1); - tria->begin_active()->face(1)->set_manifold_indicator(1); + tria->set_boundary(1,*boundary1); + tria->begin_active()->face(1)->set_boundary_indicator(1); exact_areas.push_back(0.); for (unsigned int i=0; i<=4; ++i) show[4][i]=1; @@ -401,8 +401,8 @@ void create_triangulations(std::vector *> &tria_ptr, tria=new Triangulation<3>(); tria_ptr.push_back(tria); GridGenerator::hyper_cube(*tria, 1., 3.); - tria->set_manifold(1,*boundary1); - tria->begin_active()->face(1)->set_manifold_indicator(1); + tria->set_boundary(1,*boundary1); + tria->begin_active()->face(1)->set_boundary_indicator(1); exact_areas.push_back(8.+pi/3*h*h*(3*r-h)); } diff --git a/tests/fe/mapping_real_to_unit_02.cc b/tests/fe/mapping_real_to_unit_02.cc index 0df81eebdc..9c9af6b097 100644 --- a/tests/fe/mapping_real_to_unit_02.cc +++ b/tests/fe/mapping_real_to_unit_02.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -37,11 +37,11 @@ template void test2() { - const PolarManifold boundary_description; + const HyperBallBoundary boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_manifold (0, boundary_description); + triangulation.set_boundary (0, boundary_description); triangulation.refine_global (1); MappingQ1< dim > mapping; @@ -70,7 +70,7 @@ void test2() points[95]=p; fe_function.value_list (points, m); // <<<< this fails at point[95] but only if the other points are filled in?! - triangulation.set_manifold (0); + triangulation.set_boundary (0); deallog << "OK" << std::endl; } diff --git a/tests/fe/mapping_real_to_unit_q4_curved.cc b/tests/fe/mapping_real_to_unit_q4_curved.cc index 666b9c4682..3eb7e558cf 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @@ -50,8 +50,8 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face of the single cell - triangulation.set_manifold (1, boundary); - triangulation.begin_active()->face(0)->set_manifold_indicator (1); + triangulation.set_boundary (1, boundary); + triangulation.begin_active()->face(0)->set_boundary_indicator (1); const unsigned int n_points = 5; std::vector< Point > unit_points(Utilities::fixed_power(n_points)); diff --git a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc index 9c1b8d09a9..fd2c553cf4 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @@ -50,8 +50,8 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face of the single cell - triangulation.set_manifold (1, boundary); - triangulation.begin_active()->face(0)->set_manifold_indicator (1); + triangulation.set_boundary (1, boundary); + triangulation.begin_active()->face(0)->set_boundary_indicator (1); const unsigned int n_points = 5; std::vector< Point > unit_points(Utilities::fixed_power(n_points)); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere.cc b/tests/fe/mapping_real_to_unit_q4_sphere.cc index 14676e706d..d85b5b5988 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include @@ -46,7 +46,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - PolarManifold boundary (Point(), radius); + HyperBallBoundary boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -79,7 +79,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_manifold (1, boundary); + triangulation.set_boundary (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc index 5af523158f..23cadac0c8 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - PolarManifold boundary (Point(), radius); + HyperBallBoundary boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_manifold (1, boundary); + triangulation.set_boundary (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc index c63395e9a2..772319d2b1 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - PolarManifold boundary (Point(), radius); + HyperBallBoundary boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_manifold (1, boundary); + triangulation.set_boundary (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc index 67e693bdd8..8eb53f60b3 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - PolarManifold boundary (Point(), radius); + HyperBallBoundary boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_manifold (1, boundary); + triangulation.set_boundary (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now see if the point is inside diff --git a/tests/grid/grid_generator_01a.cc b/tests/grid/grid_generator_01a.cc index 99749476e2..d2f29ff513 100644 --- a/tests/grid/grid_generator_01a.cc +++ b/tests/grid/grid_generator_01a.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -47,7 +47,7 @@ void test(std::ostream &out) if (dim>1) p3[1] = 1.; if (dim>2) p3[2] = 4.; - HalfPolarManifold boundary_description (p1, 3); + HalfHyperBallBoundary boundary_description (p1, 3); GridOut go; GridOut::OutputFormat format = GridOut::gnuplot; @@ -55,7 +55,7 @@ void test(std::ostream &out) deallog << "half_hyper_ball" << std::endl; Triangulation tr; GridGenerator::half_hyper_ball(tr, p1, 3.); - tr.set_manifold (0, boundary_description); + tr.set_boundary (0, boundary_description); tr.refine_global (2); go.write(tr, out, format); diff --git a/tests/hp/project_01_curved_boundary.cc b/tests/hp/project_01_curved_boundary.cc index cb3d056b2d..2bfed59373 100644 --- a/tests/hp/project_01_curved_boundary.cc +++ b/tests/hp/project_01_curved_boundary.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,14 +64,14 @@ public: template void test() { - PolarManifold boundary; + HyperBallBoundary boundary; // create 2 triangulations with the // same coarse grid, and refine // them differently Triangulation tria; GridGenerator::hyper_ball (tria); - tria.set_manifold (0, boundary); + tria.set_boundary (0, boundary); hp::FECollection fe; diff --git a/tests/hp/step-10.cc b/tests/hp/step-10.cc index cd3e7ee6da..a2bbcab0be 100644 --- a/tests/hp/step-10.cc +++ b/tests/hp/step-10.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ void gnuplot_output() Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); for (unsigned int refinement=0; refinement<2; ++refinement, triangulation.refine_global(1)) @@ -99,8 +99,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); MappingQ m(degree); const hp::MappingCollection mapping (m); @@ -166,8 +166,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); const MappingQ m (degree); const hp::MappingCollection mapping(m); diff --git a/tests/hp/step-11.cc b/tests/hp/step-11.cc index ab02f94c77..994d146876 100644 --- a/tests/hp/step-11.cc +++ b/tests/hp/step-11.cc @@ -35,7 +35,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -197,8 +197,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/hp/step-11_compressed_set_sparsity.cc b/tests/hp/step-11_compressed_set_sparsity.cc index 5169a69e76..d0c6e36b2f 100644 --- a/tests/hp/step-11_compressed_set_sparsity.cc +++ b/tests/hp/step-11_compressed_set_sparsity.cc @@ -38,7 +38,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -200,8 +200,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index 2964877e60..3bff1ee618 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -47,7 +47,7 @@ std::ofstream logfile("output"); #include -#include +#include #include #include @@ -304,8 +304,8 @@ void LaplaceProblem::run () grid_in.read_ucd (input_file); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); } deallog << " Number of active cells: " diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index 2a34966443..ed805aa9cd 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -38,7 +38,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -337,8 +337,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } diff --git a/tests/lac/precondition_chebyshev_01.output b/tests/lac/precondition_chebyshev_01.output deleted file mode 100644 index 981a24f709..0000000000 --- a/tests/lac/precondition_chebyshev_01.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Exact inverse: 0.84 0.20 0.26 0.20 0.18 0.03 0.05 0.10 0.03 0.06 -DEAL::Check vmult orig: 1.09 0.26 0.34 0.26 0.24 0.04 0.06 0.12 0.04 0.07 -DEAL::Check Tvmult orig: 1.09 0.26 0.34 0.26 0.24 0.04 0.06 0.12 0.04 0.07 -DEAL::Check vmult diag: 0.82 0.26 0.33 0.21 0.15 0.02 0.03 0.09 0.03 0.07 -DEAL::Check Tvmult diag: 0.82 0.26 0.33 0.21 0.15 0.02 0.03 0.09 0.03 0.07 diff --git a/tests/manifold/CMakeLists.txt b/tests/manifold/CMakeLists.txt deleted file mode 100644 index ffa6bb54a1..0000000000 --- a/tests/manifold/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake) -PROJECT(testsuite CXX) -INCLUDE(${DEAL_II_TARGET_CONFIG}) -DEAL_II_PICKUP_TESTS() diff --git a/tests/manifold/manifold_id_01.cc b/tests/manifold/manifold_id_01.cc deleted file mode 100644 index 12b4fb9a05..0000000000 --- a/tests/manifold/manifold_id_01.cc +++ /dev/null @@ -1,66 +0,0 @@ -//---------------------------- manifold_id_01.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_01.cc --------------------------- - - -// Test Manifold ID We check the default manifold_id on cells and faces. -// For each element it should output 255 (invalid manifold_id) - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Triangulation tria; - GridGenerator::hyper_cube (tria); - - typename Triangulation::active_cell_iterator cell; - - tria.refine_global(ref); - - for(cell = tria.begin_active(); cell != tria.end(); ++cell) { - deallog << "C: " << cell - << ", mid: " << (int)cell->manifold_id() << std::endl; - for(unsigned int f=0; f::faces_per_cell; ++f) - deallog << "f: " << cell->face(f) - << ", mid: " << (int)cell->face(f)->manifold_id() << std::endl; - - } -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_01.output b/tests/manifold/manifold_id_01.output deleted file mode 100644 index c925aae2be..0000000000 --- a/tests/manifold/manifold_id_01.output +++ /dev/null @@ -1,114 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 1.0, mid: 255 -DEAL::f: 0, mid: 255 -DEAL::f: 2, mid: 255 -DEAL::C: 1.1, mid: 255 -DEAL::f: 2, mid: 255 -DEAL::f: 1, mid: 255 -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 1.0, mid: 255 -DEAL::f: 0, mid: 255 -DEAL::f: 2, mid: 255 -DEAL::C: 1.1, mid: 255 -DEAL::f: 2, mid: 255 -DEAL::f: 1, mid: 255 -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 1.0, mid: 255 -DEAL::f: 6, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 4, mid: 255 -DEAL::f: 14, mid: 255 -DEAL::C: 1.1, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 8, mid: 255 -DEAL::f: 5, mid: 255 -DEAL::f: 15, mid: 255 -DEAL::C: 1.2, mid: 255 -DEAL::f: 7, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 14, mid: 255 -DEAL::f: 10, mid: 255 -DEAL::C: 1.3, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 9, mid: 255 -DEAL::f: 15, mid: 255 -DEAL::f: 11, mid: 255 -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 1.0, mid: 255 -DEAL::f: 6, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 4, mid: 255 -DEAL::f: 14, mid: 255 -DEAL::C: 1.1, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 8, mid: 255 -DEAL::f: 5, mid: 255 -DEAL::f: 15, mid: 255 -DEAL::C: 1.2, mid: 255 -DEAL::f: 7, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 14, mid: 255 -DEAL::f: 10, mid: 255 -DEAL::C: 1.3, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 9, mid: 255 -DEAL::f: 15, mid: 255 -DEAL::f: 11, mid: 255 -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 1.0, mid: 255 -DEAL::f: 14, mid: 255 -DEAL::f: 41, mid: 255 -DEAL::f: 6, mid: 255 -DEAL::f: 37, mid: 255 -DEAL::f: 10, mid: 255 -DEAL::f: 33, mid: 255 -DEAL::C: 1.1, mid: 255 -DEAL::f: 41, mid: 255 -DEAL::f: 18, mid: 255 -DEAL::f: 8, mid: 255 -DEAL::f: 35, mid: 255 -DEAL::f: 11, mid: 255 -DEAL::f: 32, mid: 255 -DEAL::C: 1.2, mid: 255 -DEAL::f: 15, mid: 255 -DEAL::f: 40, mid: 255 -DEAL::f: 37, mid: 255 -DEAL::f: 22, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 31, mid: 255 -DEAL::C: 1.3, mid: 255 -DEAL::f: 40, mid: 255 -DEAL::f: 19, mid: 255 -DEAL::f: 35, mid: 255 -DEAL::f: 24, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 30, mid: 255 -DEAL::C: 1.4, mid: 255 -DEAL::f: 16, mid: 255 -DEAL::f: 39, mid: 255 -DEAL::f: 7, mid: 255 -DEAL::f: 36, mid: 255 -DEAL::f: 33, mid: 255 -DEAL::f: 26, mid: 255 -DEAL::C: 1.5, mid: 255 -DEAL::f: 39, mid: 255 -DEAL::f: 20, mid: 255 -DEAL::f: 9, mid: 255 -DEAL::f: 34, mid: 255 -DEAL::f: 32, mid: 255 -DEAL::f: 27, mid: 255 -DEAL::C: 1.6, mid: 255 -DEAL::f: 17, mid: 255 -DEAL::f: 38, mid: 255 -DEAL::f: 36, mid: 255 -DEAL::f: 23, mid: 255 -DEAL::f: 31, mid: 255 -DEAL::f: 28, mid: 255 -DEAL::C: 1.7, mid: 255 -DEAL::f: 38, mid: 255 -DEAL::f: 21, mid: 255 -DEAL::f: 34, mid: 255 -DEAL::f: 25, mid: 255 -DEAL::f: 30, mid: 255 -DEAL::f: 29, mid: 255 diff --git a/tests/manifold/manifold_id_02.cc b/tests/manifold/manifold_id_02.cc deleted file mode 100644 index 71fe3d375a..0000000000 --- a/tests/manifold/manifold_id_02.cc +++ /dev/null @@ -1,74 +0,0 @@ -//---------------------------- manifold_id_02.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_02.cc --------------------------- - - -// Test Manifold ID. Now we test the function set_all_manifold_ids(), and verify -// that they are correctly inherited from one cell onward. All manifold ids -// should end up being 1. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Triangulation tria; - GridGenerator::hyper_cube (tria); - Point center; - for(unsigned int i=0;i boundary(center,center.norm()); - // triangulation.set_boundary (0, boundary_description); - - typename Triangulation::active_cell_iterator cell; - - tria.begin_active()->set_all_manifold_ids(1); - tria.refine_global(ref); - - for(cell = tria.begin_active(); cell != tria.end(); ++cell) { - deallog << "C: " << cell - << ", mid: " << (int)cell->manifold_id() << std::endl; - for(unsigned int f=0; f::faces_per_cell; ++f) - deallog << "f: " << cell->face(f) - << ", mid: " << (int)cell->face(f)->manifold_id() << std::endl; - } - -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_02.output b/tests/manifold/manifold_id_02.output deleted file mode 100644 index 6571550c7e..0000000000 --- a/tests/manifold/manifold_id_02.output +++ /dev/null @@ -1,114 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 1.0, mid: 1 -DEAL::f: 0, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::f: 1, mid: 1 -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 1.0, mid: 1 -DEAL::f: 0, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::f: 1, mid: 1 -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 1.0, mid: 1 -DEAL::f: 6, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 4, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 8, mid: 1 -DEAL::f: 5, mid: 1 -DEAL::f: 15, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 7, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::f: 10, mid: 1 -DEAL::C: 1.3, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 9, mid: 1 -DEAL::f: 15, mid: 1 -DEAL::f: 11, mid: 1 -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 1.0, mid: 1 -DEAL::f: 6, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 4, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 8, mid: 1 -DEAL::f: 5, mid: 1 -DEAL::f: 15, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 7, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::f: 10, mid: 1 -DEAL::C: 1.3, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 9, mid: 1 -DEAL::f: 15, mid: 1 -DEAL::f: 11, mid: 1 -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 1.0, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::f: 41, mid: 1 -DEAL::f: 6, mid: 1 -DEAL::f: 37, mid: 1 -DEAL::f: 10, mid: 1 -DEAL::f: 33, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 41, mid: 1 -DEAL::f: 18, mid: 1 -DEAL::f: 8, mid: 1 -DEAL::f: 35, mid: 1 -DEAL::f: 11, mid: 1 -DEAL::f: 32, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 15, mid: 1 -DEAL::f: 40, mid: 1 -DEAL::f: 37, mid: 1 -DEAL::f: 22, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 31, mid: 1 -DEAL::C: 1.3, mid: 1 -DEAL::f: 40, mid: 1 -DEAL::f: 19, mid: 1 -DEAL::f: 35, mid: 1 -DEAL::f: 24, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 30, mid: 1 -DEAL::C: 1.4, mid: 1 -DEAL::f: 16, mid: 1 -DEAL::f: 39, mid: 1 -DEAL::f: 7, mid: 1 -DEAL::f: 36, mid: 1 -DEAL::f: 33, mid: 1 -DEAL::f: 26, mid: 1 -DEAL::C: 1.5, mid: 1 -DEAL::f: 39, mid: 1 -DEAL::f: 20, mid: 1 -DEAL::f: 9, mid: 1 -DEAL::f: 34, mid: 1 -DEAL::f: 32, mid: 1 -DEAL::f: 27, mid: 1 -DEAL::C: 1.6, mid: 1 -DEAL::f: 17, mid: 1 -DEAL::f: 38, mid: 1 -DEAL::f: 36, mid: 1 -DEAL::f: 23, mid: 1 -DEAL::f: 31, mid: 1 -DEAL::f: 28, mid: 1 -DEAL::C: 1.7, mid: 1 -DEAL::f: 38, mid: 1 -DEAL::f: 21, mid: 1 -DEAL::f: 34, mid: 1 -DEAL::f: 25, mid: 1 -DEAL::f: 30, mid: 1 -DEAL::f: 29, mid: 1 diff --git a/tests/manifold/manifold_id_03.cc b/tests/manifold/manifold_id_03.cc deleted file mode 100644 index e5109da065..0000000000 --- a/tests/manifold/manifold_id_03.cc +++ /dev/null @@ -1,73 +0,0 @@ -//---------------------------- manifold_id_03.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_03.cc --------------------------- - - -// Test Manifold ID. Now we test the function set_manifold_id(), and verify -// that they are correctly inherited from one cell onward. Notice that only the interior -// of the cell is given a manifold id. -// This is inherited by all objects created inside that cells, including all the newly created -// inner faces. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Triangulation tria; - GridGenerator::hyper_cube (tria); - Point center; - - typename Triangulation::active_cell_iterator cell; - - - tria.begin_active()->set_manifold_id(1); - - tria.refine_global(1); - - for(cell = tria.begin_active(); cell != tria.end(); ++cell) { - deallog << "C: " << cell - << ", mid: " << (int)cell->manifold_id() << std::endl; - for(unsigned int f=0; f::faces_per_cell; ++f) - deallog << "f: " << cell->face(f) - << ", mid: " << (int)cell->face(f)->manifold_id() << std::endl; - } - -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_03.output b/tests/manifold/manifold_id_03.output deleted file mode 100644 index c2d883e85c..0000000000 --- a/tests/manifold/manifold_id_03.output +++ /dev/null @@ -1,114 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 1.0, mid: 1 -DEAL::f: 0, mid: 255 -DEAL::f: 2, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::f: 1, mid: 255 -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 1.0, mid: 1 -DEAL::f: 0, mid: 255 -DEAL::f: 2, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 2, mid: 1 -DEAL::f: 1, mid: 255 -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 1.0, mid: 1 -DEAL::f: 6, mid: 255 -DEAL::f: 12, mid: 1 -DEAL::f: 4, mid: 255 -DEAL::f: 14, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 8, mid: 255 -DEAL::f: 5, mid: 255 -DEAL::f: 15, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 7, mid: 255 -DEAL::f: 13, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::f: 10, mid: 255 -DEAL::C: 1.3, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 9, mid: 255 -DEAL::f: 15, mid: 1 -DEAL::f: 11, mid: 255 -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 1.0, mid: 1 -DEAL::f: 6, mid: 255 -DEAL::f: 12, mid: 1 -DEAL::f: 4, mid: 255 -DEAL::f: 14, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 12, mid: 1 -DEAL::f: 8, mid: 255 -DEAL::f: 5, mid: 255 -DEAL::f: 15, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 7, mid: 255 -DEAL::f: 13, mid: 1 -DEAL::f: 14, mid: 1 -DEAL::f: 10, mid: 255 -DEAL::C: 1.3, mid: 1 -DEAL::f: 13, mid: 1 -DEAL::f: 9, mid: 255 -DEAL::f: 15, mid: 1 -DEAL::f: 11, mid: 255 -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 1.0, mid: 1 -DEAL::f: 14, mid: 255 -DEAL::f: 41, mid: 1 -DEAL::f: 6, mid: 255 -DEAL::f: 37, mid: 1 -DEAL::f: 10, mid: 255 -DEAL::f: 33, mid: 1 -DEAL::C: 1.1, mid: 1 -DEAL::f: 41, mid: 1 -DEAL::f: 18, mid: 255 -DEAL::f: 8, mid: 255 -DEAL::f: 35, mid: 1 -DEAL::f: 11, mid: 255 -DEAL::f: 32, mid: 1 -DEAL::C: 1.2, mid: 1 -DEAL::f: 15, mid: 255 -DEAL::f: 40, mid: 1 -DEAL::f: 37, mid: 1 -DEAL::f: 22, mid: 255 -DEAL::f: 12, mid: 255 -DEAL::f: 31, mid: 1 -DEAL::C: 1.3, mid: 1 -DEAL::f: 40, mid: 1 -DEAL::f: 19, mid: 255 -DEAL::f: 35, mid: 1 -DEAL::f: 24, mid: 255 -DEAL::f: 13, mid: 255 -DEAL::f: 30, mid: 1 -DEAL::C: 1.4, mid: 1 -DEAL::f: 16, mid: 255 -DEAL::f: 39, mid: 1 -DEAL::f: 7, mid: 255 -DEAL::f: 36, mid: 1 -DEAL::f: 33, mid: 1 -DEAL::f: 26, mid: 255 -DEAL::C: 1.5, mid: 1 -DEAL::f: 39, mid: 1 -DEAL::f: 20, mid: 255 -DEAL::f: 9, mid: 255 -DEAL::f: 34, mid: 1 -DEAL::f: 32, mid: 1 -DEAL::f: 27, mid: 255 -DEAL::C: 1.6, mid: 1 -DEAL::f: 17, mid: 255 -DEAL::f: 38, mid: 1 -DEAL::f: 36, mid: 1 -DEAL::f: 23, mid: 255 -DEAL::f: 31, mid: 1 -DEAL::f: 28, mid: 255 -DEAL::C: 1.7, mid: 1 -DEAL::f: 38, mid: 1 -DEAL::f: 21, mid: 255 -DEAL::f: 34, mid: 1 -DEAL::f: 25, mid: 255 -DEAL::f: 30, mid: 1 -DEAL::f: 29, mid: 255 diff --git a/tests/manifold/manifold_id_04.cc b/tests/manifold/manifold_id_04.cc deleted file mode 100644 index 57583a33d6..0000000000 --- a/tests/manifold/manifold_id_04.cc +++ /dev/null @@ -1,72 +0,0 @@ -//---------------------------- manifold_id_03.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_03.cc --------------------------- - - -// Test Manifold ID. Now we set differently the id of the first cell and its faces, and verify -// that the ids are correctly inherited from one cell onward. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Triangulation tria; - GridGenerator::hyper_cube (tria); - Point center; - - typename Triangulation::active_cell_iterator cell; - - - tria.begin_active()->set_manifold_id(3); - for(unsigned int f=0; f::faces_per_cell; ++f) - tria.begin_active()->face(f)->set_manifold_id(2); - - tria.refine_global(1); - - for(cell = tria.begin_active(); cell != tria.end(); ++cell) { - deallog << "C: " << cell - << ", mid: " << (int)cell->manifold_id() << std::endl; - for(unsigned int f=0; f::faces_per_cell; ++f) - deallog << "f: " << cell->face(f) - << ", mid: " << (int)cell->face(f)->manifold_id() << std::endl; - } - -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(1); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_04.output b/tests/manifold/manifold_id_04.output deleted file mode 100644 index 5429010f56..0000000000 --- a/tests/manifold/manifold_id_04.output +++ /dev/null @@ -1,114 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 1.0, mid: 3 -DEAL::f: 0, mid: 2 -DEAL::f: 2, mid: 3 -DEAL::C: 1.1, mid: 3 -DEAL::f: 2, mid: 3 -DEAL::f: 1, mid: 2 -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 1.0, mid: 3 -DEAL::f: 0, mid: 2 -DEAL::f: 2, mid: 3 -DEAL::C: 1.1, mid: 3 -DEAL::f: 2, mid: 3 -DEAL::f: 1, mid: 2 -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 1.0, mid: 3 -DEAL::f: 6, mid: 2 -DEAL::f: 12, mid: 3 -DEAL::f: 4, mid: 2 -DEAL::f: 14, mid: 3 -DEAL::C: 1.1, mid: 3 -DEAL::f: 12, mid: 3 -DEAL::f: 8, mid: 2 -DEAL::f: 5, mid: 2 -DEAL::f: 15, mid: 3 -DEAL::C: 1.2, mid: 3 -DEAL::f: 7, mid: 2 -DEAL::f: 13, mid: 3 -DEAL::f: 14, mid: 3 -DEAL::f: 10, mid: 2 -DEAL::C: 1.3, mid: 3 -DEAL::f: 13, mid: 3 -DEAL::f: 9, mid: 2 -DEAL::f: 15, mid: 3 -DEAL::f: 11, mid: 2 -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 1.0, mid: 3 -DEAL::f: 6, mid: 2 -DEAL::f: 12, mid: 3 -DEAL::f: 4, mid: 2 -DEAL::f: 14, mid: 3 -DEAL::C: 1.1, mid: 3 -DEAL::f: 12, mid: 3 -DEAL::f: 8, mid: 2 -DEAL::f: 5, mid: 2 -DEAL::f: 15, mid: 3 -DEAL::C: 1.2, mid: 3 -DEAL::f: 7, mid: 2 -DEAL::f: 13, mid: 3 -DEAL::f: 14, mid: 3 -DEAL::f: 10, mid: 2 -DEAL::C: 1.3, mid: 3 -DEAL::f: 13, mid: 3 -DEAL::f: 9, mid: 2 -DEAL::f: 15, mid: 3 -DEAL::f: 11, mid: 2 -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 1.0, mid: 3 -DEAL::f: 14, mid: 2 -DEAL::f: 41, mid: 3 -DEAL::f: 6, mid: 2 -DEAL::f: 37, mid: 3 -DEAL::f: 10, mid: 2 -DEAL::f: 33, mid: 3 -DEAL::C: 1.1, mid: 3 -DEAL::f: 41, mid: 3 -DEAL::f: 18, mid: 2 -DEAL::f: 8, mid: 2 -DEAL::f: 35, mid: 3 -DEAL::f: 11, mid: 2 -DEAL::f: 32, mid: 3 -DEAL::C: 1.2, mid: 3 -DEAL::f: 15, mid: 2 -DEAL::f: 40, mid: 3 -DEAL::f: 37, mid: 3 -DEAL::f: 22, mid: 2 -DEAL::f: 12, mid: 2 -DEAL::f: 31, mid: 3 -DEAL::C: 1.3, mid: 3 -DEAL::f: 40, mid: 3 -DEAL::f: 19, mid: 2 -DEAL::f: 35, mid: 3 -DEAL::f: 24, mid: 2 -DEAL::f: 13, mid: 2 -DEAL::f: 30, mid: 3 -DEAL::C: 1.4, mid: 3 -DEAL::f: 16, mid: 2 -DEAL::f: 39, mid: 3 -DEAL::f: 7, mid: 2 -DEAL::f: 36, mid: 3 -DEAL::f: 33, mid: 3 -DEAL::f: 26, mid: 2 -DEAL::C: 1.5, mid: 3 -DEAL::f: 39, mid: 3 -DEAL::f: 20, mid: 2 -DEAL::f: 9, mid: 2 -DEAL::f: 34, mid: 3 -DEAL::f: 32, mid: 3 -DEAL::f: 27, mid: 2 -DEAL::C: 1.6, mid: 3 -DEAL::f: 17, mid: 2 -DEAL::f: 38, mid: 3 -DEAL::f: 36, mid: 3 -DEAL::f: 23, mid: 2 -DEAL::f: 31, mid: 3 -DEAL::f: 28, mid: 2 -DEAL::C: 1.7, mid: 3 -DEAL::f: 38, mid: 3 -DEAL::f: 21, mid: 2 -DEAL::f: 34, mid: 3 -DEAL::f: 25, mid: 2 -DEAL::f: 30, mid: 3 -DEAL::f: 29, mid: 2 diff --git a/tests/manifold/manifold_id_05.cc b/tests/manifold/manifold_id_05.cc deleted file mode 100644 index 3d94f71390..0000000000 --- a/tests/manifold/manifold_id_05.cc +++ /dev/null @@ -1,81 +0,0 @@ -//---------------------------- manifold_id_05.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_05.cc --------------------------- - - -// Set a manifold id on one of the boundary face, and attach the -// boundary description to it. Refine globally twice and output the mesh. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Point center; - for(unsigned int i=0; i boundary(center); - Triangulation tria; - GridGenerator::hyper_cube (tria); - typename Triangulation::active_cell_iterator cell; - - tria.begin_active()->face(0)->set_manifold_id(1); - tria.set_manifold(1,boundary); - - tria.refine_global(2); - - for(cell=tria.begin_active(); cell!=tria.end(); ++cell) - { - deallog << "C: " << cell << std::endl; - for(unsigned int f=0; f::faces_per_cell;++f) - deallog << "F: " << cell->face(f) << ", mid: " - << (int) cell->face(f)->manifold_id() << std::endl; - } - - - GridOut gridout; - gridout.write_msh(tria, deallog.get_file_stream()); - char fname[30]; - sprintf(fname, "/tmp/id_5_mesh_%d_%d.msh", - dim, spacedim); - std::ofstream ofile(fname); - gridout.write_msh(tria,ofile); -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_05.output b/tests/manifold/manifold_id_05.output deleted file mode 100644 index 549537d16c..0000000000 --- a/tests/manifold/manifold_id_05.output +++ /dev/null @@ -1,957 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 2.0 -DEAL::F: 0, mid: 1 -DEAL::F: 3, mid: 255 -DEAL::C: 2.1 -DEAL::F: 3, mid: 255 -DEAL::F: 2, mid: 255 -DEAL::C: 2.2 -DEAL::F: 2, mid: 255 -DEAL::F: 4, mid: 255 -DEAL::C: 2.3 -DEAL::F: 4, mid: 255 -DEAL::F: 1, mid: 255 -$NOD -5 -1 0.00000 0 0 -2 1.00000 0 0 -3 0.500000 0 0 -4 0.250000 0 0 -5 0.750000 0 0 -$ENDNOD -$ELM -4 -1 1 0 0 2 1 4 -2 1 0 0 2 4 3 -3 1 0 0 2 3 5 -4 1 0 0 2 5 2 -$ENDELM -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 2.0 -DEAL::F: 0, mid: 1 -DEAL::F: 3, mid: 255 -DEAL::C: 2.1 -DEAL::F: 3, mid: 255 -DEAL::F: 2, mid: 255 -DEAL::C: 2.2 -DEAL::F: 2, mid: 255 -DEAL::F: 4, mid: 255 -DEAL::C: 2.3 -DEAL::F: 4, mid: 255 -DEAL::F: 1, mid: 255 -$NOD -5 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.500000 0.00000 0 -4 0.250000 0.00000 0 -5 0.750000 0.00000 0 -$ENDNOD -$ELM -4 -1 1 0 0 2 1 4 -2 1 0 0 2 4 3 -3 1 0 0 2 3 5 -4 1 0 0 2 5 2 -$ENDELM -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 2.0 -DEAL::F: 20, mid: 1 -DEAL::F: 40, mid: 255 -DEAL::F: 16, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::C: 2.1 -DEAL::F: 40, mid: 255 -DEAL::F: 32, mid: 255 -DEAL::F: 17, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::C: 2.2 -DEAL::F: 21, mid: 1 -DEAL::F: 41, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::C: 2.3 -DEAL::F: 41, mid: 255 -DEAL::F: 33, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::C: 2.4 -DEAL::F: 32, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 18, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::C: 2.5 -DEAL::F: 44, mid: 255 -DEAL::F: 24, mid: 255 -DEAL::F: 19, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::C: 2.6 -DEAL::F: 33, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::C: 2.7 -DEAL::F: 45, mid: 255 -DEAL::F: 25, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::C: 2.8 -DEAL::F: 22, mid: 1 -DEAL::F: 48, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::C: 2.9 -DEAL::F: 48, mid: 255 -DEAL::F: 34, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::C: 2.10 -DEAL::F: 23, mid: 1 -DEAL::F: 49, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 28, mid: 255 -DEAL::C: 2.11 -DEAL::F: 49, mid: 255 -DEAL::F: 35, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 29, mid: 255 -DEAL::C: 2.12 -DEAL::F: 34, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::C: 2.13 -DEAL::F: 52, mid: 255 -DEAL::F: 26, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::C: 2.14 -DEAL::F: 35, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 30, mid: 255 -DEAL::C: 2.15 -DEAL::F: 53, mid: 255 -DEAL::F: 27, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 31, mid: 255 -$NOD -25 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.00000 1.00000 0 -4 1.00000 1.00000 0 -5 0.500000 0.00000 0 -6 -0.207107 0.500000 0 -7 1.00000 0.500000 0 -8 0.500000 1.00000 0 -9 0.474112 0.500000 0 -10 0.250000 0.00000 0 -11 0.750000 0.00000 0 -12 -0.153281 0.229402 0 -13 -0.153281 0.770598 0 -14 1.00000 0.250000 0 -15 1.00000 0.750000 0 -16 0.250000 1.00000 0 -17 0.750000 1.00000 0 -18 0.487056 0.250000 0 -19 0.487056 0.750000 0 -20 0.133502 0.500000 0 -21 0.737056 0.500000 0 -22 0.185535 0.247425 0 -23 0.743528 0.250000 0 -24 0.185535 0.752575 0 -25 0.743528 0.750000 0 -$ENDNOD -$ELM -16 -1 3 0 0 4 1 10 22 12 -2 3 0 0 4 10 5 18 22 -3 3 0 0 4 12 22 20 6 -4 3 0 0 4 22 18 9 20 -5 3 0 0 4 5 11 23 18 -6 3 0 0 4 11 2 14 23 -7 3 0 0 4 18 23 21 9 -8 3 0 0 4 23 14 7 21 -9 3 0 0 4 6 20 24 13 -10 3 0 0 4 20 9 19 24 -11 3 0 0 4 13 24 16 3 -12 3 0 0 4 24 19 8 16 -13 3 0 0 4 9 21 25 19 -14 3 0 0 4 21 7 15 25 -15 3 0 0 4 19 25 17 8 -16 3 0 0 4 25 15 4 17 -$ENDELM -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 2.0 -DEAL::F: 20, mid: 1 -DEAL::F: 40, mid: 255 -DEAL::F: 16, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::C: 2.1 -DEAL::F: 40, mid: 255 -DEAL::F: 32, mid: 255 -DEAL::F: 17, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::C: 2.2 -DEAL::F: 21, mid: 1 -DEAL::F: 41, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::C: 2.3 -DEAL::F: 41, mid: 255 -DEAL::F: 33, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::C: 2.4 -DEAL::F: 32, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 18, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::C: 2.5 -DEAL::F: 44, mid: 255 -DEAL::F: 24, mid: 255 -DEAL::F: 19, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::C: 2.6 -DEAL::F: 33, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::C: 2.7 -DEAL::F: 45, mid: 255 -DEAL::F: 25, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::C: 2.8 -DEAL::F: 22, mid: 1 -DEAL::F: 48, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::C: 2.9 -DEAL::F: 48, mid: 255 -DEAL::F: 34, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::C: 2.10 -DEAL::F: 23, mid: 1 -DEAL::F: 49, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 28, mid: 255 -DEAL::C: 2.11 -DEAL::F: 49, mid: 255 -DEAL::F: 35, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 29, mid: 255 -DEAL::C: 2.12 -DEAL::F: 34, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::C: 2.13 -DEAL::F: 52, mid: 255 -DEAL::F: 26, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::C: 2.14 -DEAL::F: 35, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 30, mid: 255 -DEAL::C: 2.15 -DEAL::F: 53, mid: 255 -DEAL::F: 27, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 31, mid: 255 -$NOD -25 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.500000 0.00000 0.00000 -6 -0.207107 0.500000 0.00000 -7 1.00000 0.500000 0.00000 -8 0.500000 1.00000 0.00000 -9 0.474112 0.500000 0.00000 -10 0.250000 0.00000 0.00000 -11 0.750000 0.00000 0.00000 -12 -0.153281 0.229402 0.00000 -13 -0.153281 0.770598 0.00000 -14 1.00000 0.250000 0.00000 -15 1.00000 0.750000 0.00000 -16 0.250000 1.00000 0.00000 -17 0.750000 1.00000 0.00000 -18 0.487056 0.250000 0.00000 -19 0.487056 0.750000 0.00000 -20 0.133502 0.500000 0.00000 -21 0.737056 0.500000 0.00000 -22 0.185535 0.247425 0.00000 -23 0.743528 0.250000 0.00000 -24 0.185535 0.752575 0.00000 -25 0.743528 0.750000 0.00000 -$ENDNOD -$ELM -16 -1 3 0 0 4 1 10 22 12 -2 3 0 0 4 10 5 18 22 -3 3 0 0 4 12 22 20 6 -4 3 0 0 4 22 18 9 20 -5 3 0 0 4 5 11 23 18 -6 3 0 0 4 11 2 14 23 -7 3 0 0 4 18 23 21 9 -8 3 0 0 4 23 14 7 21 -9 3 0 0 4 6 20 24 13 -10 3 0 0 4 20 9 19 24 -11 3 0 0 4 13 24 16 3 -12 3 0 0 4 24 19 8 16 -13 3 0 0 4 9 21 25 19 -14 3 0 0 4 21 7 15 25 -15 3 0 0 4 19 25 17 8 -16 3 0 0 4 25 15 4 17 -$ENDELM -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 2.0 -DEAL::F: 74, mid: 1 -DEAL::F: 281, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 277, mid: 255 -DEAL::F: 58, mid: 255 -DEAL::F: 273, mid: 255 -DEAL::C: 2.1 -DEAL::F: 281, mid: 255 -DEAL::F: 182, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 275, mid: 255 -DEAL::F: 59, mid: 255 -DEAL::F: 272, mid: 255 -DEAL::C: 2.2 -DEAL::F: 75, mid: 1 -DEAL::F: 280, mid: 255 -DEAL::F: 277, mid: 255 -DEAL::F: 166, mid: 255 -DEAL::F: 60, mid: 255 -DEAL::F: 271, mid: 255 -DEAL::C: 2.3 -DEAL::F: 280, mid: 255 -DEAL::F: 183, mid: 255 -DEAL::F: 275, mid: 255 -DEAL::F: 168, mid: 255 -DEAL::F: 61, mid: 255 -DEAL::F: 270, mid: 255 -DEAL::C: 2.4 -DEAL::F: 76, mid: 1 -DEAL::F: 279, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 276, mid: 255 -DEAL::F: 273, mid: 255 -DEAL::F: 150, mid: 255 -DEAL::C: 2.5 -DEAL::F: 279, mid: 255 -DEAL::F: 184, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 274, mid: 255 -DEAL::F: 272, mid: 255 -DEAL::F: 151, mid: 255 -DEAL::C: 2.6 -DEAL::F: 77, mid: 1 -DEAL::F: 278, mid: 255 -DEAL::F: 276, mid: 255 -DEAL::F: 167, mid: 255 -DEAL::F: 271, mid: 255 -DEAL::F: 152, mid: 255 -DEAL::C: 2.7 -DEAL::F: 278, mid: 255 -DEAL::F: 185, mid: 255 -DEAL::F: 274, mid: 255 -DEAL::F: 169, mid: 255 -DEAL::F: 270, mid: 255 -DEAL::F: 153, mid: 255 -DEAL::C: 2.8 -DEAL::F: 182, mid: 255 -DEAL::F: 269, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 265, mid: 255 -DEAL::F: 62, mid: 255 -DEAL::F: 261, mid: 255 -DEAL::C: 2.9 -DEAL::F: 269, mid: 255 -DEAL::F: 90, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 263, mid: 255 -DEAL::F: 63, mid: 255 -DEAL::F: 260, mid: 255 -DEAL::C: 2.10 -DEAL::F: 183, mid: 255 -DEAL::F: 268, mid: 255 -DEAL::F: 265, mid: 255 -DEAL::F: 158, mid: 255 -DEAL::F: 64, mid: 255 -DEAL::F: 259, mid: 255 -DEAL::C: 2.11 -DEAL::F: 268, mid: 255 -DEAL::F: 91, mid: 255 -DEAL::F: 263, mid: 255 -DEAL::F: 160, mid: 255 -DEAL::F: 65, mid: 255 -DEAL::F: 258, mid: 255 -DEAL::C: 2.12 -DEAL::F: 184, mid: 255 -DEAL::F: 267, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 264, mid: 255 -DEAL::F: 261, mid: 255 -DEAL::F: 146, mid: 255 -DEAL::C: 2.13 -DEAL::F: 267, mid: 255 -DEAL::F: 92, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 262, mid: 255 -DEAL::F: 260, mid: 255 -DEAL::F: 147, mid: 255 -DEAL::C: 2.14 -DEAL::F: 185, mid: 255 -DEAL::F: 266, mid: 255 -DEAL::F: 264, mid: 255 -DEAL::F: 159, mid: 255 -DEAL::F: 259, mid: 255 -DEAL::F: 148, mid: 255 -DEAL::C: 2.15 -DEAL::F: 266, mid: 255 -DEAL::F: 93, mid: 255 -DEAL::F: 262, mid: 255 -DEAL::F: 161, mid: 255 -DEAL::F: 258, mid: 255 -DEAL::F: 149, mid: 255 -DEAL::C: 2.16 -DEAL::F: 78, mid: 1 -DEAL::F: 257, mid: 255 -DEAL::F: 166, mid: 255 -DEAL::F: 253, mid: 255 -DEAL::F: 66, mid: 255 -DEAL::F: 249, mid: 255 -DEAL::C: 2.17 -DEAL::F: 257, mid: 255 -DEAL::F: 178, mid: 255 -DEAL::F: 168, mid: 255 -DEAL::F: 251, mid: 255 -DEAL::F: 67, mid: 255 -DEAL::F: 248, mid: 255 -DEAL::C: 2.18 -DEAL::F: 79, mid: 1 -DEAL::F: 256, mid: 255 -DEAL::F: 253, mid: 255 -DEAL::F: 106, mid: 255 -DEAL::F: 68, mid: 255 -DEAL::F: 247, mid: 255 -DEAL::C: 2.19 -DEAL::F: 256, mid: 255 -DEAL::F: 179, mid: 255 -DEAL::F: 251, mid: 255 -DEAL::F: 108, mid: 255 -DEAL::F: 69, mid: 255 -DEAL::F: 246, mid: 255 -DEAL::C: 2.20 -DEAL::F: 80, mid: 1 -DEAL::F: 255, mid: 255 -DEAL::F: 167, mid: 255 -DEAL::F: 252, mid: 255 -DEAL::F: 249, mid: 255 -DEAL::F: 142, mid: 255 -DEAL::C: 2.21 -DEAL::F: 255, mid: 255 -DEAL::F: 180, mid: 255 -DEAL::F: 169, mid: 255 -DEAL::F: 250, mid: 255 -DEAL::F: 248, mid: 255 -DEAL::F: 143, mid: 255 -DEAL::C: 2.22 -DEAL::F: 81, mid: 1 -DEAL::F: 254, mid: 255 -DEAL::F: 252, mid: 255 -DEAL::F: 107, mid: 255 -DEAL::F: 247, mid: 255 -DEAL::F: 144, mid: 255 -DEAL::C: 2.23 -DEAL::F: 254, mid: 255 -DEAL::F: 181, mid: 255 -DEAL::F: 250, mid: 255 -DEAL::F: 109, mid: 255 -DEAL::F: 246, mid: 255 -DEAL::F: 145, mid: 255 -DEAL::C: 2.24 -DEAL::F: 178, mid: 255 -DEAL::F: 245, mid: 255 -DEAL::F: 158, mid: 255 -DEAL::F: 241, mid: 255 -DEAL::F: 70, mid: 255 -DEAL::F: 237, mid: 255 -DEAL::C: 2.25 -DEAL::F: 245, mid: 255 -DEAL::F: 94, mid: 255 -DEAL::F: 160, mid: 255 -DEAL::F: 239, mid: 255 -DEAL::F: 71, mid: 255 -DEAL::F: 236, mid: 255 -DEAL::C: 2.26 -DEAL::F: 179, mid: 255 -DEAL::F: 244, mid: 255 -DEAL::F: 241, mid: 255 -DEAL::F: 114, mid: 255 -DEAL::F: 72, mid: 255 -DEAL::F: 235, mid: 255 -DEAL::C: 2.27 -DEAL::F: 244, mid: 255 -DEAL::F: 95, mid: 255 -DEAL::F: 239, mid: 255 -DEAL::F: 116, mid: 255 -DEAL::F: 73, mid: 255 -DEAL::F: 234, mid: 255 -DEAL::C: 2.28 -DEAL::F: 180, mid: 255 -DEAL::F: 243, mid: 255 -DEAL::F: 159, mid: 255 -DEAL::F: 240, mid: 255 -DEAL::F: 237, mid: 255 -DEAL::F: 138, mid: 255 -DEAL::C: 2.29 -DEAL::F: 243, mid: 255 -DEAL::F: 96, mid: 255 -DEAL::F: 161, mid: 255 -DEAL::F: 238, mid: 255 -DEAL::F: 236, mid: 255 -DEAL::F: 139, mid: 255 -DEAL::C: 2.30 -DEAL::F: 181, mid: 255 -DEAL::F: 242, mid: 255 -DEAL::F: 240, mid: 255 -DEAL::F: 115, mid: 255 -DEAL::F: 235, mid: 255 -DEAL::F: 140, mid: 255 -DEAL::C: 2.31 -DEAL::F: 242, mid: 255 -DEAL::F: 97, mid: 255 -DEAL::F: 238, mid: 255 -DEAL::F: 117, mid: 255 -DEAL::F: 234, mid: 255 -DEAL::F: 141, mid: 255 -DEAL::C: 2.32 -DEAL::F: 82, mid: 1 -DEAL::F: 233, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 229, mid: 255 -DEAL::F: 150, mid: 255 -DEAL::F: 225, mid: 255 -DEAL::C: 2.33 -DEAL::F: 233, mid: 255 -DEAL::F: 174, mid: 255 -DEAL::F: 48, mid: 255 -DEAL::F: 227, mid: 255 -DEAL::F: 151, mid: 255 -DEAL::F: 224, mid: 255 -DEAL::C: 2.34 -DEAL::F: 83, mid: 1 -DEAL::F: 232, mid: 255 -DEAL::F: 229, mid: 255 -DEAL::F: 162, mid: 255 -DEAL::F: 152, mid: 255 -DEAL::F: 223, mid: 255 -DEAL::C: 2.35 -DEAL::F: 232, mid: 255 -DEAL::F: 175, mid: 255 -DEAL::F: 227, mid: 255 -DEAL::F: 164, mid: 255 -DEAL::F: 153, mid: 255 -DEAL::F: 222, mid: 255 -DEAL::C: 2.36 -DEAL::F: 84, mid: 1 -DEAL::F: 231, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 228, mid: 255 -DEAL::F: 225, mid: 255 -DEAL::F: 122, mid: 255 -DEAL::C: 2.37 -DEAL::F: 231, mid: 255 -DEAL::F: 176, mid: 255 -DEAL::F: 49, mid: 255 -DEAL::F: 226, mid: 255 -DEAL::F: 224, mid: 255 -DEAL::F: 123, mid: 255 -DEAL::C: 2.38 -DEAL::F: 85, mid: 1 -DEAL::F: 230, mid: 255 -DEAL::F: 228, mid: 255 -DEAL::F: 163, mid: 255 -DEAL::F: 223, mid: 255 -DEAL::F: 124, mid: 255 -DEAL::C: 2.39 -DEAL::F: 230, mid: 255 -DEAL::F: 177, mid: 255 -DEAL::F: 226, mid: 255 -DEAL::F: 165, mid: 255 -DEAL::F: 222, mid: 255 -DEAL::F: 125, mid: 255 -DEAL::C: 2.40 -DEAL::F: 174, mid: 255 -DEAL::F: 221, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 217, mid: 255 -DEAL::F: 146, mid: 255 -DEAL::F: 213, mid: 255 -DEAL::C: 2.41 -DEAL::F: 221, mid: 255 -DEAL::F: 98, mid: 255 -DEAL::F: 56, mid: 255 -DEAL::F: 215, mid: 255 -DEAL::F: 147, mid: 255 -DEAL::F: 212, mid: 255 -DEAL::C: 2.42 -DEAL::F: 175, mid: 255 -DEAL::F: 220, mid: 255 -DEAL::F: 217, mid: 255 -DEAL::F: 154, mid: 255 -DEAL::F: 148, mid: 255 -DEAL::F: 211, mid: 255 -DEAL::C: 2.43 -DEAL::F: 220, mid: 255 -DEAL::F: 99, mid: 255 -DEAL::F: 215, mid: 255 -DEAL::F: 156, mid: 255 -DEAL::F: 149, mid: 255 -DEAL::F: 210, mid: 255 -DEAL::C: 2.44 -DEAL::F: 176, mid: 255 -DEAL::F: 219, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 216, mid: 255 -DEAL::F: 213, mid: 255 -DEAL::F: 126, mid: 255 -DEAL::C: 2.45 -DEAL::F: 219, mid: 255 -DEAL::F: 100, mid: 255 -DEAL::F: 57, mid: 255 -DEAL::F: 214, mid: 255 -DEAL::F: 212, mid: 255 -DEAL::F: 127, mid: 255 -DEAL::C: 2.46 -DEAL::F: 177, mid: 255 -DEAL::F: 218, mid: 255 -DEAL::F: 216, mid: 255 -DEAL::F: 155, mid: 255 -DEAL::F: 211, mid: 255 -DEAL::F: 128, mid: 255 -DEAL::C: 2.47 -DEAL::F: 218, mid: 255 -DEAL::F: 101, mid: 255 -DEAL::F: 214, mid: 255 -DEAL::F: 157, mid: 255 -DEAL::F: 210, mid: 255 -DEAL::F: 129, mid: 255 -DEAL::C: 2.48 -DEAL::F: 86, mid: 1 -DEAL::F: 209, mid: 255 -DEAL::F: 162, mid: 255 -DEAL::F: 205, mid: 255 -DEAL::F: 142, mid: 255 -DEAL::F: 201, mid: 255 -DEAL::C: 2.49 -DEAL::F: 209, mid: 255 -DEAL::F: 170, mid: 255 -DEAL::F: 164, mid: 255 -DEAL::F: 203, mid: 255 -DEAL::F: 143, mid: 255 -DEAL::F: 200, mid: 255 -DEAL::C: 2.50 -DEAL::F: 87, mid: 1 -DEAL::F: 208, mid: 255 -DEAL::F: 205, mid: 255 -DEAL::F: 110, mid: 255 -DEAL::F: 144, mid: 255 -DEAL::F: 199, mid: 255 -DEAL::C: 2.51 -DEAL::F: 208, mid: 255 -DEAL::F: 171, mid: 255 -DEAL::F: 203, mid: 255 -DEAL::F: 112, mid: 255 -DEAL::F: 145, mid: 255 -DEAL::F: 198, mid: 255 -DEAL::C: 2.52 -DEAL::F: 88, mid: 1 -DEAL::F: 207, mid: 255 -DEAL::F: 163, mid: 255 -DEAL::F: 204, mid: 255 -DEAL::F: 201, mid: 255 -DEAL::F: 130, mid: 255 -DEAL::C: 2.53 -DEAL::F: 207, mid: 255 -DEAL::F: 172, mid: 255 -DEAL::F: 165, mid: 255 -DEAL::F: 202, mid: 255 -DEAL::F: 200, mid: 255 -DEAL::F: 131, mid: 255 -DEAL::C: 2.54 -DEAL::F: 89, mid: 1 -DEAL::F: 206, mid: 255 -DEAL::F: 204, mid: 255 -DEAL::F: 111, mid: 255 -DEAL::F: 199, mid: 255 -DEAL::F: 132, mid: 255 -DEAL::C: 2.55 -DEAL::F: 206, mid: 255 -DEAL::F: 173, mid: 255 -DEAL::F: 202, mid: 255 -DEAL::F: 113, mid: 255 -DEAL::F: 198, mid: 255 -DEAL::F: 133, mid: 255 -DEAL::C: 2.56 -DEAL::F: 170, mid: 255 -DEAL::F: 197, mid: 255 -DEAL::F: 154, mid: 255 -DEAL::F: 193, mid: 255 -DEAL::F: 138, mid: 255 -DEAL::F: 189, mid: 255 -DEAL::C: 2.57 -DEAL::F: 197, mid: 255 -DEAL::F: 102, mid: 255 -DEAL::F: 156, mid: 255 -DEAL::F: 191, mid: 255 -DEAL::F: 139, mid: 255 -DEAL::F: 188, mid: 255 -DEAL::C: 2.58 -DEAL::F: 171, mid: 255 -DEAL::F: 196, mid: 255 -DEAL::F: 193, mid: 255 -DEAL::F: 118, mid: 255 -DEAL::F: 140, mid: 255 -DEAL::F: 187, mid: 255 -DEAL::C: 2.59 -DEAL::F: 196, mid: 255 -DEAL::F: 103, mid: 255 -DEAL::F: 191, mid: 255 -DEAL::F: 120, mid: 255 -DEAL::F: 141, mid: 255 -DEAL::F: 186, mid: 255 -DEAL::C: 2.60 -DEAL::F: 172, mid: 255 -DEAL::F: 195, mid: 255 -DEAL::F: 155, mid: 255 -DEAL::F: 192, mid: 255 -DEAL::F: 189, mid: 255 -DEAL::F: 134, mid: 255 -DEAL::C: 2.61 -DEAL::F: 195, mid: 255 -DEAL::F: 104, mid: 255 -DEAL::F: 157, mid: 255 -DEAL::F: 190, mid: 255 -DEAL::F: 188, mid: 255 -DEAL::F: 135, mid: 255 -DEAL::C: 2.62 -DEAL::F: 173, mid: 255 -DEAL::F: 194, mid: 255 -DEAL::F: 192, mid: 255 -DEAL::F: 119, mid: 255 -DEAL::F: 187, mid: 255 -DEAL::F: 136, mid: 255 -DEAL::C: 2.63 -DEAL::F: 194, mid: 255 -DEAL::F: 105, mid: 255 -DEAL::F: 190, mid: 255 -DEAL::F: 121, mid: 255 -DEAL::F: 186, mid: 255 -DEAL::F: 137, mid: 255 -$NOD -125 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.00000 0.00000 1.00000 -6 1.00000 0.00000 1.00000 -7 0.00000 1.00000 1.00000 -8 1.00000 1.00000 1.00000 -9 0.500000 0.00000 0.00000 -10 0.00000 0.500000 0.00000 -11 0.00000 0.00000 0.500000 -12 1.00000 0.500000 0.00000 -13 1.00000 0.00000 0.500000 -14 0.500000 1.00000 0.00000 -15 0.00000 1.00000 0.500000 -16 1.00000 1.00000 0.500000 -17 0.500000 0.00000 1.00000 -18 0.00000 0.500000 1.00000 -19 1.00000 0.500000 1.00000 -20 0.500000 1.00000 1.00000 -21 0.500000 0.00000 0.500000 -22 0.500000 0.500000 0.00000 -23 -0.366025 0.500000 0.500000 -24 1.00000 0.500000 0.500000 -25 0.500000 1.00000 0.500000 -26 0.500000 0.500000 1.00000 -27 0.469498 0.500000 0.500000 -28 0.250000 0.00000 0.00000 -29 0.750000 0.00000 0.00000 -30 0.00000 0.250000 0.00000 -31 0.00000 0.750000 0.00000 -32 0.00000 0.00000 0.250000 -33 0.00000 0.00000 0.750000 -34 1.00000 0.250000 0.00000 -35 1.00000 0.750000 0.00000 -36 1.00000 0.00000 0.250000 -37 1.00000 0.00000 0.750000 -38 0.250000 1.00000 0.00000 -39 0.750000 1.00000 0.00000 -40 0.00000 1.00000 0.250000 -41 0.00000 1.00000 0.750000 -42 1.00000 1.00000 0.250000 -43 1.00000 1.00000 0.750000 -44 0.250000 0.00000 1.00000 -45 0.750000 0.00000 1.00000 -46 0.00000 0.250000 1.00000 -47 0.00000 0.750000 1.00000 -48 1.00000 0.250000 1.00000 -49 1.00000 0.750000 1.00000 -50 0.250000 1.00000 1.00000 -51 0.750000 1.00000 1.00000 -52 0.250000 0.00000 0.500000 -53 0.750000 0.00000 0.500000 -54 0.500000 0.00000 0.250000 -55 0.500000 0.00000 0.750000 -56 0.500000 0.250000 0.00000 -57 0.500000 0.750000 0.00000 -58 0.250000 0.500000 0.00000 -59 0.750000 0.500000 0.00000 -60 -0.313259 0.500000 0.202326 -61 -0.313259 0.500000 0.797674 -62 -0.313259 0.202326 0.500000 -63 -0.313259 0.797674 0.500000 -64 1.00000 0.500000 0.250000 -65 1.00000 0.500000 0.750000 -66 1.00000 0.250000 0.500000 -67 1.00000 0.750000 0.500000 -68 0.250000 1.00000 0.500000 -69 0.750000 1.00000 0.500000 -70 0.500000 1.00000 0.250000 -71 0.500000 1.00000 0.750000 -72 0.500000 0.250000 1.00000 -73 0.500000 0.750000 1.00000 -74 0.250000 0.500000 1.00000 -75 0.750000 0.500000 1.00000 -76 0.484749 0.500000 0.750000 -77 0.484749 0.500000 0.250000 -78 0.734749 0.500000 0.500000 -79 0.0517362 0.500000 0.500000 -80 0.484749 0.750000 0.500000 -81 0.484749 0.250000 0.500000 -82 0.250000 0.00000 0.250000 -83 0.250000 0.00000 0.750000 -84 0.750000 0.00000 0.250000 -85 0.750000 0.00000 0.750000 -86 0.250000 0.250000 0.00000 -87 0.750000 0.250000 0.00000 -88 0.250000 0.750000 0.00000 -89 0.750000 0.750000 0.00000 -90 -0.249128 0.192748 0.192748 -91 -0.249128 0.807252 0.192748 -92 -0.249128 0.192748 0.807252 -93 -0.249128 0.807252 0.807252 -94 1.00000 0.250000 0.250000 -95 1.00000 0.750000 0.250000 -96 1.00000 0.250000 0.750000 -97 1.00000 0.750000 0.750000 -98 0.250000 1.00000 0.250000 -99 0.250000 1.00000 0.750000 -100 0.750000 1.00000 0.250000 -101 0.750000 1.00000 0.750000 -102 0.250000 0.250000 1.00000 -103 0.750000 0.250000 1.00000 -104 0.250000 0.750000 1.00000 -105 0.750000 0.750000 1.00000 -106 0.742374 0.750000 0.500000 -107 0.126447 0.758939 0.500000 -108 0.742374 0.250000 0.500000 -109 0.126447 0.241061 0.500000 -110 0.742374 0.500000 0.750000 -111 0.742374 0.500000 0.250000 -112 0.126447 0.500000 0.758939 -113 0.126447 0.500000 0.241061 -114 0.492374 0.750000 0.750000 -115 0.492374 0.250000 0.750000 -116 0.492374 0.750000 0.250000 -117 0.492374 0.250000 0.250000 -118 0.173732 0.242746 0.242746 -119 0.746187 0.250000 0.250000 -120 0.173732 0.757254 0.242746 -121 0.746187 0.750000 0.250000 -122 0.173732 0.242746 0.757254 -123 0.746187 0.250000 0.750000 -124 0.173732 0.757254 0.757254 -125 0.746187 0.750000 0.750000 -$ENDNOD -$ELM -64 -1 5 0 0 8 1 28 82 32 30 86 118 90 -2 5 0 0 8 28 9 54 82 86 56 117 118 -3 5 0 0 8 30 86 118 90 10 58 113 60 -4 5 0 0 8 86 56 117 118 58 22 77 113 -5 5 0 0 8 32 82 52 11 90 118 109 62 -6 5 0 0 8 82 54 21 52 118 117 81 109 -7 5 0 0 8 90 118 109 62 60 113 79 23 -8 5 0 0 8 118 117 81 109 113 77 27 79 -9 5 0 0 8 9 29 84 54 56 87 119 117 -10 5 0 0 8 29 2 36 84 87 34 94 119 -11 5 0 0 8 56 87 119 117 22 59 111 77 -12 5 0 0 8 87 34 94 119 59 12 64 111 -13 5 0 0 8 54 84 53 21 117 119 108 81 -14 5 0 0 8 84 36 13 53 119 94 66 108 -15 5 0 0 8 117 119 108 81 77 111 78 27 -16 5 0 0 8 119 94 66 108 111 64 24 78 -17 5 0 0 8 10 58 113 60 31 88 120 91 -18 5 0 0 8 58 22 77 113 88 57 116 120 -19 5 0 0 8 31 88 120 91 3 38 98 40 -20 5 0 0 8 88 57 116 120 38 14 70 98 -21 5 0 0 8 60 113 79 23 91 120 107 63 -22 5 0 0 8 113 77 27 79 120 116 80 107 -23 5 0 0 8 91 120 107 63 40 98 68 15 -24 5 0 0 8 120 116 80 107 98 70 25 68 -25 5 0 0 8 22 59 111 77 57 89 121 116 -26 5 0 0 8 59 12 64 111 89 35 95 121 -27 5 0 0 8 57 89 121 116 14 39 100 70 -28 5 0 0 8 89 35 95 121 39 4 42 100 -29 5 0 0 8 77 111 78 27 116 121 106 80 -30 5 0 0 8 111 64 24 78 121 95 67 106 -31 5 0 0 8 116 121 106 80 70 100 69 25 -32 5 0 0 8 121 95 67 106 100 42 16 69 -33 5 0 0 8 11 52 83 33 62 109 122 92 -34 5 0 0 8 52 21 55 83 109 81 115 122 -35 5 0 0 8 62 109 122 92 23 79 112 61 -36 5 0 0 8 109 81 115 122 79 27 76 112 -37 5 0 0 8 33 83 44 5 92 122 102 46 -38 5 0 0 8 83 55 17 44 122 115 72 102 -39 5 0 0 8 92 122 102 46 61 112 74 18 -40 5 0 0 8 122 115 72 102 112 76 26 74 -41 5 0 0 8 21 53 85 55 81 108 123 115 -42 5 0 0 8 53 13 37 85 108 66 96 123 -43 5 0 0 8 81 108 123 115 27 78 110 76 -44 5 0 0 8 108 66 96 123 78 24 65 110 -45 5 0 0 8 55 85 45 17 115 123 103 72 -46 5 0 0 8 85 37 6 45 123 96 48 103 -47 5 0 0 8 115 123 103 72 76 110 75 26 -48 5 0 0 8 123 96 48 103 110 65 19 75 -49 5 0 0 8 23 79 112 61 63 107 124 93 -50 5 0 0 8 79 27 76 112 107 80 114 124 -51 5 0 0 8 63 107 124 93 15 68 99 41 -52 5 0 0 8 107 80 114 124 68 25 71 99 -53 5 0 0 8 61 112 74 18 93 124 104 47 -54 5 0 0 8 112 76 26 74 124 114 73 104 -55 5 0 0 8 93 124 104 47 41 99 50 7 -56 5 0 0 8 124 114 73 104 99 71 20 50 -57 5 0 0 8 27 78 110 76 80 106 125 114 -58 5 0 0 8 78 24 65 110 106 67 97 125 -59 5 0 0 8 80 106 125 114 25 69 101 71 -60 5 0 0 8 106 67 97 125 69 16 43 101 -61 5 0 0 8 76 110 75 26 114 125 105 73 -62 5 0 0 8 110 65 19 75 125 97 49 105 -63 5 0 0 8 114 125 105 73 71 101 51 20 -64 5 0 0 8 125 97 49 105 101 43 8 51 -$ENDELM diff --git a/tests/manifold/manifold_id_06.cc b/tests/manifold/manifold_id_06.cc deleted file mode 100644 index ccf108b4ff..0000000000 --- a/tests/manifold/manifold_id_06.cc +++ /dev/null @@ -1,82 +0,0 @@ -//---------------------------- manifold_id_06.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_06.cc --------------------------- - - -// Set a manifold id on the boundary faces of a small cell, and change also -// the interior boundaries. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Point center; - for(unsigned int i=0; i boundary(center); - Triangulation tria; - GridGenerator::hyper_cube (tria); - typename Triangulation::active_cell_iterator cell; - - tria.refine_global(1); - - for(cell=tria.begin_active(); cell!=tria.end(); ++cell) - if(dimcenter().distance(center)set_all_manifold_ids(1); - else - for(unsigned int f=0; f::faces_per_cell;++f) - if(cell->face(f)->center().distance(center)< radius) - cell->face(f)->set_all_manifold_ids(1); - - tria.set_manifold(1,boundary); - tria.refine_global(2); - - GridOut gridout; - gridout.write_msh(tria, deallog.get_file_stream()); - char fname[30]; - sprintf(fname, "/tmp/id_6_mesh_%d_%d.msh", - dim, spacedim); - std::ofstream ofile(fname); - gridout.write_msh(tria,ofile); -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_06.output b/tests/manifold/manifold_id_06.output deleted file mode 100644 index 641ee09359..0000000000 --- a/tests/manifold/manifold_id_06.output +++ /dev/null @@ -1,1601 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -$NOD -9 -1 0.00000 0 0 -2 1.00000 0 0 -3 0.500000 0 0 -4 0.250000 0 0 -5 0.750000 0 0 -6 0.125000 0 0 -7 0.375000 0 0 -8 0.625000 0 0 -9 0.875000 0 0 -$ENDNOD -$ELM -8 -1 1 0 0 2 1 6 -2 1 0 0 2 6 4 -3 1 0 0 2 4 7 -4 1 0 0 2 7 3 -5 1 0 0 2 3 8 -6 1 0 0 2 8 5 -7 1 0 0 2 5 9 -8 1 0 0 2 9 2 -$ENDELM -DEAL::Testing dim=1, spacedim=2 -$NOD -9 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.500000 0.00000 0 -4 0.250000 -0.103553 0 -5 0.750000 0.00000 0 -6 0.114701 -0.0766407 0 -7 0.385299 -0.0766407 0 -8 0.625000 0.00000 0 -9 0.875000 0.00000 0 -$ENDNOD -$ELM -8 -1 1 0 0 2 1 6 -2 1 0 0 2 6 4 -3 1 0 0 2 4 7 -4 1 0 0 2 7 3 -5 1 0 0 2 3 8 -6 1 0 0 2 8 5 -7 1 0 0 2 5 9 -8 1 0 0 2 9 2 -$ENDELM -DEAL::Testing dim=2, spacedim=2 -$NOD -81 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.00000 1.00000 0 -4 1.00000 1.00000 0 -5 0.500000 0.00000 0 -6 0.00000 0.500000 0 -7 1.00000 0.500000 0 -8 0.500000 1.00000 0 -9 0.500000 0.500000 0 -10 0.250000 -0.103553 0 -11 0.750000 0.00000 0 -12 -0.103553 0.250000 0 -13 0.00000 0.750000 0 -14 1.00000 0.250000 0 -15 1.00000 0.750000 0 -16 0.250000 1.00000 0 -17 0.750000 1.00000 0 -18 0.603553 0.250000 0 -19 0.500000 0.750000 0 -20 0.250000 0.603553 0 -21 0.750000 0.500000 0 -22 0.250000 0.250000 0 -23 0.762944 0.250000 0 -24 0.250000 0.762944 0 -25 0.750000 0.750000 0 -26 0.114701 -0.0766407 0 -27 0.385299 -0.0766407 0 -28 0.625000 0.00000 0 -29 0.875000 0.00000 0 -30 -0.0766407 0.114701 0 -31 -0.0766407 0.385299 0 -32 0.00000 0.625000 0 -33 0.00000 0.875000 0 -34 1.00000 0.125000 0 -35 1.00000 0.375000 0 -36 1.00000 0.625000 0 -37 1.00000 0.875000 0 -38 0.125000 1.00000 0 -39 0.375000 1.00000 0 -40 0.625000 1.00000 0 -41 0.875000 1.00000 0 -42 0.576641 0.114701 0 -43 0.576641 0.385299 0 -44 0.500000 0.625000 0 -45 0.500000 0.875000 0 -46 0.114701 0.576641 0 -47 0.385299 0.576641 0 -48 0.625000 0.500000 0 -49 0.875000 0.500000 0 -50 0.250000 0.0732233 0 -51 0.250000 0.426777 0 -52 0.0732233 0.250000 0 -53 0.426777 0.250000 0 -54 0.756472 0.125000 0 -55 0.756472 0.375000 0 -56 0.683249 0.250000 0 -57 0.881472 0.250000 0 -58 0.250000 0.683249 0 -59 0.250000 0.881472 0 -60 0.125000 0.756472 0 -61 0.375000 0.756472 0 -62 0.750000 0.625000 0 -63 0.750000 0.875000 0 -64 0.625000 0.750000 0 -65 0.875000 0.750000 0 -66 0.0947163 0.0947163 0 -67 0.406038 0.0866796 0 -68 0.0866796 0.406038 0 -69 0.405284 0.405284 0 -70 0.654124 0.125000 0 -71 0.878236 0.125000 0 -72 0.657232 0.376287 0 -73 0.878236 0.375000 0 -74 0.125000 0.654124 0 -75 0.376287 0.657232 0 -76 0.125000 0.878236 0 -77 0.375000 0.878236 0 -78 0.625000 0.625000 0 -79 0.875000 0.625000 0 -80 0.625000 0.875000 0 -81 0.875000 0.875000 0 -$ENDNOD -$ELM -64 -1 3 0 0 4 1 26 66 30 -2 3 0 0 4 26 10 50 66 -3 3 0 0 4 30 66 52 12 -4 3 0 0 4 66 50 22 52 -5 3 0 0 4 10 27 67 50 -6 3 0 0 4 27 5 42 67 -7 3 0 0 4 50 67 53 22 -8 3 0 0 4 67 42 18 53 -9 3 0 0 4 12 52 68 31 -10 3 0 0 4 52 22 51 68 -11 3 0 0 4 31 68 46 6 -12 3 0 0 4 68 51 20 46 -13 3 0 0 4 22 53 69 51 -14 3 0 0 4 53 18 43 69 -15 3 0 0 4 51 69 47 20 -16 3 0 0 4 69 43 9 47 -17 3 0 0 4 5 28 70 42 -18 3 0 0 4 28 11 54 70 -19 3 0 0 4 42 70 56 18 -20 3 0 0 4 70 54 23 56 -21 3 0 0 4 11 29 71 54 -22 3 0 0 4 29 2 34 71 -23 3 0 0 4 54 71 57 23 -24 3 0 0 4 71 34 14 57 -25 3 0 0 4 18 56 72 43 -26 3 0 0 4 56 23 55 72 -27 3 0 0 4 43 72 48 9 -28 3 0 0 4 72 55 21 48 -29 3 0 0 4 23 57 73 55 -30 3 0 0 4 57 14 35 73 -31 3 0 0 4 55 73 49 21 -32 3 0 0 4 73 35 7 49 -33 3 0 0 4 6 46 74 32 -34 3 0 0 4 46 20 58 74 -35 3 0 0 4 32 74 60 13 -36 3 0 0 4 74 58 24 60 -37 3 0 0 4 20 47 75 58 -38 3 0 0 4 47 9 44 75 -39 3 0 0 4 58 75 61 24 -40 3 0 0 4 75 44 19 61 -41 3 0 0 4 13 60 76 33 -42 3 0 0 4 60 24 59 76 -43 3 0 0 4 33 76 38 3 -44 3 0 0 4 76 59 16 38 -45 3 0 0 4 24 61 77 59 -46 3 0 0 4 61 19 45 77 -47 3 0 0 4 59 77 39 16 -48 3 0 0 4 77 45 8 39 -49 3 0 0 4 9 48 78 44 -50 3 0 0 4 48 21 62 78 -51 3 0 0 4 44 78 64 19 -52 3 0 0 4 78 62 25 64 -53 3 0 0 4 21 49 79 62 -54 3 0 0 4 49 7 36 79 -55 3 0 0 4 62 79 65 25 -56 3 0 0 4 79 36 15 65 -57 3 0 0 4 19 64 80 45 -58 3 0 0 4 64 25 63 80 -59 3 0 0 4 45 80 40 8 -60 3 0 0 4 80 63 17 40 -61 3 0 0 4 25 65 81 63 -62 3 0 0 4 65 15 37 81 -63 3 0 0 4 63 81 41 17 -64 3 0 0 4 81 37 4 41 -$ENDELM -DEAL::Testing dim=2, spacedim=3 -$NOD -81 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.500000 0.00000 0.00000 -6 0.00000 0.500000 0.00000 -7 1.00000 0.500000 0.00000 -8 0.500000 1.00000 0.00000 -9 0.500000 0.500000 0.00000 -10 0.250000 -0.0561862 -0.0561862 -11 0.750000 0.00000 0.00000 -12 -0.0561862 0.250000 -0.0561862 -13 0.00000 0.750000 0.00000 -14 1.00000 0.250000 0.00000 -15 1.00000 0.750000 0.00000 -16 0.250000 1.00000 0.00000 -17 0.750000 1.00000 0.00000 -18 0.556186 0.250000 -0.0561862 -19 0.500000 0.750000 0.00000 -20 0.250000 0.556186 -0.0561862 -21 0.750000 0.500000 0.00000 -22 0.250000 0.250000 -0.183013 -23 0.757023 0.250000 -0.00702328 -24 0.250000 0.757023 -0.00702328 -25 0.750000 0.750000 0.00000 -26 0.118838 -0.0418018 -0.0418018 -27 0.381162 -0.0418018 -0.0418018 -28 0.625000 0.00000 0.00000 -29 0.875000 0.00000 0.00000 -30 -0.0418018 0.118838 -0.0418018 -31 -0.0418018 0.381162 -0.0418018 -32 0.00000 0.625000 0.00000 -33 0.00000 0.875000 0.00000 -34 1.00000 0.125000 0.00000 -35 1.00000 0.375000 0.00000 -36 1.00000 0.625000 0.00000 -37 1.00000 0.875000 0.00000 -38 0.125000 1.00000 0.00000 -39 0.375000 1.00000 0.00000 -40 0.625000 1.00000 0.00000 -41 0.875000 1.00000 0.00000 -42 0.541802 0.118838 -0.0418018 -43 0.541802 0.381162 -0.0418018 -44 0.500000 0.625000 0.00000 -45 0.500000 0.875000 0.00000 -46 0.118838 0.541802 -0.0418018 -47 0.381162 0.541802 -0.0418018 -48 0.625000 0.500000 0.00000 -49 0.875000 0.500000 0.00000 -50 0.250000 0.0842932 -0.150052 -51 0.250000 0.415707 -0.150052 -52 0.0842932 0.250000 -0.150052 -53 0.415707 0.250000 -0.150052 -54 0.753512 0.125000 -0.00351164 -55 0.753512 0.375000 -0.00351164 -56 0.656605 0.250000 -0.0316047 -57 0.878512 0.250000 -0.00351164 -58 0.250000 0.656605 -0.0316047 -59 0.250000 0.878512 -0.00351164 -60 0.125000 0.753512 -0.00351164 -61 0.375000 0.753512 -0.00351164 -62 0.750000 0.625000 0.00000 -63 0.750000 0.875000 0.00000 -64 0.625000 0.750000 0.00000 -65 0.875000 0.750000 0.00000 -66 0.0916338 0.0916338 -0.120595 -67 0.408366 0.0916338 -0.120595 -68 0.0916338 0.408366 -0.120595 -69 0.408366 0.408366 -0.120595 -70 0.642516 0.124230 -0.0175160 -71 0.876756 0.125000 -0.00175582 -72 0.642516 0.375770 -0.0175160 -73 0.876756 0.375000 -0.00175582 -74 0.124230 0.642516 -0.0175160 -75 0.375770 0.642516 -0.0175160 -76 0.125000 0.876756 -0.00175582 -77 0.375000 0.876756 -0.00175582 -78 0.625000 0.625000 0.00000 -79 0.875000 0.625000 0.00000 -80 0.625000 0.875000 0.00000 -81 0.875000 0.875000 0.00000 -$ENDNOD -$ELM -64 -1 3 0 0 4 1 26 66 30 -2 3 0 0 4 26 10 50 66 -3 3 0 0 4 30 66 52 12 -4 3 0 0 4 66 50 22 52 -5 3 0 0 4 10 27 67 50 -6 3 0 0 4 27 5 42 67 -7 3 0 0 4 50 67 53 22 -8 3 0 0 4 67 42 18 53 -9 3 0 0 4 12 52 68 31 -10 3 0 0 4 52 22 51 68 -11 3 0 0 4 31 68 46 6 -12 3 0 0 4 68 51 20 46 -13 3 0 0 4 22 53 69 51 -14 3 0 0 4 53 18 43 69 -15 3 0 0 4 51 69 47 20 -16 3 0 0 4 69 43 9 47 -17 3 0 0 4 5 28 70 42 -18 3 0 0 4 28 11 54 70 -19 3 0 0 4 42 70 56 18 -20 3 0 0 4 70 54 23 56 -21 3 0 0 4 11 29 71 54 -22 3 0 0 4 29 2 34 71 -23 3 0 0 4 54 71 57 23 -24 3 0 0 4 71 34 14 57 -25 3 0 0 4 18 56 72 43 -26 3 0 0 4 56 23 55 72 -27 3 0 0 4 43 72 48 9 -28 3 0 0 4 72 55 21 48 -29 3 0 0 4 23 57 73 55 -30 3 0 0 4 57 14 35 73 -31 3 0 0 4 55 73 49 21 -32 3 0 0 4 73 35 7 49 -33 3 0 0 4 6 46 74 32 -34 3 0 0 4 46 20 58 74 -35 3 0 0 4 32 74 60 13 -36 3 0 0 4 74 58 24 60 -37 3 0 0 4 20 47 75 58 -38 3 0 0 4 47 9 44 75 -39 3 0 0 4 58 75 61 24 -40 3 0 0 4 75 44 19 61 -41 3 0 0 4 13 60 76 33 -42 3 0 0 4 60 24 59 76 -43 3 0 0 4 33 76 38 3 -44 3 0 0 4 76 59 16 38 -45 3 0 0 4 24 61 77 59 -46 3 0 0 4 61 19 45 77 -47 3 0 0 4 59 77 39 16 -48 3 0 0 4 77 45 8 39 -49 3 0 0 4 9 48 78 44 -50 3 0 0 4 48 21 62 78 -51 3 0 0 4 44 78 64 19 -52 3 0 0 4 78 62 25 64 -53 3 0 0 4 21 49 79 62 -54 3 0 0 4 49 7 36 79 -55 3 0 0 4 62 79 65 25 -56 3 0 0 4 79 36 15 65 -57 3 0 0 4 19 64 80 45 -58 3 0 0 4 64 25 63 80 -59 3 0 0 4 45 80 40 8 -60 3 0 0 4 80 63 17 40 -61 3 0 0 4 25 65 81 63 -62 3 0 0 4 65 15 37 81 -63 3 0 0 4 63 81 41 17 -64 3 0 0 4 81 37 4 41 -$ENDELM -DEAL::Testing dim=3, spacedim=3 -$NOD -729 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.00000 0.00000 1.00000 -6 1.00000 0.00000 1.00000 -7 0.00000 1.00000 1.00000 -8 1.00000 1.00000 1.00000 -9 0.500000 0.00000 0.00000 -10 0.00000 0.500000 0.00000 -11 0.00000 0.00000 0.500000 -12 1.00000 0.500000 0.00000 -13 1.00000 0.00000 0.500000 -14 0.500000 1.00000 0.00000 -15 0.00000 1.00000 0.500000 -16 1.00000 1.00000 0.500000 -17 0.500000 0.00000 1.00000 -18 0.00000 0.500000 1.00000 -19 1.00000 0.500000 1.00000 -20 0.500000 1.00000 1.00000 -21 0.500000 0.00000 0.500000 -22 0.500000 0.500000 0.00000 -23 0.00000 0.500000 0.500000 -24 1.00000 0.500000 0.500000 -25 0.500000 1.00000 0.500000 -26 0.500000 0.500000 1.00000 -27 0.500000 0.500000 0.500000 -28 0.250000 -0.0561862 -0.0561862 -29 0.750000 0.00000 0.00000 -30 -0.0561862 0.250000 -0.0561862 -31 0.00000 0.750000 0.00000 -32 -0.0561862 -0.0561862 0.250000 -33 0.00000 0.00000 0.750000 -34 1.00000 0.250000 0.00000 -35 1.00000 0.750000 0.00000 -36 1.00000 0.00000 0.250000 -37 1.00000 0.00000 0.750000 -38 0.250000 1.00000 0.00000 -39 0.750000 1.00000 0.00000 -40 0.00000 1.00000 0.250000 -41 0.00000 1.00000 0.750000 -42 1.00000 1.00000 0.250000 -43 1.00000 1.00000 0.750000 -44 0.250000 0.00000 1.00000 -45 0.750000 0.00000 1.00000 -46 0.00000 0.250000 1.00000 -47 0.00000 0.750000 1.00000 -48 1.00000 0.250000 1.00000 -49 1.00000 0.750000 1.00000 -50 0.250000 1.00000 1.00000 -51 0.750000 1.00000 1.00000 -52 0.250000 -0.0561862 0.556186 -53 0.750000 0.00000 0.500000 -54 0.556186 -0.0561862 0.250000 -55 0.500000 0.00000 0.750000 -56 0.556186 0.250000 -0.0561862 -57 0.500000 0.750000 0.00000 -58 0.250000 0.556186 -0.0561862 -59 0.750000 0.500000 0.00000 -60 -0.0561862 0.556186 0.250000 -61 0.00000 0.500000 0.750000 -62 -0.0561862 0.250000 0.556186 -63 0.00000 0.750000 0.500000 -64 1.00000 0.500000 0.250000 -65 1.00000 0.500000 0.750000 -66 1.00000 0.250000 0.500000 -67 1.00000 0.750000 0.500000 -68 0.250000 1.00000 0.500000 -69 0.750000 1.00000 0.500000 -70 0.500000 1.00000 0.250000 -71 0.500000 1.00000 0.750000 -72 0.500000 0.250000 1.00000 -73 0.500000 0.750000 1.00000 -74 0.250000 0.500000 1.00000 -75 0.750000 0.500000 1.00000 -76 0.500000 0.500000 0.750000 -77 0.556186 0.556186 0.250000 -78 0.750000 0.500000 0.500000 -79 0.250000 0.556186 0.556186 -80 0.500000 0.750000 0.500000 -81 0.556186 0.250000 0.556186 -82 0.250000 -0.183013 0.250000 -83 0.250000 -0.00702328 0.757023 -84 0.757023 -0.00702328 0.250000 -85 0.750000 0.00000 0.750000 -86 0.250000 0.250000 -0.183013 -87 0.757023 0.250000 -0.00702328 -88 0.250000 0.757023 -0.00702328 -89 0.750000 0.750000 0.00000 -90 -0.183013 0.250000 0.250000 -91 -0.00702328 0.757023 0.250000 -92 -0.00702328 0.250000 0.757023 -93 0.00000 0.750000 0.750000 -94 1.00000 0.250000 0.250000 -95 1.00000 0.750000 0.250000 -96 1.00000 0.250000 0.750000 -97 1.00000 0.750000 0.750000 -98 0.250000 1.00000 0.250000 -99 0.250000 1.00000 0.750000 -100 0.750000 1.00000 0.250000 -101 0.750000 1.00000 0.750000 -102 0.250000 0.250000 1.00000 -103 0.750000 0.250000 1.00000 -104 0.250000 0.750000 1.00000 -105 0.750000 0.750000 1.00000 -106 0.750000 0.750000 0.500000 -107 0.250000 0.760535 0.510535 -108 0.760535 0.250000 0.510535 -109 0.250000 0.250000 0.683013 -110 0.750000 0.500000 0.750000 -111 0.760535 0.510535 0.250000 -112 0.250000 0.510535 0.760535 -113 0.250000 0.683013 0.250000 -114 0.500000 0.750000 0.750000 -115 0.510535 0.250000 0.760535 -116 0.510535 0.760535 0.250000 -117 0.683013 0.250000 0.250000 -118 0.250000 0.250000 0.250000 -119 0.776371 0.250293 0.250293 -120 0.250293 0.776371 0.250293 -121 0.753804 0.753804 0.250000 -122 0.250293 0.250293 0.776371 -123 0.753804 0.250000 0.753804 -124 0.250000 0.753804 0.753804 -125 0.750000 0.750000 0.750000 -126 0.118838 -0.0418018 -0.0418018 -127 0.381162 -0.0418018 -0.0418018 -128 0.625000 0.00000 0.00000 -129 0.875000 0.00000 0.00000 -130 -0.0418018 0.118838 -0.0418018 -131 -0.0418018 0.381162 -0.0418018 -132 0.00000 0.625000 0.00000 -133 0.00000 0.875000 0.00000 -134 -0.0418018 -0.0418018 0.118838 -135 -0.0418018 -0.0418018 0.381162 -136 0.00000 0.00000 0.625000 -137 0.00000 0.00000 0.875000 -138 1.00000 0.125000 0.00000 -139 1.00000 0.375000 0.00000 -140 1.00000 0.625000 0.00000 -141 1.00000 0.875000 0.00000 -142 1.00000 0.00000 0.125000 -143 1.00000 0.00000 0.375000 -144 1.00000 0.00000 0.625000 -145 1.00000 0.00000 0.875000 -146 0.125000 1.00000 0.00000 -147 0.375000 1.00000 0.00000 -148 0.625000 1.00000 0.00000 -149 0.875000 1.00000 0.00000 -150 0.00000 1.00000 0.125000 -151 0.00000 1.00000 0.375000 -152 0.00000 1.00000 0.625000 -153 0.00000 1.00000 0.875000 -154 1.00000 1.00000 0.125000 -155 1.00000 1.00000 0.375000 -156 1.00000 1.00000 0.625000 -157 1.00000 1.00000 0.875000 -158 0.125000 0.00000 1.00000 -159 0.375000 0.00000 1.00000 -160 0.625000 0.00000 1.00000 -161 0.875000 0.00000 1.00000 -162 0.00000 0.125000 1.00000 -163 0.00000 0.375000 1.00000 -164 0.00000 0.625000 1.00000 -165 0.00000 0.875000 1.00000 -166 1.00000 0.125000 1.00000 -167 1.00000 0.375000 1.00000 -168 1.00000 0.625000 1.00000 -169 1.00000 0.875000 1.00000 -170 0.125000 1.00000 1.00000 -171 0.375000 1.00000 1.00000 -172 0.625000 1.00000 1.00000 -173 0.875000 1.00000 1.00000 -174 0.118838 -0.0418018 0.541802 -175 0.381162 -0.0418018 0.541802 -176 0.625000 0.00000 0.500000 -177 0.875000 0.00000 0.500000 -178 0.541802 -0.0418018 0.118838 -179 0.541802 -0.0418018 0.381162 -180 0.500000 0.00000 0.625000 -181 0.500000 0.00000 0.875000 -182 0.541802 0.118838 -0.0418018 -183 0.541802 0.381162 -0.0418018 -184 0.500000 0.625000 0.00000 -185 0.500000 0.875000 0.00000 -186 0.118838 0.541802 -0.0418018 -187 0.381162 0.541802 -0.0418018 -188 0.625000 0.500000 0.00000 -189 0.875000 0.500000 0.00000 -190 -0.0418018 0.541802 0.118838 -191 -0.0418018 0.541802 0.381162 -192 0.00000 0.500000 0.625000 -193 0.00000 0.500000 0.875000 -194 -0.0418018 0.118838 0.541802 -195 -0.0418018 0.381162 0.541802 -196 0.00000 0.625000 0.500000 -197 0.00000 0.875000 0.500000 -198 1.00000 0.500000 0.125000 -199 1.00000 0.500000 0.375000 -200 1.00000 0.500000 0.625000 -201 1.00000 0.500000 0.875000 -202 1.00000 0.125000 0.500000 -203 1.00000 0.375000 0.500000 -204 1.00000 0.625000 0.500000 -205 1.00000 0.875000 0.500000 -206 0.125000 1.00000 0.500000 -207 0.375000 1.00000 0.500000 -208 0.625000 1.00000 0.500000 -209 0.875000 1.00000 0.500000 -210 0.500000 1.00000 0.125000 -211 0.500000 1.00000 0.375000 -212 0.500000 1.00000 0.625000 -213 0.500000 1.00000 0.875000 -214 0.500000 0.125000 1.00000 -215 0.500000 0.375000 1.00000 -216 0.500000 0.625000 1.00000 -217 0.500000 0.875000 1.00000 -218 0.125000 0.500000 1.00000 -219 0.375000 0.500000 1.00000 -220 0.625000 0.500000 1.00000 -221 0.875000 0.500000 1.00000 -222 0.500000 0.500000 0.625000 -223 0.500000 0.500000 0.875000 -224 0.541802 0.541802 0.118838 -225 0.541802 0.541802 0.381162 -226 0.625000 0.500000 0.500000 -227 0.875000 0.500000 0.500000 -228 0.118838 0.541802 0.541802 -229 0.381162 0.541802 0.541802 -230 0.500000 0.625000 0.500000 -231 0.500000 0.875000 0.500000 -232 0.541802 0.118838 0.541802 -233 0.541802 0.381162 0.541802 -234 0.0842932 -0.150052 0.250000 -235 0.415707 -0.150052 0.250000 -236 0.250000 -0.150052 0.0842932 -237 0.250000 -0.150052 0.415707 -238 0.125000 -0.00351164 0.753512 -239 0.375000 -0.00351164 0.753512 -240 0.250000 -0.0316047 0.656605 -241 0.250000 -0.00351164 0.878512 -242 0.656605 -0.0316047 0.250000 -243 0.878512 -0.00351164 0.250000 -244 0.753512 -0.00351164 0.125000 -245 0.753512 -0.00351164 0.375000 -246 0.625000 0.00000 0.750000 -247 0.875000 0.00000 0.750000 -248 0.750000 0.00000 0.625000 -249 0.750000 0.00000 0.875000 -250 0.250000 0.0842932 -0.150052 -251 0.250000 0.415707 -0.150052 -252 0.0842932 0.250000 -0.150052 -253 0.415707 0.250000 -0.150052 -254 0.753512 0.125000 -0.00351164 -255 0.753512 0.375000 -0.00351164 -256 0.656605 0.250000 -0.0316047 -257 0.878512 0.250000 -0.00351164 -258 0.250000 0.656605 -0.0316047 -259 0.250000 0.878512 -0.00351164 -260 0.125000 0.753512 -0.00351164 -261 0.375000 0.753512 -0.00351164 -262 0.750000 0.625000 0.00000 -263 0.750000 0.875000 0.00000 -264 0.625000 0.750000 0.00000 -265 0.875000 0.750000 0.00000 -266 -0.150052 0.250000 0.0842932 -267 -0.150052 0.250000 0.415707 -268 -0.150052 0.0842932 0.250000 -269 -0.150052 0.415707 0.250000 -270 -0.00351164 0.753512 0.125000 -271 -0.00351164 0.753512 0.375000 -272 -0.0316047 0.656605 0.250000 -273 -0.00351164 0.878512 0.250000 -274 -0.0316047 0.250000 0.656605 -275 -0.00351164 0.250000 0.878512 -276 -0.00351164 0.125000 0.753512 -277 -0.00351164 0.375000 0.753512 -278 0.00000 0.750000 0.625000 -279 0.00000 0.750000 0.875000 -280 0.00000 0.625000 0.750000 -281 0.00000 0.875000 0.750000 -282 1.00000 0.250000 0.125000 -283 1.00000 0.250000 0.375000 -284 1.00000 0.125000 0.250000 -285 1.00000 0.375000 0.250000 -286 1.00000 0.750000 0.125000 -287 1.00000 0.750000 0.375000 -288 1.00000 0.625000 0.250000 -289 1.00000 0.875000 0.250000 -290 1.00000 0.250000 0.625000 -291 1.00000 0.250000 0.875000 -292 1.00000 0.125000 0.750000 -293 1.00000 0.375000 0.750000 -294 1.00000 0.750000 0.625000 -295 1.00000 0.750000 0.875000 -296 1.00000 0.625000 0.750000 -297 1.00000 0.875000 0.750000 -298 0.125000 1.00000 0.250000 -299 0.375000 1.00000 0.250000 -300 0.250000 1.00000 0.125000 -301 0.250000 1.00000 0.375000 -302 0.125000 1.00000 0.750000 -303 0.375000 1.00000 0.750000 -304 0.250000 1.00000 0.625000 -305 0.250000 1.00000 0.875000 -306 0.625000 1.00000 0.250000 -307 0.875000 1.00000 0.250000 -308 0.750000 1.00000 0.125000 -309 0.750000 1.00000 0.375000 -310 0.625000 1.00000 0.750000 -311 0.875000 1.00000 0.750000 -312 0.750000 1.00000 0.625000 -313 0.750000 1.00000 0.875000 -314 0.250000 0.125000 1.00000 -315 0.250000 0.375000 1.00000 -316 0.125000 0.250000 1.00000 -317 0.375000 0.250000 1.00000 -318 0.750000 0.125000 1.00000 -319 0.750000 0.375000 1.00000 -320 0.625000 0.250000 1.00000 -321 0.875000 0.250000 1.00000 -322 0.250000 0.625000 1.00000 -323 0.250000 0.875000 1.00000 -324 0.125000 0.750000 1.00000 -325 0.375000 0.750000 1.00000 -326 0.750000 0.625000 1.00000 -327 0.750000 0.875000 1.00000 -328 0.625000 0.750000 1.00000 -329 0.875000 0.750000 1.00000 -330 0.750000 0.625000 0.500000 -331 0.750000 0.875000 0.500000 -332 0.625000 0.750000 0.500000 -333 0.875000 0.750000 0.500000 -334 0.250000 0.658361 0.533361 -335 0.250000 0.880267 0.505267 -336 0.125000 0.755267 0.505267 -337 0.375000 0.755267 0.505267 -338 0.755267 0.125000 0.505267 -339 0.755267 0.375000 0.505267 -340 0.658361 0.250000 0.533361 -341 0.880267 0.250000 0.505267 -342 0.250000 0.0842932 0.650052 -343 0.250000 0.415707 0.650052 -344 0.0842932 0.250000 0.650052 -345 0.415707 0.250000 0.650052 -346 0.625000 0.500000 0.750000 -347 0.875000 0.500000 0.750000 -348 0.750000 0.500000 0.625000 -349 0.750000 0.500000 0.875000 -350 0.658361 0.533361 0.250000 -351 0.880267 0.505267 0.250000 -352 0.755267 0.505267 0.125000 -353 0.755267 0.505267 0.375000 -354 0.125000 0.505267 0.755267 -355 0.375000 0.505267 0.755267 -356 0.250000 0.533361 0.658361 -357 0.250000 0.505267 0.880267 -358 0.0842932 0.650052 0.250000 -359 0.415707 0.650052 0.250000 -360 0.250000 0.650052 0.0842932 -361 0.250000 0.650052 0.415707 -362 0.500000 0.750000 0.625000 -363 0.500000 0.750000 0.875000 -364 0.500000 0.625000 0.750000 -365 0.500000 0.875000 0.750000 -366 0.533361 0.250000 0.658361 -367 0.505267 0.250000 0.880267 -368 0.505267 0.125000 0.755267 -369 0.505267 0.375000 0.755267 -370 0.505267 0.755267 0.125000 -371 0.505267 0.755267 0.375000 -372 0.533361 0.658361 0.250000 -373 0.505267 0.880267 0.250000 -374 0.650052 0.250000 0.0842932 -375 0.650052 0.250000 0.415707 -376 0.650052 0.0842932 0.250000 -377 0.650052 0.415707 0.250000 -378 0.750000 0.750000 0.875000 -379 0.750000 0.750000 0.625000 -380 0.875000 0.750000 0.750000 -381 0.625000 0.750000 0.750000 -382 0.750000 0.875000 0.750000 -383 0.750000 0.625000 0.750000 -384 0.250000 0.751902 0.876902 -385 0.250000 0.757170 0.632170 -386 0.375000 0.751902 0.751902 -387 0.125000 0.751902 0.751902 -388 0.250000 0.876902 0.751902 -389 0.250000 0.632170 0.757170 -390 0.751902 0.250000 0.876902 -391 0.757170 0.250000 0.632170 -392 0.876902 0.250000 0.751902 -393 0.632170 0.250000 0.757170 -394 0.751902 0.375000 0.751902 -395 0.751902 0.125000 0.751902 -396 0.250146 0.250146 0.888186 -397 0.250146 0.250146 0.729692 -398 0.380414 0.250146 0.768453 -399 0.121635 0.250146 0.766697 -400 0.250146 0.380414 0.768453 -401 0.250146 0.121635 0.766697 -402 0.751902 0.751902 0.375000 -403 0.751902 0.751902 0.125000 -404 0.876902 0.751902 0.250000 -405 0.632170 0.757170 0.250000 -406 0.751902 0.876902 0.250000 -407 0.757170 0.632170 0.250000 -408 0.250146 0.768453 0.380414 -409 0.250146 0.766697 0.121635 -410 0.380414 0.768453 0.250146 -411 0.121635 0.766697 0.250146 -412 0.250146 0.888186 0.250146 -413 0.250146 0.729692 0.250146 -414 0.768453 0.250146 0.380414 -415 0.766697 0.250146 0.121635 -416 0.888186 0.250146 0.250146 -417 0.729692 0.250146 0.250146 -418 0.768453 0.380414 0.250146 -419 0.766697 0.121635 0.250146 -420 0.250000 0.250000 0.466506 -421 0.250000 0.250000 0.0334936 -422 0.466506 0.250000 0.250000 -423 0.0334936 0.250000 0.250000 -424 0.250000 0.466506 0.250000 -425 0.250000 0.0334936 0.250000 -426 0.0916338 -0.120595 0.0916338 -427 0.0916338 -0.120595 0.408366 -428 0.408366 -0.120595 0.0916338 -429 0.408366 -0.120595 0.408366 -430 0.124230 -0.0175160 0.642516 -431 0.125000 -0.00175582 0.876756 -432 0.375770 -0.0175160 0.642516 -433 0.375000 -0.00175582 0.876756 -434 0.642516 -0.0175160 0.124230 -435 0.642516 -0.0175160 0.375770 -436 0.876756 -0.00175582 0.125000 -437 0.876756 -0.00175582 0.375000 -438 0.625000 0.00000 0.625000 -439 0.625000 0.00000 0.875000 -440 0.875000 0.00000 0.625000 -441 0.875000 0.00000 0.875000 -442 0.0916338 0.0916338 -0.120595 -443 0.408366 0.0916338 -0.120595 -444 0.0916338 0.408366 -0.120595 -445 0.408366 0.408366 -0.120595 -446 0.642516 0.124230 -0.0175160 -447 0.876756 0.125000 -0.00175582 -448 0.642516 0.375770 -0.0175160 -449 0.876756 0.375000 -0.00175582 -450 0.124230 0.642516 -0.0175160 -451 0.375770 0.642516 -0.0175160 -452 0.125000 0.876756 -0.00175582 -453 0.375000 0.876756 -0.00175582 -454 0.625000 0.625000 0.00000 -455 0.875000 0.625000 0.00000 -456 0.625000 0.875000 0.00000 -457 0.875000 0.875000 0.00000 -458 -0.120595 0.0916338 0.0916338 -459 -0.120595 0.408366 0.0916338 -460 -0.120595 0.0916338 0.408366 -461 -0.120595 0.408366 0.408366 -462 -0.0175160 0.642516 0.124230 -463 -0.00175582 0.876756 0.125000 -464 -0.0175160 0.642516 0.375770 -465 -0.00175582 0.876756 0.375000 -466 -0.0175160 0.124230 0.642516 -467 -0.0175160 0.375770 0.642516 -468 -0.00175582 0.125000 0.876756 -469 -0.00175582 0.375000 0.876756 -470 0.00000 0.625000 0.625000 -471 0.00000 0.875000 0.625000 -472 0.00000 0.625000 0.875000 -473 0.00000 0.875000 0.875000 -474 1.00000 0.125000 0.125000 -475 1.00000 0.375000 0.125000 -476 1.00000 0.125000 0.375000 -477 1.00000 0.375000 0.375000 -478 1.00000 0.625000 0.125000 -479 1.00000 0.875000 0.125000 -480 1.00000 0.625000 0.375000 -481 1.00000 0.875000 0.375000 -482 1.00000 0.125000 0.625000 -483 1.00000 0.375000 0.625000 -484 1.00000 0.125000 0.875000 -485 1.00000 0.375000 0.875000 -486 1.00000 0.625000 0.625000 -487 1.00000 0.875000 0.625000 -488 1.00000 0.625000 0.875000 -489 1.00000 0.875000 0.875000 -490 0.125000 1.00000 0.125000 -491 0.125000 1.00000 0.375000 -492 0.375000 1.00000 0.125000 -493 0.375000 1.00000 0.375000 -494 0.125000 1.00000 0.625000 -495 0.125000 1.00000 0.875000 -496 0.375000 1.00000 0.625000 -497 0.375000 1.00000 0.875000 -498 0.625000 1.00000 0.125000 -499 0.625000 1.00000 0.375000 -500 0.875000 1.00000 0.125000 -501 0.875000 1.00000 0.375000 -502 0.625000 1.00000 0.625000 -503 0.625000 1.00000 0.875000 -504 0.875000 1.00000 0.625000 -505 0.875000 1.00000 0.875000 -506 0.125000 0.125000 1.00000 -507 0.375000 0.125000 1.00000 -508 0.125000 0.375000 1.00000 -509 0.375000 0.375000 1.00000 -510 0.625000 0.125000 1.00000 -511 0.875000 0.125000 1.00000 -512 0.625000 0.375000 1.00000 -513 0.875000 0.375000 1.00000 -514 0.125000 0.625000 1.00000 -515 0.375000 0.625000 1.00000 -516 0.125000 0.875000 1.00000 -517 0.375000 0.875000 1.00000 -518 0.625000 0.625000 1.00000 -519 0.875000 0.625000 1.00000 -520 0.625000 0.875000 1.00000 -521 0.875000 0.875000 1.00000 -522 0.625000 0.625000 0.500000 -523 0.875000 0.625000 0.500000 -524 0.625000 0.875000 0.500000 -525 0.875000 0.875000 0.500000 -526 0.123845 0.644251 0.519251 -527 0.376155 0.644251 0.519251 -528 0.125000 0.877634 0.502634 -529 0.375000 0.877634 0.502634 -530 0.644251 0.123845 0.519251 -531 0.877634 0.125000 0.502634 -532 0.644251 0.376155 0.519251 -533 0.877634 0.375000 0.502634 -534 0.0916338 0.0916338 0.620595 -535 0.408366 0.0916338 0.620595 -536 0.0916338 0.408366 0.620595 -537 0.408366 0.408366 0.620595 -538 0.625000 0.500000 0.625000 -539 0.625000 0.500000 0.875000 -540 0.875000 0.500000 0.625000 -541 0.875000 0.500000 0.875000 -542 0.644251 0.519251 0.123845 -543 0.644251 0.519251 0.376155 -544 0.877634 0.502634 0.125000 -545 0.877634 0.502634 0.375000 -546 0.123845 0.519251 0.644251 -547 0.125000 0.502634 0.877634 -548 0.376155 0.519251 0.644251 -549 0.375000 0.502634 0.877634 -550 0.0916338 0.620595 0.0916338 -551 0.0916338 0.620595 0.408366 -552 0.408366 0.620595 0.0916338 -553 0.408366 0.620595 0.408366 -554 0.500000 0.625000 0.625000 -555 0.500000 0.875000 0.625000 -556 0.500000 0.625000 0.875000 -557 0.500000 0.875000 0.875000 -558 0.519251 0.123845 0.644251 -559 0.519251 0.376155 0.644251 -560 0.502634 0.125000 0.877634 -561 0.502634 0.375000 0.877634 -562 0.519251 0.644251 0.123845 -563 0.502634 0.877634 0.125000 -564 0.519251 0.644251 0.376155 -565 0.502634 0.877634 0.375000 -566 0.620595 0.0916338 0.0916338 -567 0.620595 0.408366 0.0916338 -568 0.620595 0.0916338 0.408366 -569 0.620595 0.408366 0.408366 -570 0.875000 0.875000 0.750000 -571 0.625000 0.875000 0.750000 -572 0.875000 0.625000 0.750000 -573 0.625000 0.625000 0.750000 -574 0.875000 0.750000 0.875000 -575 0.875000 0.750000 0.625000 -576 0.625000 0.750000 0.875000 -577 0.625000 0.750000 0.625000 -578 0.750000 0.875000 0.875000 -579 0.750000 0.625000 0.875000 -580 0.750000 0.875000 0.625000 -581 0.750000 0.625000 0.625000 -582 0.375000 0.875951 0.750951 -583 0.125000 0.875951 0.750951 -584 0.375000 0.628585 0.753585 -585 0.125000 0.628585 0.753585 -586 0.375000 0.750951 0.875951 -587 0.375000 0.753585 0.628585 -588 0.125000 0.750951 0.875951 -589 0.125000 0.753585 0.628585 -590 0.250000 0.875951 0.875951 -591 0.250000 0.628585 0.878585 -592 0.250000 0.878585 0.628585 -593 0.250000 0.645265 0.645265 -594 0.875951 0.375000 0.750951 -595 0.628585 0.375000 0.753585 -596 0.875951 0.125000 0.750951 -597 0.628585 0.125000 0.753585 -598 0.875951 0.250000 0.875951 -599 0.878585 0.250000 0.628585 -600 0.628585 0.250000 0.878585 -601 0.645265 0.250000 0.645265 -602 0.750951 0.375000 0.875951 -603 0.750951 0.125000 0.875951 -604 0.753585 0.375000 0.628585 -605 0.753585 0.125000 0.628585 -606 0.377707 0.377707 0.761860 -607 0.123317 0.377707 0.760982 -608 0.377707 0.123317 0.760982 -609 0.123317 0.123317 0.760104 -610 0.377707 0.250073 0.884227 -611 0.394119 0.250073 0.699736 -612 0.123317 0.250073 0.883349 -613 0.106906 0.250073 0.698858 -614 0.250073 0.377707 0.884227 -615 0.250073 0.123317 0.883349 -616 0.250073 0.394119 0.699736 -617 0.250073 0.106906 0.698858 -618 0.875951 0.875951 0.250000 -619 0.628585 0.878585 0.250000 -620 0.878585 0.628585 0.250000 -621 0.645265 0.645265 0.250000 -622 0.875951 0.750951 0.375000 -623 0.875951 0.750951 0.125000 -624 0.628585 0.753585 0.375000 -625 0.628585 0.753585 0.125000 -626 0.750951 0.875951 0.375000 -627 0.753585 0.628585 0.375000 -628 0.750951 0.875951 0.125000 -629 0.753585 0.628585 0.125000 -630 0.377707 0.884227 0.250073 -631 0.123317 0.883349 0.250073 -632 0.394119 0.699736 0.250073 -633 0.106906 0.698858 0.250073 -634 0.377707 0.761860 0.377707 -635 0.377707 0.760982 0.123317 -636 0.123317 0.760982 0.377707 -637 0.123317 0.760104 0.123317 -638 0.250073 0.884227 0.377707 -639 0.250073 0.699736 0.394119 -640 0.250073 0.883349 0.123317 -641 0.250073 0.698858 0.106906 -642 0.884227 0.377707 0.250073 -643 0.699736 0.394119 0.250073 -644 0.883349 0.123317 0.250073 -645 0.698858 0.106906 0.250073 -646 0.884227 0.250073 0.377707 -647 0.883349 0.250073 0.123317 -648 0.699736 0.250073 0.394119 -649 0.698858 0.250073 0.106906 -650 0.761860 0.377707 0.377707 -651 0.760982 0.123317 0.377707 -652 0.760982 0.377707 0.123317 -653 0.760104 0.123317 0.123317 -654 0.442875 0.442875 0.250000 -655 0.0571254 0.442875 0.250000 -656 0.442875 0.0571254 0.250000 -657 0.0571254 0.0571254 0.250000 -658 0.442875 0.250000 0.442875 -659 0.442875 0.250000 0.0571254 -660 0.0571254 0.250000 0.442875 -661 0.0571254 0.250000 0.0571254 -662 0.250000 0.442875 0.442875 -663 0.250000 0.0571254 0.442875 -664 0.250000 0.442875 0.0571254 -665 0.250000 0.0571254 0.0571254 -666 0.0752510 0.0752510 0.0752510 -667 0.424749 0.0752510 0.0752510 -668 0.0752510 0.424749 0.0752510 -669 0.424749 0.424749 0.0752510 -670 0.0752510 0.0752510 0.424749 -671 0.424749 0.0752510 0.424749 -672 0.0752510 0.424749 0.424749 -673 0.424749 0.424749 0.424749 -674 0.675328 0.113937 0.113937 -675 0.880052 0.124159 0.124159 -676 0.675839 0.386646 0.113905 -677 0.880491 0.376353 0.124159 -678 0.675839 0.113905 0.386646 -679 0.880491 0.124159 0.376353 -680 0.676349 0.386679 0.386679 -681 0.880930 0.376353 0.376353 -682 0.113937 0.675328 0.113937 -683 0.386646 0.675839 0.113905 -684 0.124159 0.880052 0.124159 -685 0.376353 0.880491 0.124159 -686 0.113905 0.675839 0.386646 -687 0.386679 0.676349 0.386679 -688 0.124159 0.880491 0.376353 -689 0.376353 0.880930 0.376353 -690 0.636061 0.636061 0.124583 -691 0.876792 0.626792 0.125000 -692 0.626792 0.876792 0.125000 -693 0.875476 0.875476 0.125000 -694 0.636061 0.636061 0.375417 -695 0.876792 0.626792 0.375000 -696 0.626792 0.876792 0.375000 -697 0.875476 0.875476 0.375000 -698 0.113937 0.113937 0.675328 -699 0.386646 0.113905 0.675839 -700 0.113905 0.386646 0.675839 -701 0.386679 0.386679 0.676349 -702 0.124159 0.124159 0.880052 -703 0.376353 0.124159 0.880491 -704 0.124159 0.376353 0.880491 -705 0.376353 0.376353 0.880930 -706 0.636061 0.124583 0.636061 -707 0.876792 0.125000 0.626792 -708 0.636061 0.375417 0.636061 -709 0.876792 0.375000 0.626792 -710 0.626792 0.125000 0.876792 -711 0.875476 0.125000 0.875476 -712 0.626792 0.375000 0.876792 -713 0.875476 0.375000 0.875476 -714 0.124583 0.636061 0.636061 -715 0.375417 0.636061 0.636061 -716 0.125000 0.876792 0.626792 -717 0.375000 0.876792 0.626792 -718 0.125000 0.626792 0.876792 -719 0.375000 0.626792 0.876792 -720 0.125000 0.875476 0.875476 -721 0.375000 0.875476 0.875476 -722 0.625000 0.625000 0.625000 -723 0.875000 0.625000 0.625000 -724 0.625000 0.875000 0.625000 -725 0.875000 0.875000 0.625000 -726 0.625000 0.625000 0.875000 -727 0.875000 0.625000 0.875000 -728 0.625000 0.875000 0.875000 -729 0.875000 0.875000 0.875000 -$ENDNOD -$ELM -512 -1 5 0 0 8 1 126 426 134 130 442 666 458 -2 5 0 0 8 126 28 236 426 442 250 665 666 -3 5 0 0 8 130 442 666 458 30 252 661 266 -4 5 0 0 8 442 250 665 666 252 86 421 661 -5 5 0 0 8 134 426 234 32 458 666 657 268 -6 5 0 0 8 426 236 82 234 666 665 425 657 -7 5 0 0 8 458 666 657 268 266 661 423 90 -8 5 0 0 8 666 665 425 657 661 421 118 423 -9 5 0 0 8 28 127 428 236 250 443 667 665 -10 5 0 0 8 127 9 178 428 443 182 566 667 -11 5 0 0 8 250 443 667 665 86 253 659 421 -12 5 0 0 8 443 182 566 667 253 56 374 659 -13 5 0 0 8 236 428 235 82 665 667 656 425 -14 5 0 0 8 428 178 54 235 667 566 376 656 -15 5 0 0 8 665 667 656 425 421 659 422 118 -16 5 0 0 8 667 566 376 656 659 374 117 422 -17 5 0 0 8 30 252 661 266 131 444 668 459 -18 5 0 0 8 252 86 421 661 444 251 664 668 -19 5 0 0 8 131 444 668 459 10 186 550 190 -20 5 0 0 8 444 251 664 668 186 58 360 550 -21 5 0 0 8 266 661 423 90 459 668 655 269 -22 5 0 0 8 661 421 118 423 668 664 424 655 -23 5 0 0 8 459 668 655 269 190 550 358 60 -24 5 0 0 8 668 664 424 655 550 360 113 358 -25 5 0 0 8 86 253 659 421 251 445 669 664 -26 5 0 0 8 253 56 374 659 445 183 567 669 -27 5 0 0 8 251 445 669 664 58 187 552 360 -28 5 0 0 8 445 183 567 669 187 22 224 552 -29 5 0 0 8 421 659 422 118 664 669 654 424 -30 5 0 0 8 659 374 117 422 669 567 377 654 -31 5 0 0 8 664 669 654 424 360 552 359 113 -32 5 0 0 8 669 567 377 654 552 224 77 359 -33 5 0 0 8 32 234 427 135 268 657 670 460 -34 5 0 0 8 234 82 237 427 657 425 663 670 -35 5 0 0 8 268 657 670 460 90 423 660 267 -36 5 0 0 8 657 425 663 670 423 118 420 660 -37 5 0 0 8 135 427 174 11 460 670 534 194 -38 5 0 0 8 427 237 52 174 670 663 342 534 -39 5 0 0 8 460 670 534 194 267 660 344 62 -40 5 0 0 8 670 663 342 534 660 420 109 344 -41 5 0 0 8 82 235 429 237 425 656 671 663 -42 5 0 0 8 235 54 179 429 656 376 568 671 -43 5 0 0 8 425 656 671 663 118 422 658 420 -44 5 0 0 8 656 376 568 671 422 117 375 658 -45 5 0 0 8 237 429 175 52 663 671 535 342 -46 5 0 0 8 429 179 21 175 671 568 232 535 -47 5 0 0 8 663 671 535 342 420 658 345 109 -48 5 0 0 8 671 568 232 535 658 375 81 345 -49 5 0 0 8 90 423 660 267 269 655 672 461 -50 5 0 0 8 423 118 420 660 655 424 662 672 -51 5 0 0 8 269 655 672 461 60 358 551 191 -52 5 0 0 8 655 424 662 672 358 113 361 551 -53 5 0 0 8 267 660 344 62 461 672 536 195 -54 5 0 0 8 660 420 109 344 672 662 343 536 -55 5 0 0 8 461 672 536 195 191 551 228 23 -56 5 0 0 8 672 662 343 536 551 361 79 228 -57 5 0 0 8 118 422 658 420 424 654 673 662 -58 5 0 0 8 422 117 375 658 654 377 569 673 -59 5 0 0 8 424 654 673 662 113 359 553 361 -60 5 0 0 8 654 377 569 673 359 77 225 553 -61 5 0 0 8 420 658 345 109 662 673 537 343 -62 5 0 0 8 658 375 81 345 673 569 233 537 -63 5 0 0 8 662 673 537 343 361 553 229 79 -64 5 0 0 8 673 569 233 537 553 225 27 229 -65 5 0 0 8 9 128 434 178 182 446 674 566 -66 5 0 0 8 128 29 244 434 446 254 653 674 -67 5 0 0 8 182 446 674 566 56 256 649 374 -68 5 0 0 8 446 254 653 674 256 87 415 649 -69 5 0 0 8 178 434 242 54 566 674 645 376 -70 5 0 0 8 434 244 84 242 674 653 419 645 -71 5 0 0 8 566 674 645 376 374 649 417 117 -72 5 0 0 8 674 653 419 645 649 415 119 417 -73 5 0 0 8 29 129 436 244 254 447 675 653 -74 5 0 0 8 129 2 142 436 447 138 474 675 -75 5 0 0 8 254 447 675 653 87 257 647 415 -76 5 0 0 8 447 138 474 675 257 34 282 647 -77 5 0 0 8 244 436 243 84 653 675 644 419 -78 5 0 0 8 436 142 36 243 675 474 284 644 -79 5 0 0 8 653 675 644 419 415 647 416 119 -80 5 0 0 8 675 474 284 644 647 282 94 416 -81 5 0 0 8 56 256 649 374 183 448 676 567 -82 5 0 0 8 256 87 415 649 448 255 652 676 -83 5 0 0 8 183 448 676 567 22 188 542 224 -84 5 0 0 8 448 255 652 676 188 59 352 542 -85 5 0 0 8 374 649 417 117 567 676 643 377 -86 5 0 0 8 649 415 119 417 676 652 418 643 -87 5 0 0 8 567 676 643 377 224 542 350 77 -88 5 0 0 8 676 652 418 643 542 352 111 350 -89 5 0 0 8 87 257 647 415 255 449 677 652 -90 5 0 0 8 257 34 282 647 449 139 475 677 -91 5 0 0 8 255 449 677 652 59 189 544 352 -92 5 0 0 8 449 139 475 677 189 12 198 544 -93 5 0 0 8 415 647 416 119 652 677 642 418 -94 5 0 0 8 647 282 94 416 677 475 285 642 -95 5 0 0 8 652 677 642 418 352 544 351 111 -96 5 0 0 8 677 475 285 642 544 198 64 351 -97 5 0 0 8 54 242 435 179 376 645 678 568 -98 5 0 0 8 242 84 245 435 645 419 651 678 -99 5 0 0 8 376 645 678 568 117 417 648 375 -100 5 0 0 8 645 419 651 678 417 119 414 648 -101 5 0 0 8 179 435 176 21 568 678 530 232 -102 5 0 0 8 435 245 53 176 678 651 338 530 -103 5 0 0 8 568 678 530 232 375 648 340 81 -104 5 0 0 8 678 651 338 530 648 414 108 340 -105 5 0 0 8 84 243 437 245 419 644 679 651 -106 5 0 0 8 243 36 143 437 644 284 476 679 -107 5 0 0 8 419 644 679 651 119 416 646 414 -108 5 0 0 8 644 284 476 679 416 94 283 646 -109 5 0 0 8 245 437 177 53 651 679 531 338 -110 5 0 0 8 437 143 13 177 679 476 202 531 -111 5 0 0 8 651 679 531 338 414 646 341 108 -112 5 0 0 8 679 476 202 531 646 283 66 341 -113 5 0 0 8 117 417 648 375 377 643 680 569 -114 5 0 0 8 417 119 414 648 643 418 650 680 -115 5 0 0 8 377 643 680 569 77 350 543 225 -116 5 0 0 8 643 418 650 680 350 111 353 543 -117 5 0 0 8 375 648 340 81 569 680 532 233 -118 5 0 0 8 648 414 108 340 680 650 339 532 -119 5 0 0 8 569 680 532 233 225 543 226 27 -120 5 0 0 8 680 650 339 532 543 353 78 226 -121 5 0 0 8 119 416 646 414 418 642 681 650 -122 5 0 0 8 416 94 283 646 642 285 477 681 -123 5 0 0 8 418 642 681 650 111 351 545 353 -124 5 0 0 8 642 285 477 681 351 64 199 545 -125 5 0 0 8 414 646 341 108 650 681 533 339 -126 5 0 0 8 646 283 66 341 681 477 203 533 -127 5 0 0 8 650 681 533 339 353 545 227 78 -128 5 0 0 8 681 477 203 533 545 199 24 227 -129 5 0 0 8 10 186 550 190 132 450 682 462 -130 5 0 0 8 186 58 360 550 450 258 641 682 -131 5 0 0 8 132 450 682 462 31 260 637 270 -132 5 0 0 8 450 258 641 682 260 88 409 637 -133 5 0 0 8 190 550 358 60 462 682 633 272 -134 5 0 0 8 550 360 113 358 682 641 413 633 -135 5 0 0 8 462 682 633 272 270 637 411 91 -136 5 0 0 8 682 641 413 633 637 409 120 411 -137 5 0 0 8 58 187 552 360 258 451 683 641 -138 5 0 0 8 187 22 224 552 451 184 562 683 -139 5 0 0 8 258 451 683 641 88 261 635 409 -140 5 0 0 8 451 184 562 683 261 57 370 635 -141 5 0 0 8 360 552 359 113 641 683 632 413 -142 5 0 0 8 552 224 77 359 683 562 372 632 -143 5 0 0 8 641 683 632 413 409 635 410 120 -144 5 0 0 8 683 562 372 632 635 370 116 410 -145 5 0 0 8 31 260 637 270 133 452 684 463 -146 5 0 0 8 260 88 409 637 452 259 640 684 -147 5 0 0 8 133 452 684 463 3 146 490 150 -148 5 0 0 8 452 259 640 684 146 38 300 490 -149 5 0 0 8 270 637 411 91 463 684 631 273 -150 5 0 0 8 637 409 120 411 684 640 412 631 -151 5 0 0 8 463 684 631 273 150 490 298 40 -152 5 0 0 8 684 640 412 631 490 300 98 298 -153 5 0 0 8 88 261 635 409 259 453 685 640 -154 5 0 0 8 261 57 370 635 453 185 563 685 -155 5 0 0 8 259 453 685 640 38 147 492 300 -156 5 0 0 8 453 185 563 685 147 14 210 492 -157 5 0 0 8 409 635 410 120 640 685 630 412 -158 5 0 0 8 635 370 116 410 685 563 373 630 -159 5 0 0 8 640 685 630 412 300 492 299 98 -160 5 0 0 8 685 563 373 630 492 210 70 299 -161 5 0 0 8 60 358 551 191 272 633 686 464 -162 5 0 0 8 358 113 361 551 633 413 639 686 -163 5 0 0 8 272 633 686 464 91 411 636 271 -164 5 0 0 8 633 413 639 686 411 120 408 636 -165 5 0 0 8 191 551 228 23 464 686 526 196 -166 5 0 0 8 551 361 79 228 686 639 334 526 -167 5 0 0 8 464 686 526 196 271 636 336 63 -168 5 0 0 8 686 639 334 526 636 408 107 336 -169 5 0 0 8 113 359 553 361 413 632 687 639 -170 5 0 0 8 359 77 225 553 632 372 564 687 -171 5 0 0 8 413 632 687 639 120 410 634 408 -172 5 0 0 8 632 372 564 687 410 116 371 634 -173 5 0 0 8 361 553 229 79 639 687 527 334 -174 5 0 0 8 553 225 27 229 687 564 230 527 -175 5 0 0 8 639 687 527 334 408 634 337 107 -176 5 0 0 8 687 564 230 527 634 371 80 337 -177 5 0 0 8 91 411 636 271 273 631 688 465 -178 5 0 0 8 411 120 408 636 631 412 638 688 -179 5 0 0 8 273 631 688 465 40 298 491 151 -180 5 0 0 8 631 412 638 688 298 98 301 491 -181 5 0 0 8 271 636 336 63 465 688 528 197 -182 5 0 0 8 636 408 107 336 688 638 335 528 -183 5 0 0 8 465 688 528 197 151 491 206 15 -184 5 0 0 8 688 638 335 528 491 301 68 206 -185 5 0 0 8 120 410 634 408 412 630 689 638 -186 5 0 0 8 410 116 371 634 630 373 565 689 -187 5 0 0 8 412 630 689 638 98 299 493 301 -188 5 0 0 8 630 373 565 689 299 70 211 493 -189 5 0 0 8 408 634 337 107 638 689 529 335 -190 5 0 0 8 634 371 80 337 689 565 231 529 -191 5 0 0 8 638 689 529 335 301 493 207 68 -192 5 0 0 8 689 565 231 529 493 211 25 207 -193 5 0 0 8 22 188 542 224 184 454 690 562 -194 5 0 0 8 188 59 352 542 454 262 629 690 -195 5 0 0 8 184 454 690 562 57 264 625 370 -196 5 0 0 8 454 262 629 690 264 89 403 625 -197 5 0 0 8 224 542 350 77 562 690 621 372 -198 5 0 0 8 542 352 111 350 690 629 407 621 -199 5 0 0 8 562 690 621 372 370 625 405 116 -200 5 0 0 8 690 629 407 621 625 403 121 405 -201 5 0 0 8 59 189 544 352 262 455 691 629 -202 5 0 0 8 189 12 198 544 455 140 478 691 -203 5 0 0 8 262 455 691 629 89 265 623 403 -204 5 0 0 8 455 140 478 691 265 35 286 623 -205 5 0 0 8 352 544 351 111 629 691 620 407 -206 5 0 0 8 544 198 64 351 691 478 288 620 -207 5 0 0 8 629 691 620 407 403 623 404 121 -208 5 0 0 8 691 478 288 620 623 286 95 404 -209 5 0 0 8 57 264 625 370 185 456 692 563 -210 5 0 0 8 264 89 403 625 456 263 628 692 -211 5 0 0 8 185 456 692 563 14 148 498 210 -212 5 0 0 8 456 263 628 692 148 39 308 498 -213 5 0 0 8 370 625 405 116 563 692 619 373 -214 5 0 0 8 625 403 121 405 692 628 406 619 -215 5 0 0 8 563 692 619 373 210 498 306 70 -216 5 0 0 8 692 628 406 619 498 308 100 306 -217 5 0 0 8 89 265 623 403 263 457 693 628 -218 5 0 0 8 265 35 286 623 457 141 479 693 -219 5 0 0 8 263 457 693 628 39 149 500 308 -220 5 0 0 8 457 141 479 693 149 4 154 500 -221 5 0 0 8 403 623 404 121 628 693 618 406 -222 5 0 0 8 623 286 95 404 693 479 289 618 -223 5 0 0 8 628 693 618 406 308 500 307 100 -224 5 0 0 8 693 479 289 618 500 154 42 307 -225 5 0 0 8 77 350 543 225 372 621 694 564 -226 5 0 0 8 350 111 353 543 621 407 627 694 -227 5 0 0 8 372 621 694 564 116 405 624 371 -228 5 0 0 8 621 407 627 694 405 121 402 624 -229 5 0 0 8 225 543 226 27 564 694 522 230 -230 5 0 0 8 543 353 78 226 694 627 330 522 -231 5 0 0 8 564 694 522 230 371 624 332 80 -232 5 0 0 8 694 627 330 522 624 402 106 332 -233 5 0 0 8 111 351 545 353 407 620 695 627 -234 5 0 0 8 351 64 199 545 620 288 480 695 -235 5 0 0 8 407 620 695 627 121 404 622 402 -236 5 0 0 8 620 288 480 695 404 95 287 622 -237 5 0 0 8 353 545 227 78 627 695 523 330 -238 5 0 0 8 545 199 24 227 695 480 204 523 -239 5 0 0 8 627 695 523 330 402 622 333 106 -240 5 0 0 8 695 480 204 523 622 287 67 333 -241 5 0 0 8 116 405 624 371 373 619 696 565 -242 5 0 0 8 405 121 402 624 619 406 626 696 -243 5 0 0 8 373 619 696 565 70 306 499 211 -244 5 0 0 8 619 406 626 696 306 100 309 499 -245 5 0 0 8 371 624 332 80 565 696 524 231 -246 5 0 0 8 624 402 106 332 696 626 331 524 -247 5 0 0 8 565 696 524 231 211 499 208 25 -248 5 0 0 8 696 626 331 524 499 309 69 208 -249 5 0 0 8 121 404 622 402 406 618 697 626 -250 5 0 0 8 404 95 287 622 618 289 481 697 -251 5 0 0 8 406 618 697 626 100 307 501 309 -252 5 0 0 8 618 289 481 697 307 42 155 501 -253 5 0 0 8 402 622 333 106 626 697 525 331 -254 5 0 0 8 622 287 67 333 697 481 205 525 -255 5 0 0 8 626 697 525 331 309 501 209 69 -256 5 0 0 8 697 481 205 525 501 155 16 209 -257 5 0 0 8 11 174 430 136 194 534 698 466 -258 5 0 0 8 174 52 240 430 534 342 617 698 -259 5 0 0 8 194 534 698 466 62 344 613 274 -260 5 0 0 8 534 342 617 698 344 109 397 613 -261 5 0 0 8 136 430 238 33 466 698 609 276 -262 5 0 0 8 430 240 83 238 698 617 401 609 -263 5 0 0 8 466 698 609 276 274 613 399 92 -264 5 0 0 8 698 617 401 609 613 397 122 399 -265 5 0 0 8 52 175 432 240 342 535 699 617 -266 5 0 0 8 175 21 180 432 535 232 558 699 -267 5 0 0 8 342 535 699 617 109 345 611 397 -268 5 0 0 8 535 232 558 699 345 81 366 611 -269 5 0 0 8 240 432 239 83 617 699 608 401 -270 5 0 0 8 432 180 55 239 699 558 368 608 -271 5 0 0 8 617 699 608 401 397 611 398 122 -272 5 0 0 8 699 558 368 608 611 366 115 398 -273 5 0 0 8 62 344 613 274 195 536 700 467 -274 5 0 0 8 344 109 397 613 536 343 616 700 -275 5 0 0 8 195 536 700 467 23 228 546 192 -276 5 0 0 8 536 343 616 700 228 79 356 546 -277 5 0 0 8 274 613 399 92 467 700 607 277 -278 5 0 0 8 613 397 122 399 700 616 400 607 -279 5 0 0 8 467 700 607 277 192 546 354 61 -280 5 0 0 8 700 616 400 607 546 356 112 354 -281 5 0 0 8 109 345 611 397 343 537 701 616 -282 5 0 0 8 345 81 366 611 537 233 559 701 -283 5 0 0 8 343 537 701 616 79 229 548 356 -284 5 0 0 8 537 233 559 701 229 27 222 548 -285 5 0 0 8 397 611 398 122 616 701 606 400 -286 5 0 0 8 611 366 115 398 701 559 369 606 -287 5 0 0 8 616 701 606 400 356 548 355 112 -288 5 0 0 8 701 559 369 606 548 222 76 355 -289 5 0 0 8 33 238 431 137 276 609 702 468 -290 5 0 0 8 238 83 241 431 609 401 615 702 -291 5 0 0 8 276 609 702 468 92 399 612 275 -292 5 0 0 8 609 401 615 702 399 122 396 612 -293 5 0 0 8 137 431 158 5 468 702 506 162 -294 5 0 0 8 431 241 44 158 702 615 314 506 -295 5 0 0 8 468 702 506 162 275 612 316 46 -296 5 0 0 8 702 615 314 506 612 396 102 316 -297 5 0 0 8 83 239 433 241 401 608 703 615 -298 5 0 0 8 239 55 181 433 608 368 560 703 -299 5 0 0 8 401 608 703 615 122 398 610 396 -300 5 0 0 8 608 368 560 703 398 115 367 610 -301 5 0 0 8 241 433 159 44 615 703 507 314 -302 5 0 0 8 433 181 17 159 703 560 214 507 -303 5 0 0 8 615 703 507 314 396 610 317 102 -304 5 0 0 8 703 560 214 507 610 367 72 317 -305 5 0 0 8 92 399 612 275 277 607 704 469 -306 5 0 0 8 399 122 396 612 607 400 614 704 -307 5 0 0 8 277 607 704 469 61 354 547 193 -308 5 0 0 8 607 400 614 704 354 112 357 547 -309 5 0 0 8 275 612 316 46 469 704 508 163 -310 5 0 0 8 612 396 102 316 704 614 315 508 -311 5 0 0 8 469 704 508 163 193 547 218 18 -312 5 0 0 8 704 614 315 508 547 357 74 218 -313 5 0 0 8 122 398 610 396 400 606 705 614 -314 5 0 0 8 398 115 367 610 606 369 561 705 -315 5 0 0 8 400 606 705 614 112 355 549 357 -316 5 0 0 8 606 369 561 705 355 76 223 549 -317 5 0 0 8 396 610 317 102 614 705 509 315 -318 5 0 0 8 610 367 72 317 705 561 215 509 -319 5 0 0 8 614 705 509 315 357 549 219 74 -320 5 0 0 8 705 561 215 509 549 223 26 219 -321 5 0 0 8 21 176 438 180 232 530 706 558 -322 5 0 0 8 176 53 248 438 530 338 605 706 -323 5 0 0 8 232 530 706 558 81 340 601 366 -324 5 0 0 8 530 338 605 706 340 108 391 601 -325 5 0 0 8 180 438 246 55 558 706 597 368 -326 5 0 0 8 438 248 85 246 706 605 395 597 -327 5 0 0 8 558 706 597 368 366 601 393 115 -328 5 0 0 8 706 605 395 597 601 391 123 393 -329 5 0 0 8 53 177 440 248 338 531 707 605 -330 5 0 0 8 177 13 144 440 531 202 482 707 -331 5 0 0 8 338 531 707 605 108 341 599 391 -332 5 0 0 8 531 202 482 707 341 66 290 599 -333 5 0 0 8 248 440 247 85 605 707 596 395 -334 5 0 0 8 440 144 37 247 707 482 292 596 -335 5 0 0 8 605 707 596 395 391 599 392 123 -336 5 0 0 8 707 482 292 596 599 290 96 392 -337 5 0 0 8 81 340 601 366 233 532 708 559 -338 5 0 0 8 340 108 391 601 532 339 604 708 -339 5 0 0 8 233 532 708 559 27 226 538 222 -340 5 0 0 8 532 339 604 708 226 78 348 538 -341 5 0 0 8 366 601 393 115 559 708 595 369 -342 5 0 0 8 601 391 123 393 708 604 394 595 -343 5 0 0 8 559 708 595 369 222 538 346 76 -344 5 0 0 8 708 604 394 595 538 348 110 346 -345 5 0 0 8 108 341 599 391 339 533 709 604 -346 5 0 0 8 341 66 290 599 533 203 483 709 -347 5 0 0 8 339 533 709 604 78 227 540 348 -348 5 0 0 8 533 203 483 709 227 24 200 540 -349 5 0 0 8 391 599 392 123 604 709 594 394 -350 5 0 0 8 599 290 96 392 709 483 293 594 -351 5 0 0 8 604 709 594 394 348 540 347 110 -352 5 0 0 8 709 483 293 594 540 200 65 347 -353 5 0 0 8 55 246 439 181 368 597 710 560 -354 5 0 0 8 246 85 249 439 597 395 603 710 -355 5 0 0 8 368 597 710 560 115 393 600 367 -356 5 0 0 8 597 395 603 710 393 123 390 600 -357 5 0 0 8 181 439 160 17 560 710 510 214 -358 5 0 0 8 439 249 45 160 710 603 318 510 -359 5 0 0 8 560 710 510 214 367 600 320 72 -360 5 0 0 8 710 603 318 510 600 390 103 320 -361 5 0 0 8 85 247 441 249 395 596 711 603 -362 5 0 0 8 247 37 145 441 596 292 484 711 -363 5 0 0 8 395 596 711 603 123 392 598 390 -364 5 0 0 8 596 292 484 711 392 96 291 598 -365 5 0 0 8 249 441 161 45 603 711 511 318 -366 5 0 0 8 441 145 6 161 711 484 166 511 -367 5 0 0 8 603 711 511 318 390 598 321 103 -368 5 0 0 8 711 484 166 511 598 291 48 321 -369 5 0 0 8 115 393 600 367 369 595 712 561 -370 5 0 0 8 393 123 390 600 595 394 602 712 -371 5 0 0 8 369 595 712 561 76 346 539 223 -372 5 0 0 8 595 394 602 712 346 110 349 539 -373 5 0 0 8 367 600 320 72 561 712 512 215 -374 5 0 0 8 600 390 103 320 712 602 319 512 -375 5 0 0 8 561 712 512 215 223 539 220 26 -376 5 0 0 8 712 602 319 512 539 349 75 220 -377 5 0 0 8 123 392 598 390 394 594 713 602 -378 5 0 0 8 392 96 291 598 594 293 485 713 -379 5 0 0 8 394 594 713 602 110 347 541 349 -380 5 0 0 8 594 293 485 713 347 65 201 541 -381 5 0 0 8 390 598 321 103 602 713 513 319 -382 5 0 0 8 598 291 48 321 713 485 167 513 -383 5 0 0 8 602 713 513 319 349 541 221 75 -384 5 0 0 8 713 485 167 513 541 201 19 221 -385 5 0 0 8 23 228 546 192 196 526 714 470 -386 5 0 0 8 228 79 356 546 526 334 593 714 -387 5 0 0 8 196 526 714 470 63 336 589 278 -388 5 0 0 8 526 334 593 714 336 107 385 589 -389 5 0 0 8 192 546 354 61 470 714 585 280 -390 5 0 0 8 546 356 112 354 714 593 389 585 -391 5 0 0 8 470 714 585 280 278 589 387 93 -392 5 0 0 8 714 593 389 585 589 385 124 387 -393 5 0 0 8 79 229 548 356 334 527 715 593 -394 5 0 0 8 229 27 222 548 527 230 554 715 -395 5 0 0 8 334 527 715 593 107 337 587 385 -396 5 0 0 8 527 230 554 715 337 80 362 587 -397 5 0 0 8 356 548 355 112 593 715 584 389 -398 5 0 0 8 548 222 76 355 715 554 364 584 -399 5 0 0 8 593 715 584 389 385 587 386 124 -400 5 0 0 8 715 554 364 584 587 362 114 386 -401 5 0 0 8 63 336 589 278 197 528 716 471 -402 5 0 0 8 336 107 385 589 528 335 592 716 -403 5 0 0 8 197 528 716 471 15 206 494 152 -404 5 0 0 8 528 335 592 716 206 68 304 494 -405 5 0 0 8 278 589 387 93 471 716 583 281 -406 5 0 0 8 589 385 124 387 716 592 388 583 -407 5 0 0 8 471 716 583 281 152 494 302 41 -408 5 0 0 8 716 592 388 583 494 304 99 302 -409 5 0 0 8 107 337 587 385 335 529 717 592 -410 5 0 0 8 337 80 362 587 529 231 555 717 -411 5 0 0 8 335 529 717 592 68 207 496 304 -412 5 0 0 8 529 231 555 717 207 25 212 496 -413 5 0 0 8 385 587 386 124 592 717 582 388 -414 5 0 0 8 587 362 114 386 717 555 365 582 -415 5 0 0 8 592 717 582 388 304 496 303 99 -416 5 0 0 8 717 555 365 582 496 212 71 303 -417 5 0 0 8 61 354 547 193 280 585 718 472 -418 5 0 0 8 354 112 357 547 585 389 591 718 -419 5 0 0 8 280 585 718 472 93 387 588 279 -420 5 0 0 8 585 389 591 718 387 124 384 588 -421 5 0 0 8 193 547 218 18 472 718 514 164 -422 5 0 0 8 547 357 74 218 718 591 322 514 -423 5 0 0 8 472 718 514 164 279 588 324 47 -424 5 0 0 8 718 591 322 514 588 384 104 324 -425 5 0 0 8 112 355 549 357 389 584 719 591 -426 5 0 0 8 355 76 223 549 584 364 556 719 -427 5 0 0 8 389 584 719 591 124 386 586 384 -428 5 0 0 8 584 364 556 719 386 114 363 586 -429 5 0 0 8 357 549 219 74 591 719 515 322 -430 5 0 0 8 549 223 26 219 719 556 216 515 -431 5 0 0 8 591 719 515 322 384 586 325 104 -432 5 0 0 8 719 556 216 515 586 363 73 325 -433 5 0 0 8 93 387 588 279 281 583 720 473 -434 5 0 0 8 387 124 384 588 583 388 590 720 -435 5 0 0 8 281 583 720 473 41 302 495 153 -436 5 0 0 8 583 388 590 720 302 99 305 495 -437 5 0 0 8 279 588 324 47 473 720 516 165 -438 5 0 0 8 588 384 104 324 720 590 323 516 -439 5 0 0 8 473 720 516 165 153 495 170 7 -440 5 0 0 8 720 590 323 516 495 305 50 170 -441 5 0 0 8 124 386 586 384 388 582 721 590 -442 5 0 0 8 386 114 363 586 582 365 557 721 -443 5 0 0 8 388 582 721 590 99 303 497 305 -444 5 0 0 8 582 365 557 721 303 71 213 497 -445 5 0 0 8 384 586 325 104 590 721 517 323 -446 5 0 0 8 586 363 73 325 721 557 217 517 -447 5 0 0 8 590 721 517 323 305 497 171 50 -448 5 0 0 8 721 557 217 517 497 213 20 171 -449 5 0 0 8 27 226 538 222 230 522 722 554 -450 5 0 0 8 226 78 348 538 522 330 581 722 -451 5 0 0 8 230 522 722 554 80 332 577 362 -452 5 0 0 8 522 330 581 722 332 106 379 577 -453 5 0 0 8 222 538 346 76 554 722 573 364 -454 5 0 0 8 538 348 110 346 722 581 383 573 -455 5 0 0 8 554 722 573 364 362 577 381 114 -456 5 0 0 8 722 581 383 573 577 379 125 381 -457 5 0 0 8 78 227 540 348 330 523 723 581 -458 5 0 0 8 227 24 200 540 523 204 486 723 -459 5 0 0 8 330 523 723 581 106 333 575 379 -460 5 0 0 8 523 204 486 723 333 67 294 575 -461 5 0 0 8 348 540 347 110 581 723 572 383 -462 5 0 0 8 540 200 65 347 723 486 296 572 -463 5 0 0 8 581 723 572 383 379 575 380 125 -464 5 0 0 8 723 486 296 572 575 294 97 380 -465 5 0 0 8 80 332 577 362 231 524 724 555 -466 5 0 0 8 332 106 379 577 524 331 580 724 -467 5 0 0 8 231 524 724 555 25 208 502 212 -468 5 0 0 8 524 331 580 724 208 69 312 502 -469 5 0 0 8 362 577 381 114 555 724 571 365 -470 5 0 0 8 577 379 125 381 724 580 382 571 -471 5 0 0 8 555 724 571 365 212 502 310 71 -472 5 0 0 8 724 580 382 571 502 312 101 310 -473 5 0 0 8 106 333 575 379 331 525 725 580 -474 5 0 0 8 333 67 294 575 525 205 487 725 -475 5 0 0 8 331 525 725 580 69 209 504 312 -476 5 0 0 8 525 205 487 725 209 16 156 504 -477 5 0 0 8 379 575 380 125 580 725 570 382 -478 5 0 0 8 575 294 97 380 725 487 297 570 -479 5 0 0 8 580 725 570 382 312 504 311 101 -480 5 0 0 8 725 487 297 570 504 156 43 311 -481 5 0 0 8 76 346 539 223 364 573 726 556 -482 5 0 0 8 346 110 349 539 573 383 579 726 -483 5 0 0 8 364 573 726 556 114 381 576 363 -484 5 0 0 8 573 383 579 726 381 125 378 576 -485 5 0 0 8 223 539 220 26 556 726 518 216 -486 5 0 0 8 539 349 75 220 726 579 326 518 -487 5 0 0 8 556 726 518 216 363 576 328 73 -488 5 0 0 8 726 579 326 518 576 378 105 328 -489 5 0 0 8 110 347 541 349 383 572 727 579 -490 5 0 0 8 347 65 201 541 572 296 488 727 -491 5 0 0 8 383 572 727 579 125 380 574 378 -492 5 0 0 8 572 296 488 727 380 97 295 574 -493 5 0 0 8 349 541 221 75 579 727 519 326 -494 5 0 0 8 541 201 19 221 727 488 168 519 -495 5 0 0 8 579 727 519 326 378 574 329 105 -496 5 0 0 8 727 488 168 519 574 295 49 329 -497 5 0 0 8 114 381 576 363 365 571 728 557 -498 5 0 0 8 381 125 378 576 571 382 578 728 -499 5 0 0 8 365 571 728 557 71 310 503 213 -500 5 0 0 8 571 382 578 728 310 101 313 503 -501 5 0 0 8 363 576 328 73 557 728 520 217 -502 5 0 0 8 576 378 105 328 728 578 327 520 -503 5 0 0 8 557 728 520 217 213 503 172 20 -504 5 0 0 8 728 578 327 520 503 313 51 172 -505 5 0 0 8 125 380 574 378 382 570 729 578 -506 5 0 0 8 380 97 295 574 570 297 489 729 -507 5 0 0 8 382 570 729 578 101 311 505 313 -508 5 0 0 8 570 297 489 729 311 43 157 505 -509 5 0 0 8 378 574 329 105 578 729 521 327 -510 5 0 0 8 574 295 49 329 729 489 169 521 -511 5 0 0 8 578 729 521 327 313 505 173 51 -512 5 0 0 8 729 489 169 521 505 157 8 173 -$ENDELM diff --git a/tests/manifold/manifold_id_07.cc b/tests/manifold/manifold_id_07.cc deleted file mode 100644 index 9430331025..0000000000 --- a/tests/manifold/manifold_id_07.cc +++ /dev/null @@ -1,84 +0,0 @@ -//---------------------------- manifold_id_05.cc --------------------------- -// Copyright (C) 2011, 2013 by the mathLab team. -// -// This file is subject to LGPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- manifold_id_05.cc --------------------------- - - -// Set a manifold id on one of the boundary face, and attach the -// boundary description to it. Refine globally twice and output the mesh. -// Do this building first the Tria, then the manifold, and setting the -// manifold at the end as well, to check proper destruction of the classes. - -#include "../tests.h" -#include -#include - - -// all include files you need here -#include -#include -#include -#include -#include -#include - -// Helper function -template -void test(unsigned int ref=1){ - deallog << "Testing dim=" << dim - << ", spacedim="<< spacedim << std::endl; - - Point center; - for(unsigned int i=0; i tria; - PolarManifold boundary(center); - GridGenerator::hyper_cube (tria); - typename Triangulation::active_cell_iterator cell; - - tria.begin_active()->face(0)->set_manifold_id(1); - tria.set_manifold(1,boundary); - - tria.refine_global(2); - - for(cell=tria.begin_active(); cell!=tria.end(); ++cell) - { - deallog << "C: " << cell << std::endl; - for(unsigned int f=0; f::faces_per_cell;++f) - deallog << "F: " << cell->face(f) << ", mid: " - << (int) cell->face(f)->manifold_id() << std::endl; - } - - - GridOut gridout; - gridout.write_msh(tria, deallog.get_file_stream()); - char fname[30]; - sprintf(fname, "/tmp/id_7_mesh_%d_%d.msh", - dim, spacedim); - std::ofstream ofile(fname); - gridout.write_msh(tria,ofile); - tria.set_manifold(1); -} - -int main () -{ - std::ofstream logfile("output"); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - test<1,1>(); - test<1,2>(); - test<2,2>(); - test<2,3>(); - test<3,3>(); - - return 0; -} - diff --git a/tests/manifold/manifold_id_07.output b/tests/manifold/manifold_id_07.output deleted file mode 100644 index 549537d16c..0000000000 --- a/tests/manifold/manifold_id_07.output +++ /dev/null @@ -1,957 +0,0 @@ - -DEAL::Testing dim=1, spacedim=1 -DEAL::C: 2.0 -DEAL::F: 0, mid: 1 -DEAL::F: 3, mid: 255 -DEAL::C: 2.1 -DEAL::F: 3, mid: 255 -DEAL::F: 2, mid: 255 -DEAL::C: 2.2 -DEAL::F: 2, mid: 255 -DEAL::F: 4, mid: 255 -DEAL::C: 2.3 -DEAL::F: 4, mid: 255 -DEAL::F: 1, mid: 255 -$NOD -5 -1 0.00000 0 0 -2 1.00000 0 0 -3 0.500000 0 0 -4 0.250000 0 0 -5 0.750000 0 0 -$ENDNOD -$ELM -4 -1 1 0 0 2 1 4 -2 1 0 0 2 4 3 -3 1 0 0 2 3 5 -4 1 0 0 2 5 2 -$ENDELM -DEAL::Testing dim=1, spacedim=2 -DEAL::C: 2.0 -DEAL::F: 0, mid: 1 -DEAL::F: 3, mid: 255 -DEAL::C: 2.1 -DEAL::F: 3, mid: 255 -DEAL::F: 2, mid: 255 -DEAL::C: 2.2 -DEAL::F: 2, mid: 255 -DEAL::F: 4, mid: 255 -DEAL::C: 2.3 -DEAL::F: 4, mid: 255 -DEAL::F: 1, mid: 255 -$NOD -5 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.500000 0.00000 0 -4 0.250000 0.00000 0 -5 0.750000 0.00000 0 -$ENDNOD -$ELM -4 -1 1 0 0 2 1 4 -2 1 0 0 2 4 3 -3 1 0 0 2 3 5 -4 1 0 0 2 5 2 -$ENDELM -DEAL::Testing dim=2, spacedim=2 -DEAL::C: 2.0 -DEAL::F: 20, mid: 1 -DEAL::F: 40, mid: 255 -DEAL::F: 16, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::C: 2.1 -DEAL::F: 40, mid: 255 -DEAL::F: 32, mid: 255 -DEAL::F: 17, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::C: 2.2 -DEAL::F: 21, mid: 1 -DEAL::F: 41, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::C: 2.3 -DEAL::F: 41, mid: 255 -DEAL::F: 33, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::C: 2.4 -DEAL::F: 32, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 18, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::C: 2.5 -DEAL::F: 44, mid: 255 -DEAL::F: 24, mid: 255 -DEAL::F: 19, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::C: 2.6 -DEAL::F: 33, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::C: 2.7 -DEAL::F: 45, mid: 255 -DEAL::F: 25, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::C: 2.8 -DEAL::F: 22, mid: 1 -DEAL::F: 48, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::C: 2.9 -DEAL::F: 48, mid: 255 -DEAL::F: 34, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::C: 2.10 -DEAL::F: 23, mid: 1 -DEAL::F: 49, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 28, mid: 255 -DEAL::C: 2.11 -DEAL::F: 49, mid: 255 -DEAL::F: 35, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 29, mid: 255 -DEAL::C: 2.12 -DEAL::F: 34, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::C: 2.13 -DEAL::F: 52, mid: 255 -DEAL::F: 26, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::C: 2.14 -DEAL::F: 35, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 30, mid: 255 -DEAL::C: 2.15 -DEAL::F: 53, mid: 255 -DEAL::F: 27, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 31, mid: 255 -$NOD -25 -1 0.00000 0.00000 0 -2 1.00000 0.00000 0 -3 0.00000 1.00000 0 -4 1.00000 1.00000 0 -5 0.500000 0.00000 0 -6 -0.207107 0.500000 0 -7 1.00000 0.500000 0 -8 0.500000 1.00000 0 -9 0.474112 0.500000 0 -10 0.250000 0.00000 0 -11 0.750000 0.00000 0 -12 -0.153281 0.229402 0 -13 -0.153281 0.770598 0 -14 1.00000 0.250000 0 -15 1.00000 0.750000 0 -16 0.250000 1.00000 0 -17 0.750000 1.00000 0 -18 0.487056 0.250000 0 -19 0.487056 0.750000 0 -20 0.133502 0.500000 0 -21 0.737056 0.500000 0 -22 0.185535 0.247425 0 -23 0.743528 0.250000 0 -24 0.185535 0.752575 0 -25 0.743528 0.750000 0 -$ENDNOD -$ELM -16 -1 3 0 0 4 1 10 22 12 -2 3 0 0 4 10 5 18 22 -3 3 0 0 4 12 22 20 6 -4 3 0 0 4 22 18 9 20 -5 3 0 0 4 5 11 23 18 -6 3 0 0 4 11 2 14 23 -7 3 0 0 4 18 23 21 9 -8 3 0 0 4 23 14 7 21 -9 3 0 0 4 6 20 24 13 -10 3 0 0 4 20 9 19 24 -11 3 0 0 4 13 24 16 3 -12 3 0 0 4 24 19 8 16 -13 3 0 0 4 9 21 25 19 -14 3 0 0 4 21 7 15 25 -15 3 0 0 4 19 25 17 8 -16 3 0 0 4 25 15 4 17 -$ENDELM -DEAL::Testing dim=2, spacedim=3 -DEAL::C: 2.0 -DEAL::F: 20, mid: 1 -DEAL::F: 40, mid: 255 -DEAL::F: 16, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::C: 2.1 -DEAL::F: 40, mid: 255 -DEAL::F: 32, mid: 255 -DEAL::F: 17, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::C: 2.2 -DEAL::F: 21, mid: 1 -DEAL::F: 41, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::C: 2.3 -DEAL::F: 41, mid: 255 -DEAL::F: 33, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::C: 2.4 -DEAL::F: 32, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 18, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::C: 2.5 -DEAL::F: 44, mid: 255 -DEAL::F: 24, mid: 255 -DEAL::F: 19, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::C: 2.6 -DEAL::F: 33, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::C: 2.7 -DEAL::F: 45, mid: 255 -DEAL::F: 25, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::C: 2.8 -DEAL::F: 22, mid: 1 -DEAL::F: 48, mid: 255 -DEAL::F: 36, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::C: 2.9 -DEAL::F: 48, mid: 255 -DEAL::F: 34, mid: 255 -DEAL::F: 37, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::C: 2.10 -DEAL::F: 23, mid: 1 -DEAL::F: 49, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 28, mid: 255 -DEAL::C: 2.11 -DEAL::F: 49, mid: 255 -DEAL::F: 35, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 29, mid: 255 -DEAL::C: 2.12 -DEAL::F: 34, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 38, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::C: 2.13 -DEAL::F: 52, mid: 255 -DEAL::F: 26, mid: 255 -DEAL::F: 39, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::C: 2.14 -DEAL::F: 35, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 30, mid: 255 -DEAL::C: 2.15 -DEAL::F: 53, mid: 255 -DEAL::F: 27, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 31, mid: 255 -$NOD -25 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.500000 0.00000 0.00000 -6 -0.207107 0.500000 0.00000 -7 1.00000 0.500000 0.00000 -8 0.500000 1.00000 0.00000 -9 0.474112 0.500000 0.00000 -10 0.250000 0.00000 0.00000 -11 0.750000 0.00000 0.00000 -12 -0.153281 0.229402 0.00000 -13 -0.153281 0.770598 0.00000 -14 1.00000 0.250000 0.00000 -15 1.00000 0.750000 0.00000 -16 0.250000 1.00000 0.00000 -17 0.750000 1.00000 0.00000 -18 0.487056 0.250000 0.00000 -19 0.487056 0.750000 0.00000 -20 0.133502 0.500000 0.00000 -21 0.737056 0.500000 0.00000 -22 0.185535 0.247425 0.00000 -23 0.743528 0.250000 0.00000 -24 0.185535 0.752575 0.00000 -25 0.743528 0.750000 0.00000 -$ENDNOD -$ELM -16 -1 3 0 0 4 1 10 22 12 -2 3 0 0 4 10 5 18 22 -3 3 0 0 4 12 22 20 6 -4 3 0 0 4 22 18 9 20 -5 3 0 0 4 5 11 23 18 -6 3 0 0 4 11 2 14 23 -7 3 0 0 4 18 23 21 9 -8 3 0 0 4 23 14 7 21 -9 3 0 0 4 6 20 24 13 -10 3 0 0 4 20 9 19 24 -11 3 0 0 4 13 24 16 3 -12 3 0 0 4 24 19 8 16 -13 3 0 0 4 9 21 25 19 -14 3 0 0 4 21 7 15 25 -15 3 0 0 4 19 25 17 8 -16 3 0 0 4 25 15 4 17 -$ENDELM -DEAL::Testing dim=3, spacedim=3 -DEAL::C: 2.0 -DEAL::F: 74, mid: 1 -DEAL::F: 281, mid: 255 -DEAL::F: 42, mid: 255 -DEAL::F: 277, mid: 255 -DEAL::F: 58, mid: 255 -DEAL::F: 273, mid: 255 -DEAL::C: 2.1 -DEAL::F: 281, mid: 255 -DEAL::F: 182, mid: 255 -DEAL::F: 44, mid: 255 -DEAL::F: 275, mid: 255 -DEAL::F: 59, mid: 255 -DEAL::F: 272, mid: 255 -DEAL::C: 2.2 -DEAL::F: 75, mid: 1 -DEAL::F: 280, mid: 255 -DEAL::F: 277, mid: 255 -DEAL::F: 166, mid: 255 -DEAL::F: 60, mid: 255 -DEAL::F: 271, mid: 255 -DEAL::C: 2.3 -DEAL::F: 280, mid: 255 -DEAL::F: 183, mid: 255 -DEAL::F: 275, mid: 255 -DEAL::F: 168, mid: 255 -DEAL::F: 61, mid: 255 -DEAL::F: 270, mid: 255 -DEAL::C: 2.4 -DEAL::F: 76, mid: 1 -DEAL::F: 279, mid: 255 -DEAL::F: 43, mid: 255 -DEAL::F: 276, mid: 255 -DEAL::F: 273, mid: 255 -DEAL::F: 150, mid: 255 -DEAL::C: 2.5 -DEAL::F: 279, mid: 255 -DEAL::F: 184, mid: 255 -DEAL::F: 45, mid: 255 -DEAL::F: 274, mid: 255 -DEAL::F: 272, mid: 255 -DEAL::F: 151, mid: 255 -DEAL::C: 2.6 -DEAL::F: 77, mid: 1 -DEAL::F: 278, mid: 255 -DEAL::F: 276, mid: 255 -DEAL::F: 167, mid: 255 -DEAL::F: 271, mid: 255 -DEAL::F: 152, mid: 255 -DEAL::C: 2.7 -DEAL::F: 278, mid: 255 -DEAL::F: 185, mid: 255 -DEAL::F: 274, mid: 255 -DEAL::F: 169, mid: 255 -DEAL::F: 270, mid: 255 -DEAL::F: 153, mid: 255 -DEAL::C: 2.8 -DEAL::F: 182, mid: 255 -DEAL::F: 269, mid: 255 -DEAL::F: 50, mid: 255 -DEAL::F: 265, mid: 255 -DEAL::F: 62, mid: 255 -DEAL::F: 261, mid: 255 -DEAL::C: 2.9 -DEAL::F: 269, mid: 255 -DEAL::F: 90, mid: 255 -DEAL::F: 52, mid: 255 -DEAL::F: 263, mid: 255 -DEAL::F: 63, mid: 255 -DEAL::F: 260, mid: 255 -DEAL::C: 2.10 -DEAL::F: 183, mid: 255 -DEAL::F: 268, mid: 255 -DEAL::F: 265, mid: 255 -DEAL::F: 158, mid: 255 -DEAL::F: 64, mid: 255 -DEAL::F: 259, mid: 255 -DEAL::C: 2.11 -DEAL::F: 268, mid: 255 -DEAL::F: 91, mid: 255 -DEAL::F: 263, mid: 255 -DEAL::F: 160, mid: 255 -DEAL::F: 65, mid: 255 -DEAL::F: 258, mid: 255 -DEAL::C: 2.12 -DEAL::F: 184, mid: 255 -DEAL::F: 267, mid: 255 -DEAL::F: 51, mid: 255 -DEAL::F: 264, mid: 255 -DEAL::F: 261, mid: 255 -DEAL::F: 146, mid: 255 -DEAL::C: 2.13 -DEAL::F: 267, mid: 255 -DEAL::F: 92, mid: 255 -DEAL::F: 53, mid: 255 -DEAL::F: 262, mid: 255 -DEAL::F: 260, mid: 255 -DEAL::F: 147, mid: 255 -DEAL::C: 2.14 -DEAL::F: 185, mid: 255 -DEAL::F: 266, mid: 255 -DEAL::F: 264, mid: 255 -DEAL::F: 159, mid: 255 -DEAL::F: 259, mid: 255 -DEAL::F: 148, mid: 255 -DEAL::C: 2.15 -DEAL::F: 266, mid: 255 -DEAL::F: 93, mid: 255 -DEAL::F: 262, mid: 255 -DEAL::F: 161, mid: 255 -DEAL::F: 258, mid: 255 -DEAL::F: 149, mid: 255 -DEAL::C: 2.16 -DEAL::F: 78, mid: 1 -DEAL::F: 257, mid: 255 -DEAL::F: 166, mid: 255 -DEAL::F: 253, mid: 255 -DEAL::F: 66, mid: 255 -DEAL::F: 249, mid: 255 -DEAL::C: 2.17 -DEAL::F: 257, mid: 255 -DEAL::F: 178, mid: 255 -DEAL::F: 168, mid: 255 -DEAL::F: 251, mid: 255 -DEAL::F: 67, mid: 255 -DEAL::F: 248, mid: 255 -DEAL::C: 2.18 -DEAL::F: 79, mid: 1 -DEAL::F: 256, mid: 255 -DEAL::F: 253, mid: 255 -DEAL::F: 106, mid: 255 -DEAL::F: 68, mid: 255 -DEAL::F: 247, mid: 255 -DEAL::C: 2.19 -DEAL::F: 256, mid: 255 -DEAL::F: 179, mid: 255 -DEAL::F: 251, mid: 255 -DEAL::F: 108, mid: 255 -DEAL::F: 69, mid: 255 -DEAL::F: 246, mid: 255 -DEAL::C: 2.20 -DEAL::F: 80, mid: 1 -DEAL::F: 255, mid: 255 -DEAL::F: 167, mid: 255 -DEAL::F: 252, mid: 255 -DEAL::F: 249, mid: 255 -DEAL::F: 142, mid: 255 -DEAL::C: 2.21 -DEAL::F: 255, mid: 255 -DEAL::F: 180, mid: 255 -DEAL::F: 169, mid: 255 -DEAL::F: 250, mid: 255 -DEAL::F: 248, mid: 255 -DEAL::F: 143, mid: 255 -DEAL::C: 2.22 -DEAL::F: 81, mid: 1 -DEAL::F: 254, mid: 255 -DEAL::F: 252, mid: 255 -DEAL::F: 107, mid: 255 -DEAL::F: 247, mid: 255 -DEAL::F: 144, mid: 255 -DEAL::C: 2.23 -DEAL::F: 254, mid: 255 -DEAL::F: 181, mid: 255 -DEAL::F: 250, mid: 255 -DEAL::F: 109, mid: 255 -DEAL::F: 246, mid: 255 -DEAL::F: 145, mid: 255 -DEAL::C: 2.24 -DEAL::F: 178, mid: 255 -DEAL::F: 245, mid: 255 -DEAL::F: 158, mid: 255 -DEAL::F: 241, mid: 255 -DEAL::F: 70, mid: 255 -DEAL::F: 237, mid: 255 -DEAL::C: 2.25 -DEAL::F: 245, mid: 255 -DEAL::F: 94, mid: 255 -DEAL::F: 160, mid: 255 -DEAL::F: 239, mid: 255 -DEAL::F: 71, mid: 255 -DEAL::F: 236, mid: 255 -DEAL::C: 2.26 -DEAL::F: 179, mid: 255 -DEAL::F: 244, mid: 255 -DEAL::F: 241, mid: 255 -DEAL::F: 114, mid: 255 -DEAL::F: 72, mid: 255 -DEAL::F: 235, mid: 255 -DEAL::C: 2.27 -DEAL::F: 244, mid: 255 -DEAL::F: 95, mid: 255 -DEAL::F: 239, mid: 255 -DEAL::F: 116, mid: 255 -DEAL::F: 73, mid: 255 -DEAL::F: 234, mid: 255 -DEAL::C: 2.28 -DEAL::F: 180, mid: 255 -DEAL::F: 243, mid: 255 -DEAL::F: 159, mid: 255 -DEAL::F: 240, mid: 255 -DEAL::F: 237, mid: 255 -DEAL::F: 138, mid: 255 -DEAL::C: 2.29 -DEAL::F: 243, mid: 255 -DEAL::F: 96, mid: 255 -DEAL::F: 161, mid: 255 -DEAL::F: 238, mid: 255 -DEAL::F: 236, mid: 255 -DEAL::F: 139, mid: 255 -DEAL::C: 2.30 -DEAL::F: 181, mid: 255 -DEAL::F: 242, mid: 255 -DEAL::F: 240, mid: 255 -DEAL::F: 115, mid: 255 -DEAL::F: 235, mid: 255 -DEAL::F: 140, mid: 255 -DEAL::C: 2.31 -DEAL::F: 242, mid: 255 -DEAL::F: 97, mid: 255 -DEAL::F: 238, mid: 255 -DEAL::F: 117, mid: 255 -DEAL::F: 234, mid: 255 -DEAL::F: 141, mid: 255 -DEAL::C: 2.32 -DEAL::F: 82, mid: 1 -DEAL::F: 233, mid: 255 -DEAL::F: 46, mid: 255 -DEAL::F: 229, mid: 255 -DEAL::F: 150, mid: 255 -DEAL::F: 225, mid: 255 -DEAL::C: 2.33 -DEAL::F: 233, mid: 255 -DEAL::F: 174, mid: 255 -DEAL::F: 48, mid: 255 -DEAL::F: 227, mid: 255 -DEAL::F: 151, mid: 255 -DEAL::F: 224, mid: 255 -DEAL::C: 2.34 -DEAL::F: 83, mid: 1 -DEAL::F: 232, mid: 255 -DEAL::F: 229, mid: 255 -DEAL::F: 162, mid: 255 -DEAL::F: 152, mid: 255 -DEAL::F: 223, mid: 255 -DEAL::C: 2.35 -DEAL::F: 232, mid: 255 -DEAL::F: 175, mid: 255 -DEAL::F: 227, mid: 255 -DEAL::F: 164, mid: 255 -DEAL::F: 153, mid: 255 -DEAL::F: 222, mid: 255 -DEAL::C: 2.36 -DEAL::F: 84, mid: 1 -DEAL::F: 231, mid: 255 -DEAL::F: 47, mid: 255 -DEAL::F: 228, mid: 255 -DEAL::F: 225, mid: 255 -DEAL::F: 122, mid: 255 -DEAL::C: 2.37 -DEAL::F: 231, mid: 255 -DEAL::F: 176, mid: 255 -DEAL::F: 49, mid: 255 -DEAL::F: 226, mid: 255 -DEAL::F: 224, mid: 255 -DEAL::F: 123, mid: 255 -DEAL::C: 2.38 -DEAL::F: 85, mid: 1 -DEAL::F: 230, mid: 255 -DEAL::F: 228, mid: 255 -DEAL::F: 163, mid: 255 -DEAL::F: 223, mid: 255 -DEAL::F: 124, mid: 255 -DEAL::C: 2.39 -DEAL::F: 230, mid: 255 -DEAL::F: 177, mid: 255 -DEAL::F: 226, mid: 255 -DEAL::F: 165, mid: 255 -DEAL::F: 222, mid: 255 -DEAL::F: 125, mid: 255 -DEAL::C: 2.40 -DEAL::F: 174, mid: 255 -DEAL::F: 221, mid: 255 -DEAL::F: 54, mid: 255 -DEAL::F: 217, mid: 255 -DEAL::F: 146, mid: 255 -DEAL::F: 213, mid: 255 -DEAL::C: 2.41 -DEAL::F: 221, mid: 255 -DEAL::F: 98, mid: 255 -DEAL::F: 56, mid: 255 -DEAL::F: 215, mid: 255 -DEAL::F: 147, mid: 255 -DEAL::F: 212, mid: 255 -DEAL::C: 2.42 -DEAL::F: 175, mid: 255 -DEAL::F: 220, mid: 255 -DEAL::F: 217, mid: 255 -DEAL::F: 154, mid: 255 -DEAL::F: 148, mid: 255 -DEAL::F: 211, mid: 255 -DEAL::C: 2.43 -DEAL::F: 220, mid: 255 -DEAL::F: 99, mid: 255 -DEAL::F: 215, mid: 255 -DEAL::F: 156, mid: 255 -DEAL::F: 149, mid: 255 -DEAL::F: 210, mid: 255 -DEAL::C: 2.44 -DEAL::F: 176, mid: 255 -DEAL::F: 219, mid: 255 -DEAL::F: 55, mid: 255 -DEAL::F: 216, mid: 255 -DEAL::F: 213, mid: 255 -DEAL::F: 126, mid: 255 -DEAL::C: 2.45 -DEAL::F: 219, mid: 255 -DEAL::F: 100, mid: 255 -DEAL::F: 57, mid: 255 -DEAL::F: 214, mid: 255 -DEAL::F: 212, mid: 255 -DEAL::F: 127, mid: 255 -DEAL::C: 2.46 -DEAL::F: 177, mid: 255 -DEAL::F: 218, mid: 255 -DEAL::F: 216, mid: 255 -DEAL::F: 155, mid: 255 -DEAL::F: 211, mid: 255 -DEAL::F: 128, mid: 255 -DEAL::C: 2.47 -DEAL::F: 218, mid: 255 -DEAL::F: 101, mid: 255 -DEAL::F: 214, mid: 255 -DEAL::F: 157, mid: 255 -DEAL::F: 210, mid: 255 -DEAL::F: 129, mid: 255 -DEAL::C: 2.48 -DEAL::F: 86, mid: 1 -DEAL::F: 209, mid: 255 -DEAL::F: 162, mid: 255 -DEAL::F: 205, mid: 255 -DEAL::F: 142, mid: 255 -DEAL::F: 201, mid: 255 -DEAL::C: 2.49 -DEAL::F: 209, mid: 255 -DEAL::F: 170, mid: 255 -DEAL::F: 164, mid: 255 -DEAL::F: 203, mid: 255 -DEAL::F: 143, mid: 255 -DEAL::F: 200, mid: 255 -DEAL::C: 2.50 -DEAL::F: 87, mid: 1 -DEAL::F: 208, mid: 255 -DEAL::F: 205, mid: 255 -DEAL::F: 110, mid: 255 -DEAL::F: 144, mid: 255 -DEAL::F: 199, mid: 255 -DEAL::C: 2.51 -DEAL::F: 208, mid: 255 -DEAL::F: 171, mid: 255 -DEAL::F: 203, mid: 255 -DEAL::F: 112, mid: 255 -DEAL::F: 145, mid: 255 -DEAL::F: 198, mid: 255 -DEAL::C: 2.52 -DEAL::F: 88, mid: 1 -DEAL::F: 207, mid: 255 -DEAL::F: 163, mid: 255 -DEAL::F: 204, mid: 255 -DEAL::F: 201, mid: 255 -DEAL::F: 130, mid: 255 -DEAL::C: 2.53 -DEAL::F: 207, mid: 255 -DEAL::F: 172, mid: 255 -DEAL::F: 165, mid: 255 -DEAL::F: 202, mid: 255 -DEAL::F: 200, mid: 255 -DEAL::F: 131, mid: 255 -DEAL::C: 2.54 -DEAL::F: 89, mid: 1 -DEAL::F: 206, mid: 255 -DEAL::F: 204, mid: 255 -DEAL::F: 111, mid: 255 -DEAL::F: 199, mid: 255 -DEAL::F: 132, mid: 255 -DEAL::C: 2.55 -DEAL::F: 206, mid: 255 -DEAL::F: 173, mid: 255 -DEAL::F: 202, mid: 255 -DEAL::F: 113, mid: 255 -DEAL::F: 198, mid: 255 -DEAL::F: 133, mid: 255 -DEAL::C: 2.56 -DEAL::F: 170, mid: 255 -DEAL::F: 197, mid: 255 -DEAL::F: 154, mid: 255 -DEAL::F: 193, mid: 255 -DEAL::F: 138, mid: 255 -DEAL::F: 189, mid: 255 -DEAL::C: 2.57 -DEAL::F: 197, mid: 255 -DEAL::F: 102, mid: 255 -DEAL::F: 156, mid: 255 -DEAL::F: 191, mid: 255 -DEAL::F: 139, mid: 255 -DEAL::F: 188, mid: 255 -DEAL::C: 2.58 -DEAL::F: 171, mid: 255 -DEAL::F: 196, mid: 255 -DEAL::F: 193, mid: 255 -DEAL::F: 118, mid: 255 -DEAL::F: 140, mid: 255 -DEAL::F: 187, mid: 255 -DEAL::C: 2.59 -DEAL::F: 196, mid: 255 -DEAL::F: 103, mid: 255 -DEAL::F: 191, mid: 255 -DEAL::F: 120, mid: 255 -DEAL::F: 141, mid: 255 -DEAL::F: 186, mid: 255 -DEAL::C: 2.60 -DEAL::F: 172, mid: 255 -DEAL::F: 195, mid: 255 -DEAL::F: 155, mid: 255 -DEAL::F: 192, mid: 255 -DEAL::F: 189, mid: 255 -DEAL::F: 134, mid: 255 -DEAL::C: 2.61 -DEAL::F: 195, mid: 255 -DEAL::F: 104, mid: 255 -DEAL::F: 157, mid: 255 -DEAL::F: 190, mid: 255 -DEAL::F: 188, mid: 255 -DEAL::F: 135, mid: 255 -DEAL::C: 2.62 -DEAL::F: 173, mid: 255 -DEAL::F: 194, mid: 255 -DEAL::F: 192, mid: 255 -DEAL::F: 119, mid: 255 -DEAL::F: 187, mid: 255 -DEAL::F: 136, mid: 255 -DEAL::C: 2.63 -DEAL::F: 194, mid: 255 -DEAL::F: 105, mid: 255 -DEAL::F: 190, mid: 255 -DEAL::F: 121, mid: 255 -DEAL::F: 186, mid: 255 -DEAL::F: 137, mid: 255 -$NOD -125 -1 0.00000 0.00000 0.00000 -2 1.00000 0.00000 0.00000 -3 0.00000 1.00000 0.00000 -4 1.00000 1.00000 0.00000 -5 0.00000 0.00000 1.00000 -6 1.00000 0.00000 1.00000 -7 0.00000 1.00000 1.00000 -8 1.00000 1.00000 1.00000 -9 0.500000 0.00000 0.00000 -10 0.00000 0.500000 0.00000 -11 0.00000 0.00000 0.500000 -12 1.00000 0.500000 0.00000 -13 1.00000 0.00000 0.500000 -14 0.500000 1.00000 0.00000 -15 0.00000 1.00000 0.500000 -16 1.00000 1.00000 0.500000 -17 0.500000 0.00000 1.00000 -18 0.00000 0.500000 1.00000 -19 1.00000 0.500000 1.00000 -20 0.500000 1.00000 1.00000 -21 0.500000 0.00000 0.500000 -22 0.500000 0.500000 0.00000 -23 -0.366025 0.500000 0.500000 -24 1.00000 0.500000 0.500000 -25 0.500000 1.00000 0.500000 -26 0.500000 0.500000 1.00000 -27 0.469498 0.500000 0.500000 -28 0.250000 0.00000 0.00000 -29 0.750000 0.00000 0.00000 -30 0.00000 0.250000 0.00000 -31 0.00000 0.750000 0.00000 -32 0.00000 0.00000 0.250000 -33 0.00000 0.00000 0.750000 -34 1.00000 0.250000 0.00000 -35 1.00000 0.750000 0.00000 -36 1.00000 0.00000 0.250000 -37 1.00000 0.00000 0.750000 -38 0.250000 1.00000 0.00000 -39 0.750000 1.00000 0.00000 -40 0.00000 1.00000 0.250000 -41 0.00000 1.00000 0.750000 -42 1.00000 1.00000 0.250000 -43 1.00000 1.00000 0.750000 -44 0.250000 0.00000 1.00000 -45 0.750000 0.00000 1.00000 -46 0.00000 0.250000 1.00000 -47 0.00000 0.750000 1.00000 -48 1.00000 0.250000 1.00000 -49 1.00000 0.750000 1.00000 -50 0.250000 1.00000 1.00000 -51 0.750000 1.00000 1.00000 -52 0.250000 0.00000 0.500000 -53 0.750000 0.00000 0.500000 -54 0.500000 0.00000 0.250000 -55 0.500000 0.00000 0.750000 -56 0.500000 0.250000 0.00000 -57 0.500000 0.750000 0.00000 -58 0.250000 0.500000 0.00000 -59 0.750000 0.500000 0.00000 -60 -0.313259 0.500000 0.202326 -61 -0.313259 0.500000 0.797674 -62 -0.313259 0.202326 0.500000 -63 -0.313259 0.797674 0.500000 -64 1.00000 0.500000 0.250000 -65 1.00000 0.500000 0.750000 -66 1.00000 0.250000 0.500000 -67 1.00000 0.750000 0.500000 -68 0.250000 1.00000 0.500000 -69 0.750000 1.00000 0.500000 -70 0.500000 1.00000 0.250000 -71 0.500000 1.00000 0.750000 -72 0.500000 0.250000 1.00000 -73 0.500000 0.750000 1.00000 -74 0.250000 0.500000 1.00000 -75 0.750000 0.500000 1.00000 -76 0.484749 0.500000 0.750000 -77 0.484749 0.500000 0.250000 -78 0.734749 0.500000 0.500000 -79 0.0517362 0.500000 0.500000 -80 0.484749 0.750000 0.500000 -81 0.484749 0.250000 0.500000 -82 0.250000 0.00000 0.250000 -83 0.250000 0.00000 0.750000 -84 0.750000 0.00000 0.250000 -85 0.750000 0.00000 0.750000 -86 0.250000 0.250000 0.00000 -87 0.750000 0.250000 0.00000 -88 0.250000 0.750000 0.00000 -89 0.750000 0.750000 0.00000 -90 -0.249128 0.192748 0.192748 -91 -0.249128 0.807252 0.192748 -92 -0.249128 0.192748 0.807252 -93 -0.249128 0.807252 0.807252 -94 1.00000 0.250000 0.250000 -95 1.00000 0.750000 0.250000 -96 1.00000 0.250000 0.750000 -97 1.00000 0.750000 0.750000 -98 0.250000 1.00000 0.250000 -99 0.250000 1.00000 0.750000 -100 0.750000 1.00000 0.250000 -101 0.750000 1.00000 0.750000 -102 0.250000 0.250000 1.00000 -103 0.750000 0.250000 1.00000 -104 0.250000 0.750000 1.00000 -105 0.750000 0.750000 1.00000 -106 0.742374 0.750000 0.500000 -107 0.126447 0.758939 0.500000 -108 0.742374 0.250000 0.500000 -109 0.126447 0.241061 0.500000 -110 0.742374 0.500000 0.750000 -111 0.742374 0.500000 0.250000 -112 0.126447 0.500000 0.758939 -113 0.126447 0.500000 0.241061 -114 0.492374 0.750000 0.750000 -115 0.492374 0.250000 0.750000 -116 0.492374 0.750000 0.250000 -117 0.492374 0.250000 0.250000 -118 0.173732 0.242746 0.242746 -119 0.746187 0.250000 0.250000 -120 0.173732 0.757254 0.242746 -121 0.746187 0.750000 0.250000 -122 0.173732 0.242746 0.757254 -123 0.746187 0.250000 0.750000 -124 0.173732 0.757254 0.757254 -125 0.746187 0.750000 0.750000 -$ENDNOD -$ELM -64 -1 5 0 0 8 1 28 82 32 30 86 118 90 -2 5 0 0 8 28 9 54 82 86 56 117 118 -3 5 0 0 8 30 86 118 90 10 58 113 60 -4 5 0 0 8 86 56 117 118 58 22 77 113 -5 5 0 0 8 32 82 52 11 90 118 109 62 -6 5 0 0 8 82 54 21 52 118 117 81 109 -7 5 0 0 8 90 118 109 62 60 113 79 23 -8 5 0 0 8 118 117 81 109 113 77 27 79 -9 5 0 0 8 9 29 84 54 56 87 119 117 -10 5 0 0 8 29 2 36 84 87 34 94 119 -11 5 0 0 8 56 87 119 117 22 59 111 77 -12 5 0 0 8 87 34 94 119 59 12 64 111 -13 5 0 0 8 54 84 53 21 117 119 108 81 -14 5 0 0 8 84 36 13 53 119 94 66 108 -15 5 0 0 8 117 119 108 81 77 111 78 27 -16 5 0 0 8 119 94 66 108 111 64 24 78 -17 5 0 0 8 10 58 113 60 31 88 120 91 -18 5 0 0 8 58 22 77 113 88 57 116 120 -19 5 0 0 8 31 88 120 91 3 38 98 40 -20 5 0 0 8 88 57 116 120 38 14 70 98 -21 5 0 0 8 60 113 79 23 91 120 107 63 -22 5 0 0 8 113 77 27 79 120 116 80 107 -23 5 0 0 8 91 120 107 63 40 98 68 15 -24 5 0 0 8 120 116 80 107 98 70 25 68 -25 5 0 0 8 22 59 111 77 57 89 121 116 -26 5 0 0 8 59 12 64 111 89 35 95 121 -27 5 0 0 8 57 89 121 116 14 39 100 70 -28 5 0 0 8 89 35 95 121 39 4 42 100 -29 5 0 0 8 77 111 78 27 116 121 106 80 -30 5 0 0 8 111 64 24 78 121 95 67 106 -31 5 0 0 8 116 121 106 80 70 100 69 25 -32 5 0 0 8 121 95 67 106 100 42 16 69 -33 5 0 0 8 11 52 83 33 62 109 122 92 -34 5 0 0 8 52 21 55 83 109 81 115 122 -35 5 0 0 8 62 109 122 92 23 79 112 61 -36 5 0 0 8 109 81 115 122 79 27 76 112 -37 5 0 0 8 33 83 44 5 92 122 102 46 -38 5 0 0 8 83 55 17 44 122 115 72 102 -39 5 0 0 8 92 122 102 46 61 112 74 18 -40 5 0 0 8 122 115 72 102 112 76 26 74 -41 5 0 0 8 21 53 85 55 81 108 123 115 -42 5 0 0 8 53 13 37 85 108 66 96 123 -43 5 0 0 8 81 108 123 115 27 78 110 76 -44 5 0 0 8 108 66 96 123 78 24 65 110 -45 5 0 0 8 55 85 45 17 115 123 103 72 -46 5 0 0 8 85 37 6 45 123 96 48 103 -47 5 0 0 8 115 123 103 72 76 110 75 26 -48 5 0 0 8 123 96 48 103 110 65 19 75 -49 5 0 0 8 23 79 112 61 63 107 124 93 -50 5 0 0 8 79 27 76 112 107 80 114 124 -51 5 0 0 8 63 107 124 93 15 68 99 41 -52 5 0 0 8 107 80 114 124 68 25 71 99 -53 5 0 0 8 61 112 74 18 93 124 104 47 -54 5 0 0 8 112 76 26 74 124 114 73 104 -55 5 0 0 8 93 124 104 47 41 99 50 7 -56 5 0 0 8 124 114 73 104 99 71 20 50 -57 5 0 0 8 27 78 110 76 80 106 125 114 -58 5 0 0 8 78 24 65 110 106 67 97 125 -59 5 0 0 8 80 106 125 114 25 69 101 71 -60 5 0 0 8 106 67 97 125 69 16 43 101 -61 5 0 0 8 76 110 75 26 114 125 105 73 -62 5 0 0 8 110 65 19 75 125 97 49 105 -63 5 0 0 8 114 125 105 73 71 101 51 20 -64 5 0 0 8 125 97 49 105 101 43 8 51 -$ENDELM diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc index 79a9f4791f..eab595cb6f 100644 --- a/tests/matrix_free/get_functions_circle.cc +++ b/tests/matrix_free/get_functions_circle.cc @@ -34,8 +34,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc index b27b145eb6..c585c8e235 100644 --- a/tests/matrix_free/get_functions_gl.cc +++ b/tests/matrix_free/get_functions_gl.cc @@ -91,8 +91,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc index de680f7e87..27e1179631 100644 --- a/tests/matrix_free/get_functions_mappingq.cc +++ b/tests/matrix_free/get_functions_mappingq.cc @@ -35,8 +35,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc index 966dbcbb98..ce3c796e20 100644 --- a/tests/matrix_free/get_functions_q_hierarchical.cc +++ b/tests/matrix_free/get_functions_q_hierarchical.cc @@ -94,8 +94,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc index d94d3da6f4..e31f4a5a79 100644 --- a/tests/matrix_free/get_functions_rect.cc +++ b/tests/matrix_free/get_functions_rect.cc @@ -56,8 +56,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index a609d8b4c9..3cb6681f43 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -143,9 +143,9 @@ void test () { Triangulation tria; GridGenerator::hyper_shell (tria, Point(), 1., 2., 96, true); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); - tria.set_manifold (1, boundary); + static const HyperShellBoundary boundary; + tria.set_boundary (0, boundary); + tria.set_boundary (1, boundary); // refine a few cells for (unsigned int i=0; i<11-3*dim; ++i) diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index 8c6d4d4ca8..f42acc2e60 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -148,8 +148,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index 15825a2719..bef0320048 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -229,8 +229,8 @@ void test () // cells Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/matrix_vector_04.cc b/tests/matrix_free/matrix_vector_04.cc index 0fdc5a1e62..36b71b3aaa 100644 --- a/tests/matrix_free/matrix_vector_04.cc +++ b/tests/matrix_free/matrix_vector_04.cc @@ -34,9 +34,9 @@ void test () Triangulation tria; GridGenerator::hyper_shell (tria, Point(), 0.5, 1., 96, true); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); - tria.set_manifold (1, boundary); + static const HyperShellBoundary boundary; + tria.set_boundary (0, boundary); + tria.set_boundary (1, boundary); if (dim == 2) tria.refine_global (2); diff --git a/tests/matrix_free/matrix_vector_07.cc b/tests/matrix_free/matrix_vector_07.cc index 20bd36a4bd..663b35ff98 100644 --- a/tests/matrix_free/matrix_vector_07.cc +++ b/tests/matrix_free/matrix_vector_07.cc @@ -38,8 +38,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index fcf698e2a9..773ae0fc43 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -34,7 +34,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -107,8 +107,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); tria.refine_global(4-dim); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index 57cf11f324..b359397e68 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -99,8 +99,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); tria.refine_global(1); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index b2ac2de754..4eb2670a22 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -37,8 +37,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); tria.refine_global(5-dim); FE_Q fe (fe_degree); diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index f1549d7065..1860f6797e 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -34,7 +34,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -125,9 +125,9 @@ void test () Triangulation triangulation; GridGenerator::hyper_shell (triangulation, Point(), 0.5, 1., 96, true); - static PolarManifold boundary; - triangulation.set_manifold (0, boundary); - triangulation.set_manifold (1, boundary); + static HyperShellBoundary boundary; + triangulation.set_boundary (0, boundary); + triangulation.set_boundary (1, boundary); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index df4b5d7449..2c29799abb 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -32,7 +32,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -174,8 +174,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/quadrature_points.cc b/tests/matrix_free/quadrature_points.cc index 245b651716..206b90ef73 100644 --- a/tests/matrix_free/quadrature_points.cc +++ b/tests/matrix_free/quadrature_points.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,8 +48,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const PolarManifold boundary; - tria.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + tria.set_boundary (0, boundary); tria.refine_global(5-dim); MappingQ mapping (4); diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index a90a20f392..95d256af9e 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -463,8 +463,8 @@ namespace Step50 { GridGenerator::hyper_cube (triangulation); - // static const PolarManifold boundary; - // triangulation.set_manifold (0, boundary); + // static const HyperBallBoundary boundary; + // triangulation.set_boundary (0, boundary); triangulation.refine_global (2); } diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc index 4181eddc8e..50af594234 100644 --- a/tests/mpi/multigrid_uniform.cc +++ b/tests/mpi/multigrid_uniform.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -456,8 +456,8 @@ namespace Step50 { GridGenerator::hyper_cube (triangulation); - // static const PolarManifold boundary; - // triangulation.set_manifold (0, boundary); + // static const HyperBallBoundary boundary; + // triangulation.set_boundary (0, boundary); triangulation.refine_global (3); } diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index f8b89ecd21..420c802021 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -111,9 +111,9 @@ void test() R1, 12, true); - static PolarManifold boundary; - tr.set_manifold (0, boundary); - tr.set_manifold (1, boundary); + static HyperShellBoundary boundary; + tr.set_boundary (0, boundary); + tr.set_boundary (1, boundary); tr.refine_global (1); for (unsigned int step=0; step<20; ++step) @@ -218,8 +218,8 @@ void test() cat_file((std::string("dat.") + Utilities::int_to_string(0)).c_str()); } - tr.set_manifold (0); - tr.set_manifold (1); + tr.set_boundary (0); + tr.set_boundary (1); } diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index e3690d78c7..ccbd947518 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -147,9 +147,9 @@ void test() R1, 12, true); - static PolarManifold boundary; -// tr.set_manifold (0, boundary); -// tr.set_manifold (1, boundary); + static HyperShellBoundary boundary; +// tr.set_boundary (0, boundary); +// tr.set_boundary (1, boundary); tr.refine_global (3); if (1) @@ -311,8 +311,8 @@ void test() std::ofstream output (filename.c_str()); data_out.write_deal_II_intermediate (output); - tr.set_manifold (0); - tr.set_manifold (1); + tr.set_boundary (0); + tr.set_boundary (1); if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) deallog << "OK" << std::endl; } diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index a07fef6923..c0b1b41b55 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -146,9 +146,9 @@ void test() R1, 12, true); - static PolarManifold boundary; -// tr.set_manifold (0, boundary); -//tr.set_manifold (1, boundary); + static HyperShellBoundary boundary; +// tr.set_boundary (0, boundary); +//tr.set_boundary (1, boundary); tr.refine_global (1); if (1) @@ -306,8 +306,8 @@ void test() std::ofstream output (filename.c_str()); data_out.write_vtu (output); - tr.set_manifold (0); - tr.set_manifold (1); + tr.set_boundary (0); + tr.set_boundary (1); if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) deallog << "OK" << std::endl; diff --git a/tests/multigrid/step-16-02.cc b/tests/multigrid/step-16-02.cc index 3d69e4cf3b..60e181bcf9 100644 --- a/tests/multigrid/step-16-02.cc +++ b/tests/multigrid/step-16-02.cc @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include @@ -567,8 +567,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_cube (triangulation, -1, 1); -// static const PolarManifold boundary; -// triangulation.set_manifold (0, boundary); +// static const HyperBallBoundary boundary; +// triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } diff --git a/tests/multigrid/step-16.cc b/tests/multigrid/step-16.cc index 1e5dcad9e8..ab5c4b41db 100644 --- a/tests/multigrid/step-16.cc +++ b/tests/multigrid/step-16.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -561,8 +561,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const PolarManifold boundary; - triangulation.set_manifold (0, boundary); + static const HyperBallBoundary boundary; + triangulation.set_boundary (0, boundary); triangulation.refine_global (1); } -- 2.39.5