[cig-commits] [commit] master: Use a trick by Martin Kronbichler to accelerate matrix operations in parallel. (b27e3e0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/9b2e4324e5cc6300267d41b2bfa35b70f9a44cd4...c8a768302669a8e36315e909a8424d21633411c8

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

commit b27e3e0dd8284807677e5a09b317981f7d16b026
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue Sep 30 14:52:42 2014 -0500

    Use a trick by Martin Kronbichler to accelerate matrix operations in parallel.
    
    This tells deal.II to use a structure on the side to facilitate faster writing into
    matrices when doing computations in parallel.


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

b27e3e0dd8284807677e5a09b317981f7d16b026
 source/simulator/core.cc | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index c9e68a3..5527455 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -175,14 +175,14 @@ namespace aspect
   {
     if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
       {
-	// only open the logfile on processor 0, the other processors won't be
-	// writing into the stream anyway
-	log_file_stream.open((parameters.output_directory + "log.txt").c_str(),
-			     parameters.resume_computation ? std::ios_base::app : std::ios_base::out);
-
-	// we already printed the header to the screen, so here we just dump it
-	// into the logfile.
-	print_aspect_header(log_file_stream);
+        // only open the logfile on processor 0, the other processors won't be
+        // writing into the stream anyway
+        log_file_stream.open((parameters.output_directory + "log.txt").c_str(),
+                             parameters.resume_computation ? std::ios_base::app : std::ios_base::out);
+
+        // we already printed the header to the screen, so here we just dump it
+        // into the logfile.
+        print_aspect_header(log_file_stream);
       }
 
     computing_timer.enter_section("Initialization");
@@ -762,6 +762,8 @@ namespace aspect
 
 #else
     TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
+                                               system_partitioning,
+                                               introspection.index_sets.system_relevant_partitioning,
                                                mpi_communicator);
 #endif
 
@@ -814,6 +816,8 @@ namespace aspect
 
 #else
     TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
+                                               system_partitioning,
+                                               introspection.index_sets.system_relevant_partitioning,
                                                mpi_communicator);
 #endif
     DoFTools::make_sparsity_pattern (dof_handler,