[cig-commits] commit 1852 by heien to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1852

Formatting and small bug fix

U   trunk/aspect/include/aspect/particle/particle.h
U   trunk/aspect/source/particle/output.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1852&peg=1852

Diff:
Modified: trunk/aspect/include/aspect/particle/particle.h
===================================================================
--- trunk/aspect/include/aspect/particle/particle.h	2013-08-23 00:44:36 UTC (rev 1851)
+++ trunk/aspect/include/aspect/particle/particle.h	2013-08-23 18:16:11 UTC (rev 1852)
@@ -44,7 +44,7 @@
                     unsigned int num_elems,
                     MPI_Datatype data_type,
                     unsigned int elem_size_bytes)
-        :
+          :
           name(name),
           n_elements(num_elems),
           data_type(data_type),
@@ -83,8 +83,8 @@
       public:
         BaseParticle ();
 
-        BaseParticle (const Point<dim>& new_loc,
-                      const double& new_id);
+        BaseParticle (const Point<dim> &new_loc,
+                      const double &new_id);
 
         virtual
         ~BaseParticle ();
@@ -92,14 +92,14 @@
         static unsigned int
         data_len (ParticleDataFormat format);
 
-        virtual const char*
+        virtual const char *
         read_data (ParticleDataFormat format,
-                   const char* data);
+                   const char *data);
 
 
-        virtual char*
+        virtual char *
         write_data (ParticleDataFormat format,
-                    char* data) const;
+                    char *data) const;
 
         void
         set_location (const Point<dim> &new_loc);
@@ -128,7 +128,7 @@
         set_vel_check (bool new_vel_check);
 
         static void
-        add_mpi_types (std::vector<MPIDataInfo>& data_info);
+        add_mpi_types (std::vector<MPIDataInfo> &data_info);
     };
 
     // A particle with associated values, such as scalars, vectors or tensors
@@ -218,7 +218,7 @@
         // Returns a vector from the first dim components of _val
         Point<dim>
         get_vector () const;
-        
+
         // Sets the first dim components of _val to the specified vector value
         void set_vector(Point<dim> new_vec)
         {
@@ -260,7 +260,7 @@
         p (i) = _val[i];
     }
 
-   }
+  }
 }
 
 #endif

Modified: trunk/aspect/source/particle/output.cc
===================================================================
--- trunk/aspect/source/particle/output.cc	2013-08-23 00:44:36 UTC (rev 1851)
+++ trunk/aspect/source/particle/output.cc	2013-08-23 18:16:11 UTC (rev 1852)
@@ -525,15 +525,15 @@
               {
                 for (d=0; d<dim; ++d)
                   {
-                    pos_data[i*3+d] = it->second.location()(d);
-                    vel_data[i*3+d] = it->second.velocity()(d);
+                    pos_data[i*3+d] = it->second.get_location()(d);
+                    vel_data[i*3+d] = it->second.get_velocity()(d);
                   }
                 if (dim < 3)
                   {
                     pos_data[i*3+2] = 0;
                     vel_data[i*3+2] = 0;
                   }
-                id_data[i] = it->second.id_num();
+                id_data[i] = it->second.get_id();
               }
 
             // Write particle data to the HDF5 file