From 800b9f6b8f09519ed4caeb505f83afd94863ec44 Mon Sep 17 00:00:00 2001 From: heltai Date: Fri, 17 Jan 2014 18:05:02 +0000 Subject: [PATCH] Fixed interfaces to adhere to deal.II coding convention. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32236 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/grid/manifold.h | 10 +++++----- deal.II/include/deal.II/grid/tria_boundary.h | 4 ++-- deal.II/source/fe/mapping_q.cc | 8 ++++---- deal.II/source/grid/manifold.cc | 8 ++++---- deal.II/source/grid/tria.cc | 10 ---------- deal.II/source/grid/tria_boundary.cc | 4 ++-- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/deal.II/include/deal.II/grid/manifold.h b/deal.II/include/deal.II/grid/manifold.h index 6fd5b7cceb..357b6bd560 100644 --- a/deal.II/include/deal.II/grid/manifold.h +++ b/deal.II/include/deal.II/grid/manifold.h @@ -82,7 +82,7 @@ public: virtual Point get_new_point(const std::vector > &surrounding_points, - const std::vector &weights) const = 0; + const std::vector &weights) const = 0; /** * Return equally spaced intermediate points between the given @@ -109,8 +109,8 @@ public: */ virtual void - get_intermediate_points(std::vector > &points, - const std::vector > &surrounding_points) const; + get_intermediate_points(const std::vector > &surrounding_points, + std::vector > &points) const; /** * Given a point which lies close to the given manifold, it modifies @@ -136,8 +136,8 @@ public: * normal_vector. Derived classes can overload that function. */ virtual - void get_normals_at_points(std::vector > &normals, - const std::vector > &points) const; + void get_normals_at_points(const std::vector > &points, + std::vector > &normals) const; /** * Compute the normal to the manifold at the given point. The diff --git a/deal.II/include/deal.II/grid/tria_boundary.h b/deal.II/include/deal.II/grid/tria_boundary.h index 1dd66f8eec..6c1fc8ee08 100644 --- a/deal.II/include/deal.II/grid/tria_boundary.h +++ b/deal.II/include/deal.II/grid/tria_boundary.h @@ -153,8 +153,8 @@ public: * those points. Input arguments must be of the same size. */ virtual - void get_normals_at_points(std::vector > &normals, - const std::vector > &points) const; + void get_normals_at_points(const std::vector > &points, + std::vector > &normals) const; }; diff --git a/deal.II/source/fe/mapping_q.cc b/deal.II/source/fe/mapping_q.cc index 13d5183a1c..726a2bbcc1 100644 --- a/deal.II/source/fe/mapping_q.cc +++ b/deal.II/source/fe/mapping_q.cc @@ -789,7 +789,7 @@ MappingQ::add_line_support_points (const typename Triangulationvertex(0); ps[1] = line->vertex(1); - line->get_manifold().get_intermediate_points (line_points, ps); + line->get_manifold().get_intermediate_points (ps, line_points); if (dim==3) { @@ -868,7 +868,7 @@ add_quad_support_points(const Triangulation<3>::cell_iterator &cell, vertices.resize(4); for(unsigned int i=0;i<4; ++i) vertices[i] = face->vertex(i); - face->get_manifold().get_intermediate_points(quad_points, vertices); + face->get_manifold().get_intermediate_points(vertices, quad_points); // in 3D, the orientation, flip and rotation of the face might not // match what we expect here, namely the standard orientation. thus // reorder points accordingly. since a Mapping uses the same shape @@ -932,7 +932,7 @@ add_quad_support_points(const Triangulation<3>::cell_iterator &cell, vertices.resize(4); for(unsigned int i=0;i<4; ++i) vertices[i] = face->vertex(i); - face->get_manifold().get_intermediate_points (quad_points, vertices); + face->get_manifold().get_intermediate_points (vertices, quad_points); // in 3D, the orientation, flip and rotation of the face might // not match what we expect here, namely the standard // orientation. thus reorder points accordingly. since a Mapping @@ -961,7 +961,7 @@ add_quad_support_points(const Triangulation<2,3>::cell_iterator &cell, for(unsigned int i=0; i<4; ++i) vertices[i] = cell->vertex(i); - cell->get_manifold().get_intermediate_points (quad_points, vertices); + cell->get_manifold().get_intermediate_points (vertices, quad_points); for (unsigned int i=0; i::project_to_manifold (const Point &candidate) const template void -Manifold::get_normals_at_points(std::vector > &normals, - const std::vector > &points) const +Manifold::get_normals_at_points(const std::vector > &points, + std::vector > &normals) const { AssertDimension(normals.size(), points.size()); for(unsigned int i=0; i::normal_vector(const Point &point) const template void -Manifold::get_intermediate_points(std::vector > &points, - const std::vector > &surrounding_points) const +Manifold::get_intermediate_points(const std::vector > &surrounding_points, + std::vector > &points) const { Assert(surrounding_points.size() >= 2, ExcMessage("At least 2 surrounding points are required")); const unsigned int n=points.size(); diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index f363e7c15f..f8c619bdee 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -132,16 +132,6 @@ namespace { } -// template -// CellData::CellData() -// { -// // Set the face to be interior -// boundary_id = numbers::internal_face_boundary_id; -// // And the manifold to be invalid -// manifold_id = numbers::invalid_manifold_id; -// } - - bool SubCellData::check_consistency (const unsigned int dim) const { diff --git a/deal.II/source/grid/tria_boundary.cc b/deal.II/source/grid/tria_boundary.cc index d066860414..e220300f62 100644 --- a/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/source/grid/tria_boundary.cc @@ -34,8 +34,8 @@ StraightBoundary::StraightBoundary () template void -StraightBoundary::get_normals_at_points(std::vector > &normals, - const std::vector > &points) const +StraightBoundary::get_normals_at_points(const std::vector > &points, + std::vector > &normals) const { AssertDimension(normals.size(), points.size()); switch(dim) -- 2.39.5