[cig-commits] [commit] master: Simplify some code. More style fixes. (c2eecea)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2f27335d4a52efc6ce31351c2a47422171411114...47f27df84eb33170e6ea9a3937e3adc652a9f3f0

>---------------------------------------------------------------

commit c2eecea10f131050b3f643a89635692b80aa3df3
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Thu May 15 10:26:38 2014 -0500

    Simplify some code. More style fixes.


>---------------------------------------------------------------

c2eecea10f131050b3f643a89635692b80aa3df3
 include/aspect/velocity_boundary_conditions/gplates.h |  9 ++++++---
 source/velocity_boundary_conditions/gplates.cc        | 17 ++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/aspect/velocity_boundary_conditions/gplates.h b/include/aspect/velocity_boundary_conditions/gplates.h
index 4f2222b..2126ee7 100644
--- a/include/aspect/velocity_boundary_conditions/gplates.h
+++ b/include/aspect/velocity_boundary_conditions/gplates.h
@@ -135,7 +135,9 @@ namespace aspect
            * defined angle
            */
           Tensor<1,3>
-          rotate (const Tensor<1,3> &position,const Tensor<1,3> &rotation_axis, const double angle) const;
+          rotate (const Tensor<1,3> &position,
+                  const Tensor<1,3> &rotation_axis,
+                  const double angle) const;
 
           /**
            * Convert a tensor of rank 1 and dimension in to rank 1 and
@@ -143,7 +145,7 @@ namespace aspect
            * if $out > in$ zeroes will be appended to fill the tensor.
            */
           template <int in, int out>
-          Tensor<1,out> convert_tensor (Tensor<1,in> old_tensor) const;
+          Tensor<1,out> convert_tensor (const Tensor<1,in> &old_tensor) const;
 
           /**
            * Returns spherical coordinates of a cartesian position.
@@ -178,7 +180,8 @@ namespace aspect
            * index
            */
           void
-          calculate_spatial_index(int *index, const Tensor<1,3> position) const;
+          calculate_spatial_index(int *index,
+                                  const Tensor<1,3> &position) const;
 
           /**
            * This function adds a certain data point to the interpolated
diff --git a/source/velocity_boundary_conditions/gplates.cc b/source/velocity_boundary_conditions/gplates.cc
index 4d1e028..62b62ac 100644
--- a/source/velocity_boundary_conditions/gplates.cc
+++ b/source/velocity_boundary_conditions/gplates.cc
@@ -199,19 +199,17 @@ namespace aspect
 
       template <int dim>
       Tensor<1,dim>
-      GPlatesLookup::surface_velocity(const Point<dim> &position_, const double time_weight) const
+      GPlatesLookup::surface_velocity(const Point<dim> &position,
+                                      const double time_weight) const
       {
-        Tensor<1,dim> tensor_position;
-        for (unsigned int i = 0 ; i < dim; i++) tensor_position[i] = position_[i];
-
         Tensor<1,3> internal_position;
         if (dim == 2)
-          internal_position = rotate(convert_tensor<dim,3>(tensor_position),rotation_axis,rotation_angle);
+          internal_position = rotate(convert_tensor<dim,3>(position),rotation_axis,rotation_angle);
         else
-          internal_position = convert_tensor<dim,3>(tensor_position);
+          internal_position = convert_tensor<dim,3>(position);
 
         // Main work, interpolate velocity at this point
-        const Tensor<1,3> interpolated_velocity = interpolate(internal_position,time_weight);
+        const Tensor<1,3> interpolated_velocity = interpolate(internal_position, time_weight);
 
         Tensor<1,dim> output_boundary_velocity;
 
@@ -465,7 +463,7 @@ namespace aspect
 
       template <int in, int out>
       Tensor<1,out>
-      GPlatesLookup::convert_tensor (Tensor<1,in> old_tensor) const
+      GPlatesLookup::convert_tensor (const Tensor<1,in> &old_tensor) const
       {
         Tensor<1,out> new_tensor;
         for (unsigned int i = 0; i < out; i++)
@@ -476,7 +474,8 @@ namespace aspect
       }
 
       void
-      GPlatesLookup::calculate_spatial_index(int *index, const Tensor<1,3> position) const
+      GPlatesLookup::calculate_spatial_index(int *index,
+                                             const Tensor<1,3> &position) const
       {
         const Tensor<1,3> scoord = spherical_surface_coordinates(position);
         index[0] = lround(scoord[0]/delta_theta);