[cig-commits] [commit] master: Re-sort a few statement. Make sure we also distribute() the mesh velocity vector. (f1ccfe4)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Jun 24 13:13:49 PDT 2014


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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6b7c137fa297caa534f0c498bb594d05ed012a95...dd3794be780d4879f029fcef1efb957c61665109

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

commit f1ccfe4199832910f4d3541f710cc488ff4219fc
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Sun Jun 22 17:49:30 2014 -0500

    Re-sort a few statement. Make sure we also distribute() the mesh
    velocity vector.


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

f1ccfe4199832910f4d3541f710cc488ff4219fc
 source/simulator/core.cc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index a7bb1ac..e2656a7 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -1244,24 +1244,30 @@ namespace aspect
       system_trans.interpolate (system_tmp);
 
       constraints.distribute (distributed_system);
-      constraints.distribute (old_distributed_system);
-
       solution     = distributed_system;
+
+      constraints.distribute (old_distributed_system);
       old_solution = old_distributed_system;
+
       if (parameters.free_surface_enabled)
-        free_surface->mesh_velocity = distributed_mesh_velocity;
+	{
+	  constraints.distribute (distributed_mesh_velocity);
+	  free_surface->mesh_velocity = distributed_mesh_velocity;
+	}
     }
 
     // do the same as above also for the free surface solution
     if (parameters.free_surface_enabled)
       {
         LinearAlgebra::Vector distributed_mesh_vertices;
-        distributed_mesh_vertices.reinit(free_surface->mesh_locally_owned, mpi_communicator);
+        distributed_mesh_vertices.reinit(free_surface->mesh_locally_owned,
+					 mpi_communicator);
 
         std::vector<LinearAlgebra::Vector *> system_tmp (1);
         system_tmp[0] = &distributed_mesh_vertices;
         freesurface_trans->interpolate (system_tmp);
-        free_surface->mesh_constraints.distribute (distributed_mesh_vertices);
+	
+	free_surface->mesh_constraints.distribute (distributed_mesh_vertices);
         free_surface->mesh_vertices = distributed_mesh_vertices;
       }
 



More information about the CIG-COMMITS mailing list