[cig-commits] [commit] master: run astyle (08ddb01)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6aa7541c733b8fd1cc1b0c74536c8804aaeb7015...fa9e02e17c95bc1a8c6b635f193e536888750f41

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

commit 08ddb01c941ad073eb3d22463aa13ecb7b10c0e4
Author: Juliane Dannberg <dannberg at gfz-potsdam.de>
Date:   Tue May 20 17:32:02 2014 +0200

    run astyle


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

08ddb01c941ad073eb3d22463aa13ecb7b10c0e4
 include/aspect/simulator.h           |  2 +-
 source/simulator/assembly.cc         |  6 +++---
 source/simulator/core.cc             | 16 ++++++++--------
 source/simulator/helper_functions.cc |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/aspect/simulator.h b/include/aspect/simulator.h
index 8b03203..6af9689 100644
--- a/include/aspect/simulator.h
+++ b/include/aspect/simulator.h
@@ -369,7 +369,7 @@ namespace aspect
          * <code>source/simulator/helper_functions.cc</code>.
          */
         AdvectionField (const FieldType field_type,
-                                  const unsigned int compositional_variable = numbers::invalid_unsigned_int);
+                        const unsigned int compositional_variable = numbers::invalid_unsigned_int);
 
         /**
          * A static function that creates an object identifying the
diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
index b5fff9c..53b69ea 100644
--- a/source/simulator/assembly.cc
+++ b/source/simulator/assembly.cc
@@ -1290,9 +1290,9 @@ namespace aspect
     const double viscosity            = material_model_outputs.viscosities[q];
     const bool is_compressible        = material_model->is_compressible();
     const double specific_radiogenic_heating_rate = heating_model->specific_heating_rate(material_model_inputs.temperature[q],
-                                                                                    material_model_inputs.pressure[q],
-                                                                                    material_model_inputs.composition[q],
-                                                                                    material_model_inputs.position[q]);
+                                                    material_model_inputs.pressure[q],
+                                                    material_model_inputs.composition[q],
+                                                    material_model_inputs.position[q]);
     const double compressibility      = (is_compressible
                                          ?
                                          material_model_outputs.compressibilities[q]
diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index 06e4737..daab346 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -1420,14 +1420,14 @@ namespace aspect
           // see if this is a time step where regular refinement is necessary, but only
           // if the previous rule wasn't triggered
           if (
-              (timestep_number > 0
-              &&
-              (parameters.adaptive_refinement_interval > 0)
-              &&
-              (timestep_number % parameters.adaptive_refinement_interval == 0))
-              ||
-              (timestep_number==0 && parameters.adaptive_refinement_interval == 1)
-              )
+            (timestep_number > 0
+             &&
+             (parameters.adaptive_refinement_interval > 0)
+             &&
+             (timestep_number % parameters.adaptive_refinement_interval == 0))
+            ||
+            (timestep_number==0 && parameters.adaptive_refinement_interval == 1)
+          )
             refine_mesh (max_refinement_level);
 
         // every n time steps output a summary of the current
diff --git a/source/simulator/helper_functions.cc b/source/simulator/helper_functions.cc
index 5909d49..ed0b6d5 100644
--- a/source/simulator/helper_functions.cc
+++ b/source/simulator/helper_functions.cc
@@ -58,7 +58,7 @@ namespace aspect
   template <int dim>
   Simulator<dim>::AdvectionField::
   AdvectionField (const FieldType field_type,
-                            const unsigned int compositional_variable)
+                  const unsigned int compositional_variable)
     :
     field_type (field_type),
     compositional_variable (compositional_variable)
@@ -85,7 +85,7 @@ namespace aspect
   Simulator<dim>::AdvectionField::composition (const unsigned int compositional_variable)
   {
     return AdvectionField(compositional_field,
-                                    compositional_variable);
+                          compositional_variable);
   }