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

diff --git a/deal.II/include/deal.II/grid/manifold.h b/deal.II/include/deal.II/grid/manifold.h
index 6fd5b7ccebc16be1a3ab3b411d1b4630fc94d112..357b6bd5608e58df241b3a2788d01ee942eb08d6 100644 (file)
--- 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<spacedim>
   get_new_point(const std::vector<Point<spacedim> > &surrounding_points,
-      const std::vector<double> &weights) const = 0;
+               const std::vector<double> &weights) const = 0;
 
   /**
    * Return equally spaced intermediate points between the given
@@ -109,8 +109,8 @@ public:
    */
   virtual
   void
-  get_intermediate_points(std::vector<Point<spacedim> > &points,
-                         const std::vector<Point<spacedim> > &surrounding_points) const;
+  get_intermediate_points(const std::vector<Point<spacedim> > &surrounding_points,
+                         std::vector<Point<spacedim> > &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<Point<spacedim> > &normals,
-                              const std::vector<Point<spacedim> > &points) const;
+    void get_normals_at_points(const std::vector<Point<spacedim> > &points,
+                              std::vector<Point<spacedim> > &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 1dd66f8eec210d4a8195406882f9fd5fe8a38466..6c1fc8ee08a6437e19b418ffbe9604e3b4703a71 100644 (file)
--- 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<Point<spacedim> > &normals,
-                              const std::vector<Point<spacedim> > &points) const;
+    void get_normals_at_points(const std::vector<Point<spacedim> > &points,
+                              std::vector<Point<spacedim> > &normals) const;
     
     
 };

diff --git a/deal.II/source/fe/mapping_q.cc b/deal.II/source/fe/mapping_q.cc
index 13d5183a1ca4da0aa8d1d4cf60986049a7ca9c42..726a2bbcc151419d49a4a6a7109ad3136c8c9fae 100644 (file)
--- a/deal.II/source/fe/mapping_q.cc
+++ b/deal.II/source/fe/mapping_q.cc
@@ -789,7 +789,7 @@ MappingQ<dim,spacedim>::add_line_support_points (const typename Triangulation<di
          ps[0] = line->vertex(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<quad_points.size(); ++i)
     a.push_back(quad_points[i]);
 }

diff --git a/deal.II/source/grid/manifold.cc b/deal.II/source/grid/manifold.cc
index 01bc5a34f2004aacf3051182d2e5aebe502a3a30..bfc8bf0ae8c8d7afc680dfc8e85903a682563e2c 100644 (file)
--- a/deal.II/source/grid/manifold.cc
+++ b/deal.II/source/grid/manifold.cc
@@ -42,8 +42,8 @@ Manifold<spacedim>::project_to_manifold (const Point<spacedim> &candidate) const
 
 template <int spacedim>
 void
-Manifold<spacedim>::get_normals_at_points(std::vector<Point<spacedim> > &normals,
-                                         const std::vector<Point<spacedim> > &points) const
+Manifold<spacedim>::get_normals_at_points(const std::vector<Point<spacedim> > &points,
+                                         std::vector<Point<spacedim> > &normals) const
 {
   AssertDimension(normals.size(), points.size());
   for(unsigned int i=0; i<normals.size(); ++i)
@@ -60,8 +60,8 @@ Manifold<spacedim>::normal_vector(const Point<spacedim> &point) const
 
 template <int spacedim>
 void
-Manifold<spacedim>::get_intermediate_points(std::vector<Point<spacedim> > &points,
-                                           const std::vector<Point<spacedim> > &surrounding_points) const
+Manifold<spacedim>::get_intermediate_points(const std::vector<Point<spacedim> > &surrounding_points,
+                                           std::vector<Point<spacedim> > &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 f363e7c15fd974e51b75233aee08852b1f2dc235..f8c619bdee6d12bb4679c2ead3bbd6c4b10d34d6 100644 (file)
--- a/deal.II/source/grid/tria.cc
+++ b/deal.II/source/grid/tria.cc
@@ -132,16 +132,6 @@ namespace {
 }
 
 
-// template<int dim>
-// CellData<dim>::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 d0668604142f2828ffc431807ca34e2084da35e4..e220300f6226e011c5082c59febd6a4ca3ee7645 100644 (file)
--- a/deal.II/source/grid/tria_boundary.cc
+++ b/deal.II/source/grid/tria_boundary.cc
@@ -34,8 +34,8 @@ StraightBoundary<dim, spacedim>::StraightBoundary ()
 
 template <int dim, int spacedim>
 void
-StraightBoundary<dim, spacedim>::get_normals_at_points(std::vector<Point<spacedim> > &normals,
-                                                      const std::vector<Point<spacedim> > &points) const
+StraightBoundary<dim, spacedim>::get_normals_at_points(const std::vector<Point<spacedim> > &points,
+                                                      std::vector<Point<spacedim> > &normals) const
 {
   AssertDimension(normals.size(), points.size());
   switch(dim)