[cig-commits] [commit] master: run astyle (242ddc2)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8315f89cacc5b399f37704e2ec631aedd167e137...f6886e487ad093a7261b0437a3ebe6fe303b1665

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

commit 242ddc2d992870572f897e6c280fb8fe9cbd3b4d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 13 15:17:25 2014 -0400

    run astyle


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

242ddc2d992870572f897e6c280fb8fe9cbd3b4d
 include/aspect/gravity_model/radial.h              |  0
 source/gravity_model/radial.cc                     | 12 ++++++------
 source/initial_conditions/harmonic_perturbation.cc | 12 ++++++------
 source/simulator/nullspace.cc                      |  6 +++---
 source/termination_criteria/end_time.cc            |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/gravity_model/radial.cc b/source/gravity_model/radial.cc
index 2430966..2939a89 100644
--- a/source/gravity_model/radial.cc
+++ b/source/gravity_model/radial.cc
@@ -91,11 +91,11 @@ namespace aspect
     RadialLinear<dim>::gravity_vector (const Point<dim> &p) const
     {
       if (p.norm() == 0.0)
-	return Tensor<1,dim>();
+        return Tensor<1,dim>();
 
       const double depth = this->get_geometry_model().depth(p);
       return  (-magnitude_at_surface * p/p.norm() *
-	       (1.0 - depth/this->get_geometry_model().maximal_depth()));
+               (1.0 - depth/this->get_geometry_model().maximal_depth()));
     }
 
 
@@ -159,10 +159,10 @@ namespace aspect
                                   "radial linear",
                                   "A gravity model which is radially inward, where the magnitude"
                                   "decreases linearly with depth down to zero at the maximal depth "
-				  "the geometry returns, as you would get with a constant"
+                                  "the geometry returns, as you would get with a constant"
                                   "density spherical domain. (Note that this would be for a full "
-				  "sphere, not a spherical shell.) The magnitude of gravity at the "
-				  "surface is read from the input file in a section "
-				  "``Gravity model/Radial linear''.")
+                                  "sphere, not a spherical shell.) The magnitude of gravity at the "
+                                  "surface is read from the input file in a section "
+                                  "``Gravity model/Radial linear''.")
   }
 }
diff --git a/source/initial_conditions/harmonic_perturbation.cc b/source/initial_conditions/harmonic_perturbation.cc
index 3027ee0..b213a4d 100644
--- a/source/initial_conditions/harmonic_perturbation.cc
+++ b/source/initial_conditions/harmonic_perturbation.cc
@@ -30,12 +30,12 @@ namespace aspect
 {
   namespace InitialConditions
   {
-      // NOTE: this module uses the Boost spherical harmonics package which is not designed
-      // for very high order (> 100) spherical harmonics computation. If you use harmonic
-      // perturbations of a high order be sure to confirm the accuracy first.
-      // For more information, see:
-      // http://www.boost.org/doc/libs/1_49_0/libs/math/doc/sf_and_dist/html/math_toolkit/special/sf_poly/sph_harm.html
-      //
+    // NOTE: this module uses the Boost spherical harmonics package which is not designed
+    // for very high order (> 100) spherical harmonics computation. If you use harmonic
+    // perturbations of a high order be sure to confirm the accuracy first.
+    // For more information, see:
+    // http://www.boost.org/doc/libs/1_49_0/libs/math/doc/sf_and_dist/html/math_toolkit/special/sf_poly/sph_harm.html
+    //
     template <int dim>
     double
     HarmonicPerturbation<dim>::
diff --git a/source/simulator/nullspace.cc b/source/simulator/nullspace.cc
index 6fcd49d..122a145 100644
--- a/source/simulator/nullspace.cc
+++ b/source/simulator/nullspace.cc
@@ -144,7 +144,7 @@ namespace aspect
 
   template <int dim>
   void Simulator<dim>::remove_nullspace(LinearAlgebra::BlockVector &relevant_dst,
-					LinearAlgebra::BlockVector &tmp_distributed_stokes)
+                                        LinearAlgebra::BlockVector &tmp_distributed_stokes)
   {
     if (parameters.nullspace_removal & NullspaceRemoval::net_rotation ||
         parameters.nullspace_removal & NullspaceRemoval::net_translation)
@@ -209,9 +209,9 @@ namespace aspect
 
           // get the density at each quadrature point
           MaterialModel::Interface<dim>::MaterialModelInputs in(q_points.size(),
-								parameters.n_compositional_fields);
+                                                                parameters.n_compositional_fields);
           MaterialModel::Interface<dim>::MaterialModelOutputs out(q_points.size(),
-								  parameters.n_compositional_fields);
+                                                                  parameters.n_compositional_fields);
           for (unsigned int i=0; i< q_points.size(); i++)
             {
               in.pressure[i] = fe_vals[i][dim];
diff --git a/source/termination_criteria/end_time.cc b/source/termination_criteria/end_time.cc
index 8ecbb4d..13ba4f1 100644
--- a/source/termination_criteria/end_time.cc
+++ b/source/termination_criteria/end_time.cc
@@ -50,8 +50,8 @@ namespace aspect
     EndTime<dim>::declare_parameters (ParameterHandler &prm)
     {
       prm.declare_entry ("End time",
-                        /* boost::lexical_cast<std::string>(std::numeric_limits<double>::max() /
-                                             year_in_seconds) = */ "5.69e+300",
+                         /* boost::lexical_cast<std::string>(std::numeric_limits<double>::max() /
+                                              year_in_seconds) = */ "5.69e+300",
                          Patterns::Double (),
                          "The end time of the simulation. The default value is a number "
                          "so that when converted from years to seconds it is approximately "