From: David Wells Date: Sat, 21 Oct 2017 04:28:20 +0000 (-0400) Subject: Move VectorOperation into its own header. X-Git-Tag: v9.0.0-rc1~901^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=269eda92ea7f558a8bcf68fae877b0604d5010bf;p=dealii.git Move VectorOperation into its own header. --- diff --git a/doc/news/changes/minor/20171020DavidWells b/doc/news/changes/minor/20171020DavidWells new file mode 100644 index 0000000000..4b021f88e7 --- /dev/null +++ b/doc/news/changes/minor/20171020DavidWells @@ -0,0 +1,3 @@ +Changed: The enum VectorOperation is now declared in its own header instead of the header for Vector. +
+(David Wells, 2017/10/20) diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h index 52acda2b6f..3fb920419a 100644 --- a/include/deal.II/base/partitioner.h +++ b/include/deal.II/base/partitioner.h @@ -23,8 +23,10 @@ #include #include #include -#include + #include +#include +#include #include diff --git a/include/deal.II/lac/block_matrix_base.h b/include/deal.II/lac/block_matrix_base.h index fcf45dc736..73c0739fc5 100644 --- a/include/deal.II/lac/block_matrix_base.h +++ b/include/deal.II/lac/block_matrix_base.h @@ -28,6 +28,7 @@ #include #include #include +#include #include diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index 64a7f3f32c..ee0a89e293 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index 331fbfb2f2..02a967252d 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -24,6 +24,8 @@ #include #include #include +#include + #include #include #include diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h index e47589e078..de18219418 100644 --- a/include/deal.II/lac/cuda_vector.h +++ b/include/deal.II/lac/cuda_vector.h @@ -18,7 +18,7 @@ #include #include - +#include #ifdef DEAL_II_WITH_CUDA diff --git a/include/deal.II/lac/diagonal_matrix.h b/include/deal.II/lac/diagonal_matrix.h index fbdc36e03e..1e20ccae4b 100644 --- a/include/deal.II/lac/diagonal_matrix.h +++ b/include/deal.II/lac/diagonal_matrix.h @@ -18,6 +18,7 @@ #include +#include 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 397fbe4eeb..a383d727d9 100644 --- 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 #include #include +#include #include - #include #include 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 d427115065..2086e6518e 100644 --- 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 #include #include +#include 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 90b36c8ca3..e66f0bbf11 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index df1208ffd6..08c27c47e3 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h index 40c5ae2e6a..764be32d5b 100644 --- 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 +#include #include #include #include diff --git a/include/deal.II/lac/parpack_solver.h b/include/deal.II/lac/parpack_solver.h index 019baf364e..c543d275e3 100644 --- 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 +#include #include #include + #include -#include -#include +#include + #include diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index f2d7cddd58..fb515c2e16 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -25,7 +25,7 @@ # include # include # include -# include +# include # include diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h index 8e46fd8e73..6fe06da14d 100644 --- a/include/deal.II/lac/petsc_parallel_vector.h +++ b/include/deal.II/lac/petsc_parallel_vector.h @@ -24,6 +24,7 @@ # include # include # include +# include # include # include # include diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index a3a9f516b2..ff0a976e52 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -24,6 +24,7 @@ # include # include # include +# include # include # include diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 3e3049dc9e..85e6bff8f3 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index 836e5c8d87..a3b2216b0e 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index ecbe2da949..53faf8da1e 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -24,7 +24,9 @@ #include #include #include +#include #include +#include #include 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 33d2d568e9..9319c1abb5 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -29,6 +29,7 @@ # include # include # include +#include # include # include diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 1b1e12fa30..bce5a4baa8 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -26,6 +26,7 @@ # include # include # include +# include # include # include diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index 767e9dff8c..d2de900688 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -22,6 +22,7 @@ #include #include #include +#include #include // 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 index 0000000000..19ee4c11b4 --- /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_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 737cb6c1b0..337de25b0d 100644 --- a/include/deal.II/lac/vector_space_vector.h +++ b/include/deal.II/lac/vector_space_vector.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 51565668f8..45aeb0762a 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -32,6 +32,7 @@ #include #include +#include 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 dcd631309d..b5d42842cc 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include