Move VectorOperation into its own header.

diff --git a/doc/news/changes/minor/20171020DavidWells b/doc/news/changes/minor/20171020DavidWells
new file mode 100644 (file)
index 0000000..4b021f8
--- /dev/null
+++ b/doc/news/changes/minor/20171020DavidWells
@@ -0,0 +1,3 @@
+Changed: The <code>enum</code> VectorOperation is now declared in its own header instead of the header for Vector.
+<br>
+(David Wells, 2017/10/20)

diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h
index 52acda2b6fc91ebbbc44e264613ead2a840e248b..3fb920419a0aaf4897dcb93f911d48425fc1bc9f 100644 (file)
--- a/include/deal.II/base/partitioner.h
+++ b/include/deal.II/base/partitioner.h
@@ -23,8 +23,10 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/array_view.h>
-#include <deal.II/lac/vector.h>
+
 #include <deal.II/lac/communication_pattern_base.h>
+#include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 
 #include <limits>
 

diff --git a/include/deal.II/lac/block_matrix_base.h b/include/deal.II/lac/block_matrix_base.h
index fcf45dc7366b400614bdf80d98f9c6d13a142d23..73c0739fc57a96fad9fdb5a75d12419ff493b0dc 100644 (file)
--- a/include/deal.II/lac/block_matrix_base.h
+++ b/include/deal.II/lac/block_matrix_base.h
@@ -28,6 +28,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/matrix_iterator.h>
 #include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 
 #include <cmath>
 

diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h
index 64a7f3f32cb3ac312f095006434347c46c82903d..ee0a89e293bf3c780aa7e4074e3415b224d46176 100644 (file)
--- a/include/deal.II/lac/block_vector.h
+++ b/include/deal.II/lac/block_vector.h
@@ -21,6 +21,7 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/lac/block_indices.h>
 #include <deal.II/lac/block_vector_base.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_type_traits.h>
 
 #include <cstdio>

diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h
index 331fbfb2f23c6ad2a7960eb7301af3c2db559340..02a967252d82961c0fa7a38ae3c6a52b97c0c9bc 100644 (file)
--- a/include/deal.II/lac/block_vector_base.h
+++ b/include/deal.II/lac/block_vector_base.h
@@ -24,6 +24,8 @@
 #include <deal.II/lac/exceptions.h>
 #include <deal.II/lac/block_indices.h>
 #include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
+
 #include <vector>
 #include <iterator>
 #include <cmath>

diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h
index e47589e0788ab551e4c78e211ec2a7bae0f84e27..de18219418f43d35dd6813db74391b9c7fcdd1d4 100644 (file)
--- a/include/deal.II/lac/cuda_vector.h
+++ b/include/deal.II/lac/cuda_vector.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 #include <deal.II/lac/vector_space_vector.h>
-
+#include <deal.II/lac/vector_operation.h>
 
 #ifdef DEAL_II_WITH_CUDA
 

diff --git a/include/deal.II/lac/diagonal_matrix.h b/include/deal.II/lac/diagonal_matrix.h
index fbdc36e03e647e6a0047c7c4ee4942504c271743..1e20ccae4be40914fdc3fbc7f0b6fea254fe8a2f 100644 (file)
--- a/include/deal.II/lac/diagonal_matrix.h
+++ b/include/deal.II/lac/diagonal_matrix.h
@@ -18,6 +18,7 @@
 
 
 #include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h
index 397fbe4eeb2291a03ea661d9bb0378691dd711d2..a383d727d9e788f6a1d0b1f7d43c019fd97cc76d 100644 (file)
--- a/include/deal.II/lac/la_parallel_block_vector.h
+++ b/include/deal.II/lac/la_parallel_block_vector.h
@@ -22,9 +22,9 @@
 #include <deal.II/lac/block_indices.h>
 #include <deal.II/lac/block_vector_base.h>
 #include <deal.II/lac/la_parallel_vector.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_type_traits.h>
 
-
 #include <cstdio>
 #include <vector>
 

diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h
index d4271150652d53a7216258174ad7961d148c172c..2086e6518e1e4329eedab1f87eb75ff243293cb1 100644 (file)
--- a/include/deal.II/lac/la_parallel_block_vector.templates.h
+++ b/include/deal.II/lac/la_parallel_block_vector.templates.h
@@ -22,6 +22,7 @@
 #include <deal.II/lac/petsc_parallel_block_vector.h>
 #include <deal.II/lac/trilinos_parallel_block_vector.h>
 #include <deal.II/lac/lapack_support.h>
+#include <deal.II/lac/vector.h>
 
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h
index 90b36c8ca3e95480881e5fb286c5530a2f3e6ce9..e66f0bbf11e243f71ffc35046ad5ed48068dc757 100644 (file)
--- a/include/deal.II/lac/la_parallel_vector.h
+++ b/include/deal.II/lac/la_parallel_vector.h
@@ -21,6 +21,7 @@
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/partitioner.h>
 #include <deal.II/base/thread_management.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_space_vector.h>
 #include <deal.II/lac/vector_type_traits.h>
 

diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h
index df1208ffd6eb2820b6e67bf30c396b5448194f6b..08c27c47e3eb83f35c64eb6fb025f523adc6b7ab 100644 (file)
--- a/include/deal.II/lac/la_vector.h
+++ b/include/deal.II/lac/la_vector.h
@@ -22,6 +22,7 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/index_set.h>
 #include <deal.II/lac/read_write_vector.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_space_vector.h>
 #include <deal.II/lac/vector_type_traits.h>
 

diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h
index 40c5ae2e6a93947df65c323c931fb5883feb77f8..764be32d5b97f8437c3980944d79bc4a36c128e4 100644 (file)
--- a/include/deal.II/lac/la_vector.templates.h
+++ b/include/deal.II/lac/la_vector.templates.h
@@ -17,6 +17,7 @@
 #define dealii_la_vector_templates_h
 
 #include <deal.II/lac/la_vector.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_operations_internal.h>
 #include <iostream>
 #include <iomanip>

diff --git a/include/deal.II/lac/parpack_solver.h b/include/deal.II/lac/parpack_solver.h
index 019baf364e966a87fe5ad1e69948f40f70f1fcf6..c543d275e380b9b8b2f9171bb33254cd8a60dad4 100644 (file)
--- a/include/deal.II/lac/parpack_solver.h
+++ b/include/deal.II/lac/parpack_solver.h
@@ -17,11 +17,13 @@
 #define dealii_parpack_solver_h
 
 #include <deal.II/base/config.h>
+#include <deal.II/base/index_set.h>
 #include <deal.II/base/smartpointer.h>
 #include <deal.II/base/memory_consumption.h>
+
 #include <deal.II/lac/solver_control.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/base/index_set.h>
+#include <deal.II/lac/vector_operation.h>
+
 
 #include <cstring>
 

diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h
index f2d7cddd58b4b6de18ca8600f13b877ae11fcf5a..fb515c2e166f6fb18d7f63c78e3e414eeb823eb1 100644 (file)
--- a/include/deal.II/lac/petsc_matrix_base.h
+++ b/include/deal.II/lac/petsc_matrix_base.h
@@ -25,7 +25,7 @@
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/full_matrix.h>
 #  include <deal.II/lac/petsc_compatibility.h>
-#  include <deal.II/lac/vector.h>
+#  include <deal.II/lac/vector_operation.h>
 
 #  include <petscmat.h>
 

diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h
index 8e46fd8e73d986bb21b1a8c51ee449e91f20a19b..6fe06da14d445fb191412c19e7993321a25c46e0 100644 (file)
--- a/include/deal.II/lac/petsc_parallel_vector.h
+++ b/include/deal.II/lac/petsc_parallel_vector.h
@@ -24,6 +24,7 @@
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/vector.h>
+#  include <deal.II/lac/vector_operation.h>
 #  include <deal.II/lac/petsc_vector_base.h>
 #  include <deal.II/base/index_set.h>
 #  include <deal.II/lac/vector_type_traits.h>

diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h
index a3a9f516b2d8d617f678c3f90166bc1631505878..ff0a976e5231fd9585df69d3da9d51cda9b18614 100644 (file)
--- a/include/deal.II/lac/petsc_vector_base.h
+++ b/include/deal.II/lac/petsc_vector_base.h
@@ -24,6 +24,7 @@
 #  include <deal.II/base/subscriptor.h>
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/vector.h>
+#  include <deal.II/lac/vector_operation.h>
 
 #  include <vector>
 #  include <utility>

diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index 3e3049dc9e6322df42b50055010125f7556b6653..85e6bff8f3c14afeae8cabe38262727b1579b2eb 100644 (file)
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -25,6 +25,7 @@
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/thread_management.h>
 #include <deal.II/lac/vector_view.h>
+#include <deal.II/lac/vector_operation.h>
 
 #include <cstring>
 #include <iomanip>

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index 836e5c8d87c4c04f43044a67a0ff67f0688fdf43..a3b2216b0e398ecb2791328ae5c691ae9a02b6b1 100644 (file)
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -23,7 +23,7 @@
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/identity_matrix.h>
 #include <deal.II/lac/exceptions.h>
-#include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 
 #include <memory>
 

diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h
index ecbe2da9493a566843e185824cdca9f9d9e0edcb..53faf8da1e0dabfd61772b1888a466613a8ea003 100644 (file)
--- a/include/deal.II/lac/trilinos_epetra_vector.h
+++ b/include/deal.II/lac/trilinos_epetra_vector.h
@@ -24,7 +24,9 @@
 #include <deal.II/base/index_set.h>
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/lac/trilinos_epetra_communication_pattern.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_space_vector.h>
+#include <deal.II/lac/vector_type_traits.h>
 #include <memory>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 33d2d568e99a1aef171efa95d37a40abddd986a1..9319c1abb589e1f6407edc3134d7f05856e05da9 100644 (file)
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -29,6 +29,7 @@
 #  include <deal.II/lac/trilinos_epetra_vector.h>
 #  include <deal.II/lac/vector_view.h>
 #  include <deal.II/lac/vector_memory.h>
