From 25d094a2de0bcef2c9830e194309335655a996c8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 2 Sep 2014 10:12:40 +0200 Subject: [PATCH] Cleanup stray merge conflict --- examples/step-53/step-53.cc | 64 ++++++------------------------------- 1 file changed, 9 insertions(+), 55 deletions(-) diff --git a/examples/step-53/step-53.cc b/examples/step-53/step-53.cc index 24d960ddea..9e381b74af 100644 --- a/examples/step-53/step-53.cc +++ b/examples/step-53/step-53.cc @@ -83,8 +83,8 @@ namespace Step53 private: const Functions::InterpolatedUniformGridData<2> topography_data; - static std_cxx1x::array,2> get_endpoints (); - static std_cxx1x::array n_intervals (); + static std_cxx11::array,2> get_endpoints (); + static std_cxx11::array n_intervals (); static std::vector get_data (); }; @@ -124,20 +124,20 @@ namespace Step53 } - std_cxx1x::array,2> + std_cxx11::array,2> AfricaTopography::get_endpoints () { - std_cxx1x::array,2> endpoints; + std_cxx11::array,2> endpoints; endpoints[0] = std::make_pair (-6.983333, 11.966667); endpoints[1] = std::make_pair (25, 35.95); return endpoints; } - std_cxx1x::array + std_cxx11::array AfricaTopography::n_intervals () { - std_cxx1x::array endpoints; + std_cxx11::array endpoints; endpoints[0] = 379; endpoints[1] = 219; return endpoints; @@ -329,52 +329,6 @@ namespace Step53 return phi_theta_d_hat; } - return result; -} - - - - -template -Point -SphereGeometry:: -get_new_point_on_line (const typename Triangulation::line_iterator &line) const -{ - std_cxx1x::array preimages[2] = { pull_back (line->vertex(0)), - pull_back (line->vertex(1)) - }; - - return push_forward(average (preimages)); -} - - -template -Point -SphereGeometry:: -get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const -{ - std_cxx11::array preimages[4] = { pull_back (quad->vertex(0)), - pull_back (quad->vertex(1)), - pull_back (quad->vertex(2)), - pull_back (quad->vertex(3)) - }; - - return push_forward(average(preimages)); -} - - - - -template -void make_grid () -{ - Point center; - for (unsigned int i=0; i>>>>>> Replace the original attempt at providing step-53 by something real. - // @sect3{Creating the mesh} // @@ -424,9 +378,9 @@ void make_grid () corner_points[0], corner_points[1], true); - GridTools::transform (std_cxx1x::bind(&AfricaGeometry::push_forward, - std_cxx1x::cref(geometry), - std_cxx1x::_1), + GridTools::transform (std_cxx11::bind(&AfricaGeometry::push_forward, + std_cxx11::cref(geometry), + std_cxx11::_1), triangulation); } -- 2.39.5