Added IndexSet constructor with Epetra_Map

diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index b8dd4bd2362669cd007c7ebd10fb12cc4b0f9da5..3549ce1d566cbca0d48b04f7e692a9722aacdfe4 100644 (file)
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -88,6 +88,14 @@ public:
    */
   explicit IndexSet (const types::global_dof_index size);
 
+
+#ifdef DEAL_II_WITH_TRILINOS
+  /**
+   * Constructor from a trilinos Epetra_Map.
+   */
+  IndexSet(const Epetra_Map &map);
+#endif
+
   /**
    * Remove all indices from this index set. The index set retains its size,
    * however.
@@ -534,6 +542,24 @@ IndexSet::IndexSet (const types::global_dof_index size)
 
 
 
+
+#ifdef DEAL_II_WITH_TRILINOS
+inline
+IndexSet::IndexSet (const Epetra_Map &map)
+  :
+  is_compressed (true),
+  index_space_size (map.NumGlobalElements()),
+  largest_range (numbers::invalid_unsigned_int)
+{
+  int *map_indices = map.MyGlobalElements();
+  for (int i=0; i<map.NumMyElements(); ++i)
+    add_index((size_type)map_indices[i]);
+  compress();
+}
+#endif
+
+
+
 inline
 void
 IndexSet::clear ()
@@ -544,6 +570,7 @@ IndexSet::clear ()
 }
 
 
+
 inline
 void
 IndexSet::set_size (const types::global_dof_index sz)

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 59f21c6ecb53b82f83ed69248fd91895104d0f98..a34869895f16853635edfd38f8a8527055bad256 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -988,7 +988,7 @@ namespace internal
                                 TrilinosWrappers::MPI::Vector &v,
                                 bool fast)
       {
-        v.reinit(matrix.range_partitioner(), fast);
+        v.reinit(IndexSet(matrix.range_partitioner()), MPI_COMM_WORLD, fast);
       }
 
       template <typename Matrix>
@@ -997,7 +997,7 @@ namespace internal
                                 TrilinosWrappers::MPI::Vector &v,
                                 bool fast)
       {
-        v.reinit(matrix.domain_partitioner(), fast);
+        v.reinit(IndexSet(matrix.domain_partitioner()), MPI_COMM_WORLD, fast);
       }
     };
 
@@ -1015,7 +1015,7 @@ namespace internal
                                 TrilinosWrappers::Vector &v,
                                 bool fast)
       {
-        v.reinit(matrix.range_partitioner(), fast);
+        v.reinit(IndexSet(matrix.range_partitioner()), MPI_COMM_WORLD, fast);
       }
 
       template <typename Matrix>
@@ -1024,7 +1024,7 @@ namespace internal
                                 TrilinosWrappers::Vector &v,
                                 bool fast)
       {
-        v.reinit(matrix.domain_partitioner(), fast);
+        v.reinit(IndexSet(matrix.domain_partitioner()), MPI_COMM_WORLD, fast);
       }
     };