[cig-commits] [commit] master: Reindent. (c14feaf)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/3811725812cafa918bbabc2515f52af7857aad31...9a8086507e7ed22ed2a4d13771930e4ae6bc3a7d

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

commit c14feafee001237d8feb7212bdc878c96107f833
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Thu Jul 24 16:48:24 2014 -0500

    Reindent.


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

c14feafee001237d8feb7212bdc878c96107f833
 include/aspect/geometry_model/spherical_shell.h    |  6 ++---
 .../aspect/initial_conditions/spherical_shell.h    | 30 ++++++++++------------
 source/geometry_model/spherical_shell.cc           | 10 ++++----
 source/initial_conditions/spherical_shell.cc       |  8 +++---
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/include/aspect/geometry_model/spherical_shell.h b/include/aspect/geometry_model/spherical_shell.h
index c4af9c7..79177de 100644
--- a/include/aspect/geometry_model/spherical_shell.h
+++ b/include/aspect/geometry_model/spherical_shell.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2011, 2012 by the authors of the ASPECT code.
+  Copyright (C) 2011, 2012, 2014 by the authors of the ASPECT code.
 
   This file is part of ASPECT.
 
@@ -69,6 +69,7 @@ namespace aspect
 
         virtual
         double maximal_depth() const;
+
         /**
          * Return the set of boundary indicators that are used by this model.
          * This information is used to determine what boundary indicators can
@@ -136,8 +137,7 @@ namespace aspect
         /**
          * Number of tangential mesh cells in the initial, coarse mesh.
          */
-         int n_cells_along_circumference;
-
+        int n_cells_along_circumference;
     };
   }
 }
diff --git a/include/aspect/initial_conditions/spherical_shell.h b/include/aspect/initial_conditions/spherical_shell.h
index 1ef8e8c..7a6493d 100644
--- a/include/aspect/initial_conditions/spherical_shell.h
+++ b/include/aspect/initial_conditions/spherical_shell.h
@@ -48,9 +48,9 @@ namespace aspect
         virtual
         double initial_temperature (const Point<dim> &position) const;
 
-         /**
-         * Declare the parameters this class takes through input files.
-         */
+        /**
+	 * Declare the parameters this class takes through input files.
+	 */
         static
         void
         declare_parameters (ParameterHandler &prm);
@@ -63,21 +63,19 @@ namespace aspect
         parse_parameters (ParameterHandler &prm);
 
       private:
-         /**
-         *   The angular mode is the number of perturbations to
-         *   apply to the spherical shell. Historically, this was
-         *   permanently set to 6 (hence the class name SphericalHexagonalPerturbation)
-         *   The default is 6 in order to provide backwards compatibility.
-         *   
-         *   The rotation offset describes the number of degrees to rotate the perturbation
-         *   counterclockwise. Setting the rotation offset to 0 will cause one of the perturbations
-         *   to point north/up. Rotation offset is set to -45 degrees by default in order to provide
-         *   backwards compatibility.
-         **/ 
-       
+        /**
+	 *   The angular mode is the number of perturbations to
+	 *   apply to the spherical shell. Historically, this was
+	 *   permanently set to 6 (hence the class name SphericalHexagonalPerturbation)
+	 *   The default is 6 in order to provide backwards compatibility.
+	 *
+	 *   The rotation offset describes the number of degrees to rotate the perturbation
+	 *   counterclockwise. Setting the rotation offset to 0 will cause one of the perturbations
+	 *   to point north/up. Rotation offset is set to -45 degrees by default in order to provide
+	 *   backwards compatibility.
+	 */
         int angular_mode;
         double rotation_offset;
-  
     };
 
 
diff --git a/source/geometry_model/spherical_shell.cc b/source/geometry_model/spherical_shell.cc
index d5c1911..c37cee7 100644
--- a/source/geometry_model/spherical_shell.cc
+++ b/source/geometry_model/spherical_shell.cc
@@ -188,11 +188,11 @@ namespace aspect
                              "that we want to build. Units: degrees.");
 
           prm.declare_entry ("Cells along circumference", "12",
-			     Patterns::Integer (),
-			     "The number of cells in circumferential direction that are "
-			     "created in the coarse mesh in 2d. In 3d, the number of "
-			     "cells is computed differently and does not have an "
-			     "easy interpretation. It is best left at its default in 3d.");
+                             Patterns::Integer (),
+                             "The number of cells in circumferential direction that are "
+                             "created in the coarse mesh in 2d. In 3d, the number of "
+                             "cells is computed differently and does not have an "
+                             "easy interpretation. It is best left at its default in 3d.");
         }
         prm.leave_subsection();
       }
diff --git a/source/initial_conditions/spherical_shell.cc b/source/initial_conditions/spherical_shell.cc
index 4ff84de..657f001 100644
--- a/source/initial_conditions/spherical_shell.cc
+++ b/source/initial_conditions/spherical_shell.cc
@@ -179,10 +179,10 @@ namespace aspect
         {
 
           prm.declare_entry ("Angular mode", "6",
-                              Patterns::Integer (),
-                              "The number of convection cells to perturb the system with.");   
+                             Patterns::Integer (),
+                             "The number of convection cells to perturb the system with.");
 
-         prm.declare_entry  ("Rotation offset", "-45",
+          prm.declare_entry  ("Rotation offset", "-45",
                               Patterns::Double (),
                               "Amount of clockwise rotation in degrees to apply to "
                               "the perturbations. Default is set to -45 in order "
@@ -193,7 +193,7 @@ namespace aspect
       prm.leave_subsection ();
     }
 
-   template <int dim>
+    template <int dim>
     void
     SphericalHexagonalPerturbation<dim>::parse_parameters (ParameterHandler &prm)
     {