+#include <deal.II/lac/vector_operation.h>
 
 #  include <type_traits>
 #  include <vector>

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 1b1e12fa30e25f486c353a128927f1bef171ecd8..bce5a4baa878064299618c930419c3c647d87328 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -26,6 +26,7 @@
 #  include <deal.II/base/mpi.h>
 #  include <deal.II/lac/exceptions.h>
 #  include <deal.II/lac/vector.h>
+#  include <deal.II/lac/vector_operation.h>
 #  include <deal.II/lac/vector_type_traits.h>
 
 #  include <vector>

diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h
index 767e9dff8cfe240c5d1121187513da51d3cd923f..d2de900688fa539fd06843aedd4baff175ee365c 100644 (file)
--- a/include/deal.II/lac/vector.h
+++ b/include/deal.II/lac/vector.h
@@ -22,6 +22,7 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/base/index_set.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/vector_type_traits.h>
 
 // boost::serialization::make_array used to be in array.hpp, but was
@@ -79,37 +80,6 @@ namespace parallel
  *@{
  */
 
-/**
- * This enum keeps track of the current operation in parallel linear algebra
- * objects like Vectors and Matrices.
- *
- * It is used in the various compress() functions. They also exist in serial
- * codes for compatibility and are empty there.
- *
- * See
- * @ref GlossCompress "Compressing distributed objects"
- * for more information.
- */
-struct VectorOperation
-{
-  enum values
-  {
-    /**
-     * The current operation is unknown.
-     */
-    unknown,
-    /**
-     * The current operation is an insertion.
-     */
-    insert,
-    /**
-     * The current operation is an addition.
-     */
-    add
-  };
-};
-
-
 /**
  * Numerical vector of data.  For this class there are different types of
  * functions available. The first type of function initializes the vector,

diff --git a/include/deal.II/lac/vector_operation.h b/include/deal.II/lac/vector_operation.h
new file mode 100644 (file)
index 0000000..19ee4c1
--- /dev/null
+++ b/include/deal.II/lac/vector_operation.h
@@ -0,0 +1,61 @@
+// ---------------------------------------------------------------------
+//
+// Copyright (C) 2017 by the deal.II authors
+//
+// This file is part of the deal.II library.
+//
+// The deal.II library is free software; you can use it, redistribute
+// it, and/or modify it under the terms of the GNU Lesser General
+// Public License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// The full text of the license can be found in the file LICENSE at
+// the top level of the deal.II distribution.
+//
+// ---------------------------------------------------------------------
+
+#ifndef dealii_lac_vector_operation_h
+#define dealii_lac_vector_operation_h
+
+#include <deal.II/base/config.h>
+
+DEAL_II_NAMESPACE_OPEN
+
+/*! @addtogroup Vectors
+ *@{
+ */
+
+/**
+ * This enum keeps track of the current operation in parallel linear algebra
+ * objects like Vectors and Matrices.
+ *
+ * It is used in the various compress() functions. They also exist in serial
+ * codes for compatibility and are empty there.
+ *
+ * See
+ * @ref GlossCompress "Compressing distributed objects"
+ * for more information.
+ */
+struct VectorOperation
+{
+  enum values
+  {
+    /**
+     * The current operation is unknown.
+     */
+    unknown,
+    /**
+     * The current operation is an insertion.
+     */
+    insert,
+    /**
+     * The current operation is an addition.
+     */
+    add
+  };
+};
+
+/*@}*/
+
+DEAL_II_NAMESPACE_CLOSE
+
+#endif

diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h
index 737cb6c1b0eb99c06748a39954de11ea4dc10a6f..337de25b0dbc36af13cc43ab2a6340bae2bf3b43 100644 (file)
--- a/include/deal.II/lac/vector_space_vector.h
+++ b/include/deal.II/lac/vector_space_vector.h
@@ -18,7 +18,7 @@
 
 #include <deal.II/base/config.h>
 #include <deal.II/base/numbers.h>
-#include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 
 #include <memory>
 

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index 51565668f881c6528dd6b727860c0d1bef044428..45aeb0762a3becd356852c32af17033c07743e1e 100644 (file)
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -32,6 +32,7 @@
 #include <deal.II/matrix_free/tensor_product_kernels.h>
 #include <deal.II/matrix_free/evaluation_selector.h>
 
+#include <deal.II/lac/vector_operation.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index dcd631309da9f4c242fa63af61d77a6a14bac5a0..b5d42842cc716863d5df0637b5f1e637c2305348 100644 (file)
--- a/include/deal.II/matrix_free/matrix_free.h
+++ b/include/deal.II/matrix_free/matrix_free.h
@@ -27,7 +27,7 @@
 #include <deal.II/fe/fe.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/mapping_q1.h>
-#include <deal.II/lac/vector.h>
+#include <deal.II/lac/vector_operation.h>
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/block_vector_base.h>
 #include <deal.II/lac/constraint_matrix.h>