From df22186f87b1e47ec9f90054b761754622186941 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 22 Sep 2016 13:50:48 +0000 Subject: [PATCH] Implemented Praveen fix. --- include/deal.II/grid/manifold_lib.h | 4 +- source/grid/manifold_lib.cc | 12 +- tests/codim_one/mapping_fe_field_01.output | 235056 +++++++-------- tests/grid/grid_generator_hyper_sphere.output | 2956 +- tests/manifold/spherical_manifold_01.output | 6 +- tests/manifold/spherical_manifold_02.output | 28 +- 6 files changed, 119033 insertions(+), 119029 deletions(-) diff --git a/include/deal.II/grid/manifold_lib.h b/include/deal.II/grid/manifold_lib.h index eb25ca1040..f63734c176 100644 --- a/include/deal.II/grid/manifold_lib.h +++ b/include/deal.II/grid/manifold_lib.h @@ -234,8 +234,8 @@ public: */ virtual Point - project_to_manifold (const std::vector > &vertices, - const Point &candidate) const; + get_new_point (const std::vector > &vertices, + const std::vector &weights) const; /** * The center of the spherical coordinate system. diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index e278616f97..a45001c39c 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -264,13 +264,17 @@ get_tangent_vector (const Point &p1, template Point SphericalManifold:: -project_to_manifold (const std::vector > &vertices, - const Point &candidate) const +get_new_point (const std::vector > &vertices, + const std::vector &weights) const { double rho = 0.0; + Point candidate; for (unsigned int i = 0; i