From: Peter Munch Date: Tue, 13 Sep 2022 12:39:45 +0000 (+0200) Subject: Fix formating X-Git-Tag: v9.5.0-rc1~972^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f0197a51fbc68e5195fb616c6bc5a87f59e386;p=dealii.git Fix formating --- diff --git a/include/deal.II/dofs/dof_handler_policy.h b/include/deal.II/dofs/dof_handler_policy.h index de1c222c59..ed06bd23f6 100644 --- a/include/deal.II/dofs/dof_handler_policy.h +++ b/include/deal.II/dofs/dof_handler_policy.h @@ -14,27 +14,27 @@ // --------------------------------------------------------------------- #ifndef dealii_dof_handler_policy_h -# define dealii_dof_handler_policy_h +#define dealii_dof_handler_policy_h -# include +#include -# include -# include +#include +#include -# include -# include +#include +#include -# include +#include DEAL_II_NAMESPACE_OPEN // Forward declaration -# ifndef DOXYGEN +#ifndef DOXYGEN template class DoFHandler; -# endif +#endif namespace internal { @@ -258,4 +258,3 @@ namespace internal DEAL_II_NAMESPACE_CLOSE #endif -/*-------------------------- dof_handler_policy.h -------------------------*/ diff --git a/include/deal.II/fe/fe_tools_extrapolate.templates.h b/include/deal.II/fe/fe_tools_extrapolate.templates.h index e3615b0963..510b446a62 100644 --- a/include/deal.II/fe/fe_tools_extrapolate.templates.h +++ b/include/deal.II/fe/fe_tools_extrapolate.templates.h @@ -1772,5 +1772,4 @@ namespace FETools DEAL_II_NAMESPACE_CLOSE -/*-------------------- fe_tools_extrapolate_templates.h -------------------*/ -#endif // dealii_fe_tools_extrapolate_templates_H +#endif diff --git a/include/deal.II/fe/fe_tools_interpolate.templates.h b/include/deal.II/fe/fe_tools_interpolate.templates.h index c3ba8226ba..47f312a32e 100644 --- a/include/deal.II/fe/fe_tools_interpolate.templates.h +++ b/include/deal.II/fe/fe_tools_interpolate.templates.h @@ -796,5 +796,4 @@ namespace FETools DEAL_II_NAMESPACE_CLOSE -/*---------------------- fe_tools_interpolate_templates.h -------------------*/ -#endif // dealii_fe_tools_interpolate_templates_H +#endif diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index b97f5eb8e3..45b0f14b20 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -14,19 +14,19 @@ // --------------------------------------------------------------------- #ifndef dealii_filtered_iterator_h -# define dealii_filtered_iterator_h +#define dealii_filtered_iterator_h -# include +#include -# include -# include +#include +#include -# include +#include -# include -# include -# include +#include +#include +#include DEAL_II_NAMESPACE_OPEN @@ -1569,6 +1569,4 @@ namespace IteratorFilters DEAL_II_NAMESPACE_CLOSE -/*------------------------- filtered_iterator.h ------------------------*/ #endif -/*------------------------- filtered_iterator.h ------------------------*/ diff --git a/include/deal.II/grid/tria_iterator.h b/include/deal.II/grid/tria_iterator.h index 2424c7fd1b..27519e6a7f 100644 --- a/include/deal.II/grid/tria_iterator.h +++ b/include/deal.II/grid/tria_iterator.h @@ -14,26 +14,23 @@ // --------------------------------------------------------------------- #ifndef dealii_tria_iterator_h -# define dealii_tria_iterator_h +#define dealii_tria_iterator_h -/*---------------------------- tria-iterator.h ---------------------------*/ +#include +#include +#include -# include +#include -# include -# include - -# include - -# include -# include +#include +#include DEAL_II_NAMESPACE_OPEN // Forward declarations -# ifndef DOXYGEN +#ifndef DOXYGEN template class Triangulation; template @@ -43,7 +40,7 @@ template class TriaIterator; template class TriaActiveIterator; -# endif +#endif @@ -1165,7 +1162,7 @@ inline TriaIterator::TriaIterator( const TriaRawIterator &i) : TriaRawIterator(i.accessor) { -# ifdef DEBUG +#ifdef DEBUG // do this like this, because: // if we write // "Assert (IteratorState::past_the_end || used)" @@ -1174,7 +1171,7 @@ inline TriaIterator::TriaIterator( // throw the exception! if (this->state() != IteratorState::past_the_end) Assert(this->accessor.used(), ExcAssignmentOfUnusedObject()); -# endif +#endif } template @@ -1182,7 +1179,7 @@ template TriaIterator::TriaIterator(const OtherAccessor &a) : TriaRawIterator(a) { -# ifdef DEBUG +#ifdef DEBUG // do this like this, because: // if we write // "Assert (IteratorState::past_the_end || used)" @@ -1191,7 +1188,7 @@ TriaIterator::TriaIterator(const OtherAccessor &a) // throw the exception! if (this->state() != IteratorState::past_the_end) Assert(this->accessor.used(), ExcAssignmentOfUnusedObject()); -# endif +#endif } template @@ -1209,7 +1206,7 @@ inline TriaActiveIterator::TriaActiveIterator( const TriaRawIterator &i) : TriaIterator(i) { -# ifdef DEBUG +#ifdef DEBUG // do this like this, because: // if we write // "Assert (IteratorState::past_the_end || !has_children())" @@ -1219,7 +1216,7 @@ inline TriaActiveIterator::TriaActiveIterator( if (this->state() != IteratorState::past_the_end) Assert(this->accessor.has_children() == false, ExcAssignmentOfInactiveObject()); -# endif +#endif } @@ -1272,11 +1269,8 @@ DEAL_II_NAMESPACE_CLOSE // if in optimized mode: include more templates -# ifndef DEBUG -# include "tria_iterator.templates.h" -# endif - +#ifndef DEBUG +# include "tria_iterator.templates.h" +#endif -/*---------------------------- tria-iterator.h ---------------------------*/ #endif -/*---------------------------- tria-iterator.h ---------------------------*/ diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h index ff74a410e3..6479eafe7d 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.h +++ b/include/deal.II/lac/chunk_sparse_matrix.h @@ -14,31 +14,31 @@ // --------------------------------------------------------------------- #ifndef dealii_chunk_sparse_matrix_h -# define dealii_chunk_sparse_matrix_h +#define dealii_chunk_sparse_matrix_h -# include +#include -# include -# include +#include +#include -# include -# include -# include +#include +#include +#include -# include -# include +#include +#include DEAL_II_NAMESPACE_OPEN // Forward declarations -# ifndef DOXYGEN +#ifndef DOXYGEN template class Vector; template class FullMatrix; -# endif +#endif /** * @addtogroup Matrix1 @@ -1443,7 +1443,7 @@ private: /** @} */ -# ifndef DOXYGEN +#ifndef DOXYGEN /*---------------------- Inline functions -----------------------------------*/ @@ -2071,9 +2071,8 @@ ChunkSparseMatrix::end(const unsigned int r) -# endif // DOXYGEN +#endif // DOXYGEN DEAL_II_NAMESPACE_CLOSE #endif -/*--------------------------- chunk_sparse_matrix.h -------------------------*/ diff --git a/include/deal.II/lac/ginkgo_solver.h b/include/deal.II/lac/ginkgo_solver.h index c1df8506ce..79024848fd 100644 --- a/include/deal.II/lac/ginkgo_solver.h +++ b/include/deal.II/lac/ginkgo_solver.h @@ -14,22 +14,22 @@ // --------------------------------------------------------------------- #ifndef dealii_ginkgo_solver_h -# define dealii_ginkgo_solver_h +#define dealii_ginkgo_solver_h -# include +#include -# ifdef DEAL_II_WITH_GINKGO +#ifdef DEAL_II_WITH_GINKGO -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include -# include +# include -# include +# include DEAL_II_NAMESPACE_OPEN @@ -572,7 +572,6 @@ namespace GinkgoWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_GINKGO +#endif // DEAL_II_WITH_GINKGO #endif -/*---------------------------- ginkgo_solver.h ---------------------------*/ diff --git a/include/deal.II/lac/petsc_full_matrix.h b/include/deal.II/lac/petsc_full_matrix.h index 05e5d68c0f..739dc50713 100644 --- a/include/deal.II/lac/petsc_full_matrix.h +++ b/include/deal.II/lac/petsc_full_matrix.h @@ -14,15 +14,15 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_full_matrix_h -# define dealii_petsc_full_matrix_h +#define dealii_petsc_full_matrix_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include -# include +# include +# include DEAL_II_NAMESPACE_OPEN @@ -100,7 +100,6 @@ namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*---------------------------- petsc_full_matrix.h --------------------------*/ diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index 8724b691fc..1aa5a9435f 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -14,34 +14,34 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_matrix_base_h -# define dealii_petsc_matrix_base_h +#define dealii_petsc_matrix_base_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include +# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include -# include +# include -# include -# include -# include +# include +# include +# include DEAL_II_NAMESPACE_OPEN // Forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN template class BlockMatrixBase; -# endif +# endif namespace PETScWrappers @@ -1070,7 +1070,7 @@ namespace PETScWrappers -# ifndef DOXYGEN +# ifndef DOXYGEN // ---------------------- inline and template functions --------------------- @@ -1610,14 +1610,13 @@ namespace PETScWrappers prepare_action(VectorOperation::insert); } -# endif // DOXYGEN +# endif // DOXYGEN } // namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*---------------------------- petsc_matrix_base.h --------------------------*/ diff --git a/include/deal.II/lac/petsc_matrix_free.h b/include/deal.II/lac/petsc_matrix_free.h index c079dae36e..d9966ed185 100644 --- a/include/deal.II/lac/petsc_matrix_free.h +++ b/include/deal.II/lac/petsc_matrix_free.h @@ -14,15 +14,15 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_matrix_free_h -# define dealii_petsc_matrix_free_h +#define dealii_petsc_matrix_free_h -# include +#include -# ifdef DEAL_II_WITH_PETSC -# include -# include -# include +#ifdef DEAL_II_WITH_PETSC +# include +# include +# include DEAL_II_NAMESPACE_OPEN @@ -298,7 +298,6 @@ namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*---------------------------- petsc_matrix_free.h --------------------------*/ diff --git a/include/deal.II/lac/petsc_parallel_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_sparse_matrix.h index 0b203b3f3c..32ec9838ac 100644 --- a/include/deal.II/lac/petsc_parallel_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_sparse_matrix.h @@ -14,14 +14,13 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_parallel_sparse_matrix_h -# define dealii_petsc_parallel_sparse_matrix_h +#define dealii_petsc_parallel_sparse_matrix_h -# include +#include -# include +#include DEAL_II_WARNING( "This file is deprecated. Use deal.II/lac/petsc_sparse_matrix.h instead.") #endif -/*---------------------- petsc_parallel_sparse_matrix.h ---------------------*/ diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h index 2c75995cda..bba8d93584 100644 --- a/include/deal.II/lac/petsc_parallel_vector.h +++ b/include/deal.II/lac/petsc_parallel_vector.h @@ -14,14 +14,13 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_parallel_vector_h -# define dealii_petsc_parallel_vector_h +#define dealii_petsc_parallel_vector_h -# include +#include -# include +#include DEAL_II_WARNING( "This file is deprecated. Use deal.II/lac/petsc_vector.h instead!") #endif -/*------------------------- petsc_parallel_vector.h -------------------------*/ diff --git a/include/deal.II/lac/petsc_precondition.h b/include/deal.II/lac/petsc_precondition.h index b17c5e2a9f..e4bf24814f 100644 --- a/include/deal.II/lac/petsc_precondition.h +++ b/include/deal.II/lac/petsc_precondition.h @@ -14,18 +14,18 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_precondition_h -# define dealii_petsc_precondition_h +#define dealii_petsc_precondition_h -# include +#include -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include +# include -# include +# include DEAL_II_NAMESPACE_OPEN @@ -34,11 +34,11 @@ DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { // forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN class MatrixBase; class VectorBase; class SolverBase; -# endif +# endif /** * Base class for preconditioner classes using the PETSc functionality. The @@ -969,7 +969,6 @@ namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*--------------------------- petsc_precondition.h --------------------------*/ diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h index 696f48f025..4347bd8a62 100644 --- a/include/deal.II/lac/petsc_solver.h +++ b/include/deal.II/lac/petsc_solver.h @@ -14,45 +14,45 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_solver_h -# define dealii_petsc_solver_h +#define dealii_petsc_solver_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include -# include +# include +# include -# include +# include -# include +# include -# ifdef DEAL_II_WITH_SLEPC -# include -# endif +# ifdef DEAL_II_WITH_SLEPC +# include +# endif DEAL_II_NAMESPACE_OPEN // Forward declarations -# ifndef DOXYGEN -# ifdef DEAL_II_WITH_SLEPC +# ifndef DOXYGEN +# ifdef DEAL_II_WITH_SLEPC namespace SLEPcWrappers { // forward declarations class TransformationBase; } // namespace SLEPcWrappers -# endif # endif +# endif namespace PETScWrappers { // forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN class MatrixBase; class VectorBase; class PreconditionBase; -# endif +# endif /** @@ -250,11 +250,11 @@ namespace PETScWrappers */ std::unique_ptr solver_data; -# ifdef DEAL_II_WITH_SLEPC +# ifdef DEAL_II_WITH_SLEPC // Make the transformation class a friend, since it needs to set the KSP // solver. friend class SLEPcWrappers::TransformationBase; -# endif +# endif }; @@ -1000,9 +1000,6 @@ namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC - -/*---------------------------- petsc_solver.h ---------------------------*/ +#endif // DEAL_II_WITH_PETSC #endif -/*---------------------------- petsc_solver.h ---------------------------*/ diff --git a/include/deal.II/lac/petsc_sparse_matrix.h b/include/deal.II/lac/petsc_sparse_matrix.h index edfeb9b3ae..d4640f4a75 100644 --- a/include/deal.II/lac/petsc_sparse_matrix.h +++ b/include/deal.II/lac/petsc_sparse_matrix.h @@ -14,25 +14,25 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_sparse_matrix_h -# define dealii_petsc_sparse_matrix_h +#define dealii_petsc_sparse_matrix_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include -# include -# include +# include +# include +# include -# include +# include DEAL_II_NAMESPACE_OPEN // forward declaration -# ifndef DOXYGEN +# ifndef DOXYGEN template class BlockMatrixBase; -# endif +# endif namespace PETScWrappers { @@ -631,7 +631,6 @@ namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*--------------------------- petsc_sparse_matrix.h -------------------------*/ diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h index 99dadd9e48..842ec2dee4 100644 --- a/include/deal.II/lac/petsc_vector.h +++ b/include/deal.II/lac/petsc_vector.h @@ -14,22 +14,22 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_vector_h -# define dealii_petsc_vector_h +#define dealii_petsc_vector_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include -# include -# include +# include +# include +# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include DEAL_II_NAMESPACE_OPEN @@ -429,7 +429,7 @@ namespace PETScWrappers } -# ifndef DOXYGEN +# ifndef DOXYGEN template Vector::Vector(const MPI_Comm & communicator, @@ -502,8 +502,8 @@ namespace PETScWrappers return communicator; } -# endif // DOXYGEN - } // namespace MPI +# endif // DOXYGEN + } // namespace MPI } // namespace PETScWrappers namespace internal @@ -558,7 +558,6 @@ struct is_serial_vector : std::false_type DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*------------------------- petsc_vector.h -------------------------*/ diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index d9c52e8513..01fb81fa5c 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -14,29 +14,29 @@ // --------------------------------------------------------------------- #ifndef dealii_petsc_vector_base_h -# define dealii_petsc_vector_base_h +#define dealii_petsc_vector_base_h -# include +#include -# ifdef DEAL_II_WITH_PETSC +#ifdef DEAL_II_WITH_PETSC -# include -# include +# include +# include -# include -# include -# include +# include +# include +# include -# include +# include -# include -# include +# include +# include DEAL_II_NAMESPACE_OPEN // forward declaration -# ifndef DOXYGEN +# ifndef DOXYGEN template class Vector; @@ -44,7 +44,7 @@ namespace PETScWrappers { class VectorBase; } -# endif +# endif /** * A namespace in which wrapper classes for PETSc objects reside. @@ -858,7 +858,7 @@ namespace PETScWrappers u.swap(v); } -# ifndef DOXYGEN +# ifndef DOXYGEN namespace internal { inline VectorReference::VectorReference(const VectorBase &vector, @@ -1054,11 +1054,11 @@ namespace PETScWrappers inline PetscReal VectorReference::real() const { -# ifndef PETSC_USE_COMPLEX +# ifndef PETSC_USE_COMPLEX return static_cast(*this); -# else +# else return PetscRealPart(static_cast(*this)); -# endif +# endif } @@ -1066,11 +1066,11 @@ namespace PETScWrappers inline PetscReal VectorReference::imag() const { -# ifndef PETSC_USE_COMPLEX +# ifndef PETSC_USE_COMPLEX return PetscReal(0); -# else +# else return PetscImaginaryPart(static_cast(*this)); -# endif +# endif } } // namespace internal @@ -1271,12 +1271,11 @@ namespace PETScWrappers } } -# endif // DOXYGEN +# endif // DOXYGEN } // namespace PETScWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_PETSC +#endif // DEAL_II_WITH_PETSC #endif -/*---------------------------- petsc_vector_base.h --------------------------*/ diff --git a/include/deal.II/lac/sparse_ilu.templates.h b/include/deal.II/lac/sparse_ilu.templates.h index 91195dafda..ec49b3f970 100644 --- a/include/deal.II/lac/sparse_ilu.templates.h +++ b/include/deal.II/lac/sparse_ilu.templates.h @@ -14,17 +14,17 @@ // --------------------------------------------------------------------- #ifndef dealii_sparse_ilu_templates_h -# define dealii_sparse_ilu_templates_h +#define dealii_sparse_ilu_templates_h -# include +#include -# include -# include +#include +#include -# include -# include +#include +#include DEAL_II_NAMESPACE_OPEN @@ -308,4 +308,3 @@ SparseILU::memory_consumption() const DEAL_II_NAMESPACE_CLOSE #endif -/*-------------------------- sparse_ilu.templates.h -------------------------*/ diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h index f854c21fa4..b6e6b713cf 100644 --- a/include/deal.II/lac/sparse_matrix_ez.h +++ b/include/deal.II/lac/sparse_matrix_ez.h @@ -14,27 +14,27 @@ // --------------------------------------------------------------------- #ifndef dealii_sparse_matrix_ez_h -# define dealii_sparse_matrix_ez_h +#define dealii_sparse_matrix_ez_h -# include +#include -# include -# include +#include +#include -# include +#include -# include +#include DEAL_II_NAMESPACE_OPEN // Forward declarations -# ifndef DOXYGEN +#ifndef DOXYGEN template class Vector; template class FullMatrix; -# endif +#endif /** * @addtogroup Matrix1 @@ -1598,4 +1598,3 @@ SparseMatrixEZ::print_statistics(StreamType &out, bool full) DEAL_II_NAMESPACE_CLOSE #endif -/*---------------------------- sparse_matrix.h ---------------------------*/ diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 85819e6e6b..fbe9b42052 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -14,47 +14,47 @@ // --------------------------------------------------------------------- #ifndef dealii_trilinos_precondition_h -# define dealii_trilinos_precondition_h +#define dealii_trilinos_precondition_h -# include +#include -# ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_WITH_TRILINOS -# include +# include -# include -# include +# include +# include -# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include -# include +# include // forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN class Ifpack_Preconditioner; class Ifpack_Chebyshev; namespace ML_Epetra { class MultiLevelPreconditioner; } -# endif +# endif DEAL_II_NAMESPACE_OPEN // forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN template class SparseMatrix; template class Vector; class SparsityPattern; -# endif +# endif /** * @addtogroup TrilinosWrappers @@ -1700,7 +1700,7 @@ namespace TrilinosWrappers -# if defined(DOXYGEN) || defined(DEAL_II_TRILINOS_WITH_MUELU) +# if defined(DOXYGEN) || defined(DEAL_II_TRILINOS_WITH_MUELU) /** * This class implements an algebraic multigrid (AMG) preconditioner based * on the Trilinos MueLu implementation, which is a black-box preconditioner @@ -1941,7 +1941,7 @@ namespace TrilinosWrappers */ std::shared_ptr trilinos_matrix; }; -# endif +# endif @@ -2024,7 +2024,7 @@ namespace TrilinosWrappers // ----------------------- inline and template functions -------------------- -# ifndef DOXYGEN +# ifndef DOXYGEN inline void @@ -2177,7 +2177,7 @@ namespace TrilinosWrappers preconditioner->SetUseTranspose(false); } -# endif +# endif } // namespace TrilinosWrappers @@ -2187,7 +2187,6 @@ namespace TrilinosWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_TRILINOS +#endif // DEAL_II_WITH_TRILINOS -#endif // trilinos_precondition_h -/*------------------------- trilinos_precondition.h -------------------------*/ +#endif diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index 6a73e5db0d..c58a25a330 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -14,24 +14,24 @@ // --------------------------------------------------------------------- #ifndef dealii_trilinos_solver_h -# define dealii_trilinos_solver_h +#define dealii_trilinos_solver_h -# include +#include -# ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_WITH_TRILINOS -# include -# include -# include -# include +# include +# include +# include +# include -# include -# include -# include -# include +# include +# include +# include +# include -# include +# include DEAL_II_NAMESPACE_OPEN @@ -39,10 +39,10 @@ DEAL_II_NAMESPACE_OPEN namespace TrilinosWrappers { // forward declarations -# ifndef DOXYGEN +# ifndef DOXYGEN class SparseMatrix; class PreconditionBase; -# endif +# endif /** @@ -722,9 +722,6 @@ namespace TrilinosWrappers DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_TRILINOS - -/*---------------------------- trilinos_solver.h ---------------------------*/ +#endif // DEAL_II_WITH_TRILINOS #endif -/*---------------------------- trilinos_solver.h ---------------------------*/ diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 36cec8d04f..14daaaf757 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -2263,8 +2263,6 @@ struct is_serial_vector : std::false_type DEAL_II_NAMESPACE_CLOSE -#endif // DEAL_II_WITH_TRILINOS +#endif -/*---------------------------- trilinos_vector.h ---------------------------*/ - -#endif // dealii_trilinos_vector_h +#endif diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h index 661f9d1258..557a963fa4 100644 --- a/include/deal.II/numerics/solution_transfer.h +++ b/include/deal.II/numerics/solution_transfer.h @@ -14,22 +14,22 @@ // --------------------------------------------------------------------- #ifndef dealii_solution_transfer_h -# define dealii_solution_transfer_h +#define dealii_solution_transfer_h /*---------------------------- solutiontransfer.h ----------------------*/ -# include +#include -# include -# include +#include +#include -# include +#include -# include +#include -# include +#include DEAL_II_NAMESPACE_OPEN @@ -569,5 +569,4 @@ private: DEAL_II_NAMESPACE_CLOSE -#endif // dealii_solutiontransfer_h -/*---------------------------- solutiontransfer.h ---------------------------*/ +#endif diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index 2a5aaa1d82..e40dec2890 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -14,31 +14,28 @@ // --------------------------------------------------------------------- #ifndef dealii_time_dependent_h -# define dealii_time_dependent_h +#define dealii_time_dependent_h -/*---------------------------- time-dependent.h ---------------------------*/ +#include +#include +#include +#include -# include - -# include -# include -# include - -# include -# include +#include +#include DEAL_II_NAMESPACE_OPEN // forward declarations -# ifndef DOXYGEN +#ifndef DOXYGEN class TimeStepBase; template class Vector; template class Triangulation; -# endif +#endif /** * This class provides an abstract interface to time dependent problems in @@ -1641,6 +1638,4 @@ TimeDependent::do_loop(InitFunctionObject init_function, DEAL_II_NAMESPACE_CLOSE -/*---------------------------- time-dependent.h ---------------------------*/ #endif -/*---------------------------- time-dependent.h ---------------------------*/ diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h index 6701c4cdbc..bcbf321d96 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -15,34 +15,34 @@ #ifndef dealii_occ_utilities_h -# define dealii_occ_utilities_h +#define dealii_occ_utilities_h -# include +#include -# ifdef DEAL_II_WITH_OPENCASCADE +#ifdef DEAL_II_WITH_OPENCASCADE -# include +# include -# include +# include -# include +# include -# include +# include // opencascade needs "HAVE_CONFIG_H" to be exported... -# define HAVE_CONFIG_H -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# undef HAVE_CONFIG_H +# define HAVE_CONFIG_H +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# undef HAVE_CONFIG_H @@ -467,7 +467,6 @@ namespace OpenCASCADE DEAL_II_NAMESPACE_CLOSE -# endif // DEAL_II_WITH_OPENCASCADE +#endif // DEAL_II_WITH_OPENCASCADE -#endif // dealii_occ_utilities_h -/*----------------------------- occ_utilities.h -----------------------------*/ +#endif