From: Martin Kronbichler Date: Sat, 3 Jun 2017 14:50:39 +0000 (+0200) Subject: Use cheap guess in transfinite manifold X-Git-Tag: v9.0.0-rc1~1529^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf7dd26fe6bb7fda9087b27759a152b36f483f72;p=dealii.git Use cheap guess in transfinite manifold --- diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index 1de6dbb333..d26223025b 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -855,17 +855,9 @@ TransfiniteInterpolationManifold for (unsigned int d=0; d chart_point; - try - { - chart_point = GeometryInfo::project_to_unit_cell(StaticMappingQ1::mapping.transform_real_to_unit_cell(cell, point)); - } - catch (typename Mapping::ExcTransformationFailed) - { - for (unsigned int d=0; d chart_point = + GeometryInfo::project_to_unit_cell(cell->real_to_unit_cell_affine_approximation(point)); // run Newton iteration. As opposed to the various mapping implementations, // this class does not throw exception upon failure as those are relatively @@ -935,9 +927,7 @@ TransfiniteInterpolationManifold // cell from the unit cell. typename Triangulation::cell_iterator cell = triangulation->begin(level_coarse), - endc = triangulation->end(level_coarse), - best_fit = cell; - const double circle_gap = 1.3; + endc = triangulation->end(level_coarse); std::vector > distances_and_cells; for ( ; cell != endc; ++cell) { @@ -957,7 +947,7 @@ TransfiniteInterpolationManifold radius_square = std::max(radius_square, (center-cell->vertex(v)).norm_square()); bool inside_circle = true; for (unsigned int i=0; i radius_square*circle_gap) + if ((center-points[i]).norm_square() > radius_square * 1.5) { inside_circle = false; break; @@ -965,22 +955,14 @@ TransfiniteInterpolationManifold if (inside_circle == false) continue; - // expensive search - try - { - double current_distance = 0; - for (unsigned int i=0; i point = StaticMappingQ1::mapping.transform_real_to_unit_cell(cell, points[i]); - current_distance += GeometryInfo::distance_to_unit_cell(point); - } - distances_and_cells.emplace_back(current_distance, cell->index()); - } - catch (typename Mapping::ExcTransformationFailed &) + // slightly more expensive search + double current_distance = 0; + for (unsigned int i=0; iindex()); + Point point = cell->real_to_unit_cell_affine_approximation(points[i]); + current_distance += GeometryInfo::distance_to_unit_cell(point); } + distances_and_cells.emplace_back(current_distance, cell->index()); } // no coarse cell could be found -> transformation failed AssertThrow(distances_and_cells.size() > 0,