[cig-commits] r1310 - in trunk/aspect: include/aspect source/simulator source/velocity_boundary_conditions

[gassmoeller at dealii.org]

Author: gassmoeller
Date: 2012-10-22 09:22:55 -0600 (Mon, 22 Oct 2012)
New Revision: 1310

Modified:
   trunk/aspect/include/aspect/simulator.h
   trunk/aspect/source/simulator/simulator_access.cc
   trunk/aspect/source/velocity_boundary_conditions/gplates.cc
Log:
Made some code conform to C++98. Removed all compilation errors with g++ 4.4.4.

Modified: trunk/aspect/include/aspect/simulator.h
===================================================================
--- trunk/aspect/include/aspect/simulator.h	2012-10-22 13:31:43 UTC (rev 1309)
+++ trunk/aspect/include/aspect/simulator.h	2012-10-22 15:22:55 UTC (rev 1310)
@@ -371,7 +371,7 @@
        * <code>source/simulator/helper_functions.cc</code>.
        */
       void
-      get_composition_values_at_q_point (const std::vector<std::vector<double>> &composition_values,
+      get_composition_values_at_q_point (const std::vector<std::vector<double> > &composition_values,
                                          const unsigned int                      q,
                                          std::vector<double>                    &composition_values_at_q_point) const;
 
@@ -1195,8 +1195,8 @@
                         const std::vector<SymmetricTensor<2,dim> >  &old_old_strain_rates,
                         const std::vector<double>          &old_pressure,
                         const std::vector<double>          &old_old_pressure,
-                        const std::vector<std::vector<double>> &old_composition,
-                        const std::vector<std::vector<double>> &old_old_composition,
+                        const std::vector<std::vector<double> > &old_composition,
+                        const std::vector<std::vector<double> > &old_old_composition,
                         const double                        global_u_infty,
                         const double                        global_T_variation,
                         const double                        average_temperature,
@@ -1227,8 +1227,8 @@
                                           const std::vector<SymmetricTensor<2,dim> >  &old_old_strain_rates,
                                           const std::vector<double>          &old_pressure,
                                           const std::vector<double>          &old_old_pressure,
-                                          const std::vector<std::vector<double>> &old_composition,
-                                          const std::vector<std::vector<double>> &old_old_composition,
+                                          const std::vector<std::vector<double> > &old_composition,
+                                          const std::vector<std::vector<double> > &old_old_composition,
                                           const double                        average_temperature,
                                           const std::vector<Point<dim> >     &evaluation_points,
                                           double                             &max_residual,
@@ -1291,7 +1291,7 @@
        * <code>source/simulator/helper_functions.cc</code>.
        */
       void
-      extract_composition_values_at_q_point (const std::vector<std::vector<double>> &composition_values,
+      extract_composition_values_at_q_point (const std::vector<std::vector<double> > &composition_values,
                                              const unsigned int                      q,
                                              std::vector<double>                    &composition_values_at_q_point) const;
 

Modified: trunk/aspect/source/simulator/simulator_access.cc
===================================================================
--- trunk/aspect/source/simulator/simulator_access.cc	2012-10-22 13:31:43 UTC (rev 1309)
+++ trunk/aspect/source/simulator/simulator_access.cc	2012-10-22 15:22:55 UTC (rev 1310)
@@ -290,7 +290,7 @@
 
   template <int dim>
   void
-  SimulatorAccess<dim>::get_composition_values_at_q_point (const std::vector<std::vector<double>> &composition_values,
+  SimulatorAccess<dim>::get_composition_values_at_q_point (const std::vector<std::vector<double> > &composition_values,
                                                            const unsigned int                      q,
                                                            std::vector<double>                    &composition_values_at_q_point) const
   {

Modified: trunk/aspect/source/velocity_boundary_conditions/gplates.cc
===================================================================
--- trunk/aspect/source/velocity_boundary_conditions/gplates.cc	2012-10-22 13:31:43 UTC (rev 1309)
+++ trunk/aspect/source/velocity_boundary_conditions/gplates.cc	2012-10-22 15:22:55 UTC (rev 1310)
@@ -319,7 +319,7 @@
       time_dependent(true),
       point1("0.0,0.0"),
       point2("0.0,0.0"),
-      lookup(NULL)
+      lookup()
     {}