Merge pull request #5845 from bangerth/hack-indent-template

Consistently put a space between 'template' and '<int dim'.

benchmarks/advection_in_annulus/advection_in_annulus.cc

@@ -85,7 +85,7 @@ namespace aspect
         return k*h_r*sin(k*theta)+rho_0*gravity*(outer_radius-r);
       }
 
-      template<int dim>
+      template <int dim>
       double
       Annulus_normal_traction (const Point<dim> &pos,
                                const double k)

benchmarks/annulus/plugin/annulus.cc

@@ -114,7 +114,7 @@ namespace aspect
 
 
 
-      template<int dim>
+      template <int dim>
       Tensor<1,dim>
       Annulus_velocity (const Point<dim> &pos,
                         const double k,
@@ -139,7 +139,7 @@ namespace aspect
 
 
 
-      template<int dim>
+      template <int dim>
       double
       Annulus_pressure (const Point<dim> &pos,
                         const double k,
@@ -156,7 +156,7 @@ namespace aspect
 
 
 
-      template<int dim>
+      template <int dim>
       double
       Annulus_normal_traction (const Point<dim> &pos,
                                const double k,
@@ -172,7 +172,7 @@ namespace aspect
 
 
 
-      template<int dim>
+      template <int dim>
       double
       Annulus_density (const Point<dim> &pos,
                        const double k,
@@ -200,7 +200,7 @@ namespace aspect
 
 
 
-      template<int dim>
+      template <int dim>
       Tensor<1,dim>
       Annulus_gravity (const Point<dim> &pos,
                        const double k,

benchmarks/hollow_sphere/hollow_sphere.cc

@@ -132,7 +132,7 @@ namespace aspect
         return hr*cos(theta) + rho_0 * gravity * (R2 - r);
       }
 
-      template<int dim>
+      template <int dim>
       double
       hollow_sphere_normal_traction(const Point<dim> &pos,
                                     const double mmm)

benchmarks/inclusion/compositional_fields/inclusion_compositional_fields.h

@@ -11,7 +11,7 @@ namespace aspect
   {
     using namespace dealii;
 
-    template<int dim>
+    template <int dim>
     class InclusionCompositionalMaterial : public InclusionMaterial<dim>
     {
       public:

benchmarks/nsinker/nsinker.cc

@@ -196,7 +196,7 @@ namespace aspect
     };
 
 
-    template<int dim>
+    template <int dim>
     NSinkerMaterial<dim>::NSinkerMaterial ()
     {
       delta = 200.0;

benchmarks/nsinker_spherical_shell/nsinker.cc

@@ -201,7 +201,7 @@ namespace aspect
     };
 
 
-    template<int dim>
+    template <int dim>
     NSinkerMaterial<dim>::NSinkerMaterial ()
     {
       delta = 2*200.0;

benchmarks/operator_splitting/advection_reaction/advection_reaction.cc

@@ -401,7 +401,7 @@ namespace aspect
       double max_error_T;
   };
 
-  template<int dim>
+  template <int dim>
   ExponentialDecayPostprocessor<dim>::ExponentialDecayPostprocessor ()
   {
     max_error = 0.0;

benchmarks/operator_splitting/exponential_decay/exponential_decay.cc

@@ -312,7 +312,7 @@ namespace aspect
       double max_error_T;
   };
 
-  template<int dim>
+  template <int dim>
   ExponentialDecayPostprocessor<dim>::ExponentialDecayPostprocessor ()
   {
     max_error = 0.0;

benchmarks/rigid_shear/plugin/rigid_shear.cc

@@ -68,7 +68,7 @@ namespace aspect
         return std::exp(t)-1.;
       }
 
-      template<int dim>
+      template <int dim>
       double
       density(const Point<dim> &p,
               const double t,
@@ -83,7 +83,7 @@ namespace aspect
       /**
        * The exact solution for the Rigid Shear benchmark.
        */
-      template<int dim>
+      template <int dim>
       class FunctionRigidShear : public Function<dim>
       {
         public:
@@ -121,7 +121,7 @@ namespace aspect
      * A material model for the stationary form of the rigid shear benchmark. All properties
      * are defined in dependence of position.
      */
-    template<int dim>
+    template <int dim>
     class RigidShearMaterial : public MaterialModel::Interface<dim>, public SimulatorAccess<dim>
     {
       public:
@@ -246,7 +246,7 @@ namespace aspect
      * The implementation of error evaluators that correspond to the
      * benchmarks defined in the paper Gassmoeller et al. referenced above.
      */
-    template<int dim>
+    template <int dim>
     class RigidShearPostprocessor : public Postprocess::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {
       public:

benchmarks/solcx/compositional_fields/solcx_compositional_fields.h

@@ -11,7 +11,7 @@ namespace aspect
   {
     using namespace dealii;
 
-    template<int dim>
+    template <int dim>
     class SolCxCompositionalMaterial : public SolCxMaterial<dim>
     {
       public:

benchmarks/solcx/solcx.h

@@ -2894,7 +2894,7 @@ namespace aspect
        * The exact solution for the SolCx benchmark, given the value of the
        * jump in viscosity $\eta_B$.
        */
-      template<int dim>
+      template <int dim>
       class FunctionSolCx : public Function<dim>
       {
         public:

benchmarks/solkz/compositional_fields/solkz_compositional_fields.h

@@ -12,7 +12,7 @@ namespace aspect
   {
     using namespace dealii;
 
-    template<int dim>
+    template <int dim>
     class SolKzCompositionalMaterial : public SolKzMaterial<dim>
     {
       public:

benchmarks/solkz/solkz.h

@@ -623,7 +623,7 @@ namespace aspect
       /**
        * The exact solution for the SolKz benchmark.
        */
-      template<int dim>
+      template <int dim>
       class FunctionSolKz : public Function<dim>
       {
         public:
@@ -648,7 +648,7 @@ namespace aspect
 
 
 
-    template<int dim>
+    template <int dim>
     class SolKzMaterial : public MaterialModel::Interface<dim>
     {
       public:
@@ -721,7 +721,7 @@ namespace aspect
      * The implementation of error evaluators that correspond to the
      * benchmarks defined in the paper Duretz et al. reference above.
      */
-    template<int dim>
+    template <int dim>
     class SolKzPostprocessor : public Postprocess::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {
       public:

include/aspect/compat.h

@@ -41,7 +41,7 @@ namespace big_mpi
 #include <deal.II/multigrid/mg_transfer_matrix_free.h>
 namespace dealii
 {
-  template<int dim, class NumberType>
+  template <int dim, class NumberType>
   using MGTransferMF = MGTransferMatrixFree<dim,NumberType>;
 }
 #endif

include/aspect/mesh_deformation/diffusion.h

@@ -39,7 +39,7 @@ namespace aspect
      * vertices according to the solution of a dim-1 diffusion
      * problem.
      */
-    template<int dim>
+    template <int dim>
     class Diffusion : public Interface<dim>, public SimulatorAccess<dim>
     {
       public:

include/aspect/mesh_deformation/fastscape.h

@@ -40,7 +40,7 @@ namespace aspect
      * and the stream power law, which describes river incision.
      *
      */
-    template<int dim>
+    template <int dim>
     class FastScape : public Interface<dim>, public SimulatorAccess<dim>
     {
       public:

include/aspect/mesh_deformation/free_surface.h

@@ -40,7 +40,7 @@ namespace aspect
      * In particular this means if the surface of the domain is
      * left open to flow, this flow will carry the mesh with it.
      */
-    template<int dim>
+    template <int dim>
     class FreeSurface : public Interface<dim>, public SimulatorAccess<dim>
     {
       public:

include/aspect/mesh_deformation/function.h

@@ -33,7 +33,7 @@ namespace aspect
 
   namespace MeshDeformation
   {
-    template<int dim>
+    template <int dim>
     class BoundaryFunction : public Interface<dim>, public SimulatorAccess<dim>
     {
       public:

include/aspect/mesh_deformation/interface.h

@@ -86,7 +86,7 @@ namespace aspect
      * for all non-constrained vertices will be computed by solving a Laplace
      * problem with the given constraints.
      */
-    template<int dim>
+    template <int dim>
     class Interface : public Plugins::InterfaceBase
     {
       public:
@@ -129,7 +129,7 @@ namespace aspect
      * of the surface, the internal nodes and computes the
      * Arbitrary-Lagrangian-Eulerian correction terms.
      */
-    template<int dim>
+    template <int dim>
     class MeshDeformationHandler: public SimulatorAccess<dim>
     {
       public:

include/aspect/particle/world.h

@@ -46,7 +46,7 @@
 
 namespace aspect
 {
-  template<int dim>
+  template <int dim>
   struct SimulatorSignals;
 
   namespace Particle

include/aspect/postprocess/particles.h

@@ -46,7 +46,7 @@ namespace aspect
        * dimension of zero (the dimension of the particle / point), and a space dimension
        * of dim (the dimension in which this zero-dimensional particle lives).
        */
-      template<int dim>
+      template <int dim>
       class ParticleOutput : public dealii::DataOutInterface<0,dim>
       {
         public:

include/aspect/postprocess/visualization/ISA_rotation_timescale.h

@@ -49,7 +49,7 @@ namespace aspect
        * (once they exist). For more thoughts on that, see the documentation for the
        * grain lag angle postprocessor.
        */
-      template<int dim>
+      template <int dim>
       class ISARotationTimescale: public CellDataVectorCreator<dim>, public SimulatorAccess<dim>
       {
         public:

include/aspect/postprocess/visualization/grain_lag_angle.h

@@ -56,7 +56,7 @@ namespace aspect
        * timestep behind the other quantities in order to get the gradients, but we're
        * often interested in GOL in a steady-state flow anyway.
        */
-      template<int dim>
+      template <int dim>
       class GrainLagAngle: public CellDataVectorCreator<dim>, public SimulatorAccess<dim>
       {
         public:

include/aspect/stokes_matrix_free.h

@@ -401,7 +401,7 @@ namespace aspect
    * Base class for the matrix free GMG solver for the Stokes system. The
    * actual implementation is found inside StokesMatrixFreeHandlerImplementation below.
    */
-  template<int dim>
+  template <int dim>
   class StokesMatrixFreeHandler
   {
     public:
@@ -510,7 +510,7 @@ namespace aspect
    * degree by using a pointer to the base class and we can pick the desired
    * velocity degree at runtime.
    */
-  template<int dim, int velocity_degree>
+  template <int dim, int velocity_degree>
   class StokesMatrixFreeHandlerImplementation: public StokesMatrixFreeHandler<dim>
   {
     public:

include/aspect/structured_data.h

@@ -770,7 +770,7 @@ namespace aspect
 
 
 
-    template<int dim>
+    template <int dim>
     using AsciiDataLookup DEAL_II_DEPRECATED = StructuredDataLookup<dim>;
   }
 }

include/aspect/volume_of_fluid/field.h

@@ -57,7 +57,7 @@ namespace aspect
    * Structure to package the relevant data (both state and cached) in a single
    * location for access.
    */
-  template<int dim>
+  template <int dim>
   struct VolumeOfFluidField
   {
     /**

include/aspect/volume_of_fluid/utilities.h

@@ -119,7 +119,7 @@ namespace aspect
        * @param points Quadrature points to use for update
        * @param weights JxW values to use for quadrature
        */
-      template<int dim>
+      template <int dim>
       double compute_interface_location_newton(const unsigned int degree,
                                                const Tensor<1, dim, double> normal,
                                                const double volume_fraction,
@@ -140,7 +140,7 @@ namespace aspect
        * @param points Quadrature points to use for update
        * @param weights JxW values to use for quadrature
        */
-      template<int dim>
+      template <int dim>
       double compute_fluid_volume(const unsigned int degree,
                                   const Tensor<1, dim, double> normal,
                                   const double d,
@@ -159,7 +159,7 @@ namespace aspect
        * @param interface_normal_in_cell The normal vector for the current interface reconstruction in the computing cell.
        * @param d_at_face_center The correct d value to for the interface description on the face we are computing for.
        */
-      template<int dim>
+      template <int dim>
       double calculate_volume_flux (const unsigned int compute_direction,
                                     const double time_direction_derivative,
                                     const Tensor<1, dim, double> interface_normal_in_cell,

source/main.cc

@@ -542,7 +542,7 @@ void signal_handler(int signal)
 
 
 
-template<int dim>
+template <int dim>
 void
 run_simulator(const std::string &raw_input_as_string,
               const std::string &input_as_string,