[cig-commits] [commit] master: fix c8a76830 with deal 8.1 (6a39ed4)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2e8a68d9e94d9a4bcd4e633cd06c203c2f7e992c...7f599838008afc73167a3d20f4c255f7e459274d

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

commit 6a39ed4bd420497d209c4915cbb2c91b89a6e46d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Oct 10 15:23:05 2014 -0400

    fix c8a76830 with deal 8.1


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

6a39ed4bd420497d209c4915cbb2c91b89a6e46d
 source/simulator/core.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index 5527455..993fdfb 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -761,10 +761,15 @@ namespace aspect
     LinearAlgebra::CompressedBlockSparsityPattern sp(introspection.index_sets.system_relevant_partitioning);
 
 #else
+
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) > 801
     TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
                                                system_partitioning,
                                                introspection.index_sets.system_relevant_partitioning,
                                                mpi_communicator);
+#else
+    TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
+                                               mpi_communicator);
 #endif
 
     DoFTools::make_sparsity_pattern (dof_handler,
@@ -815,10 +820,17 @@ namespace aspect
     LinearAlgebra::CompressedBlockSparsityPattern sp(introspection.index_sets.system_relevant_partitioning);
 
 #else
+
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) > 801
     TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
                                                system_partitioning,
                                                introspection.index_sets.system_relevant_partitioning,
                                                mpi_communicator);
+#else
+    TrilinosWrappers::BlockSparsityPattern sp (system_partitioning,
+                                               mpi_communicator);
+#endif
+    
 #endif
     DoFTools::make_sparsity_pattern (dof_handler,
                                      coupling, sp,