From c908030d4d43e80793423e19ff9fbfe57b08b7f9 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 22 Feb 2000 20:16:11 +0000 Subject: [PATCH] new heads git-svn-id: https://svn.dealii.org/trunk@2475 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 43 +++---- .../include/dofs/dof_accessor.templates.h | 50 +++----- .../deal.II/include/dofs/dof_constraints.h | 36 +++--- .../include/dofs/dof_constraints.templates.h | 44 +++---- deal.II/deal.II/include/dofs/dof_handler.h | 64 ++++------ deal.II/deal.II/include/dofs/dof_levels.h | 31 +++-- deal.II/deal.II/include/dofs/dof_tools.h | 27 ++-- deal.II/deal.II/include/grid/geometry_info.h | 25 ++-- deal.II/deal.II/include/grid/grid_generator.h | 26 ++-- deal.II/deal.II/include/grid/grid_in.h | 28 ++--- deal.II/deal.II/include/grid/grid_out.h | 48 ++++---- deal.II/deal.II/include/grid/intergrid_map.h | 24 ++-- deal.II/deal.II/include/grid/magic_numbers.h | 24 ++-- .../deal.II/include/grid/persistent_tria.h | 23 ++-- deal.II/deal.II/include/grid/tria.h | 79 ++++-------- deal.II/deal.II/include/grid/tria_accessor.h | 49 +++----- .../include/grid/tria_accessor.templates.h | 115 +++--------------- deal.II/deal.II/include/grid/tria_boundary.h | 30 +++-- .../deal.II/include/grid/tria_boundary_lib.h | 29 +++-- deal.II/deal.II/include/grid/tria_hex.h | 29 +++-- deal.II/deal.II/include/grid/tria_iterator.h | 71 +++-------- .../include/grid/tria_iterator.templates.h | 53 +++----- .../deal.II/include/grid/tria_iterator_base.h | 23 ++-- deal.II/deal.II/include/grid/tria_levels.h | 39 +++--- deal.II/deal.II/include/grid/tria_line.h | 27 ++-- deal.II/deal.II/include/grid/tria_quad.h | 30 +++-- deal.II/deal.II/include/multigrid/mg_base.h | 55 +++------ .../include/multigrid/mg_dof_accessor.h | 43 +++---- .../include/multigrid/mg_dof_handler.h | 55 ++++----- .../deal.II/include/multigrid/mg_dof_tools.h | 23 ++-- .../deal.II/include/multigrid/mg_smoother.h | 31 +++-- .../include/multigrid/mg_smoother.templates.h | 1 - deal.II/deal.II/include/multigrid/multigrid.h | 31 ++--- .../include/multigrid/multigrid.templates.h | 24 ++-- deal.II/deal.II/include/numerics/assembler.h | 37 +++--- deal.II/deal.II/include/numerics/base.h | 29 +++-- deal.II/deal.II/include/numerics/data_io.h | 30 ++--- deal.II/deal.II/include/numerics/data_out.h | 33 ++--- .../deal.II/include/numerics/data_out_stack.h | 30 +++-- .../include/numerics/dof_renumbering.h | 34 +++--- .../include/numerics/error_estimator.h | 51 ++++---- deal.II/deal.II/include/numerics/histogram.h | 29 +++-- deal.II/deal.II/include/numerics/matrices.h | 40 +++--- .../include/numerics/solution_transfer.h | 31 +++-- .../deal.II/include/numerics/time_dependent.h | 84 ++++++------- deal.II/deal.II/include/numerics/vectors.h | 30 ++--- 46 files changed, 774 insertions(+), 1014 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index bdcaedef75..dc68f03a79 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -1,8 +1,19 @@ -/*---------------------------- dof_iterator.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __dof_iterator_H -#define __dof_iterator_H +//---------------------------- dof_accessor.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_accessor.h --------------------------- +#ifndef __deal2__dof_accessor_h +#define __deal2__dof_accessor_h + + /*---------------------------- dof_iterator.h ---------------------------*/ @@ -18,7 +29,6 @@ // inlining and thus faster code. - /** * Define the basis for accessors to the degrees of freedom. * @@ -113,8 +123,6 @@ class DoFAccessor }; - - /* -------------------------------------------------------------------------- */ /** @@ -142,7 +150,6 @@ class DoFObjectAccessor_Inheritance }; - /** * This is a switch class which only declares a #typedef#. It is meant to * determine which class a #DoFObjectAccessor# class is to be derived @@ -168,12 +175,9 @@ class DoFObjectAccessor_Inheritance }; - - /* -------------------------------------------------------------------------- */ - /** * Common template for access to the data on a line, quad, hex. Note * that this class is only here for documentation purposes, the actual @@ -387,7 +391,6 @@ class DoFObjectAccessor : public DoFAccessor, }; - /** * Closure class. */ @@ -412,7 +415,6 @@ class DoFObjectAccessor<0, dim> : public DoFAccessor, }; - /** * Access to the degrees of freedom located on lines. * This class follows mainly the route laid out by the accessor library @@ -603,7 +605,6 @@ class DoFObjectAccessor<1, dim> : public DoFAccessor, }; - /** * Grant access to the degrees of freedom located on quads. * @@ -779,9 +780,6 @@ class DoFObjectAccessor<2, dim> : public DoFAccessor, }; - - - /** * Grant access to the degrees of freedom located on hexes. * @@ -963,7 +961,6 @@ class DoFObjectAccessor<3, dim> : public DoFAccessor, }; - /** * Grant access to the degrees of freedom on a cell. In fact, since all * access to the degrees of freedom has been enabled by the classes @@ -1154,19 +1151,13 @@ class DoFCellAccessor : public DoFObjectAccessor }; - - - // if in optimized mode: include more templates #ifndef DEBUG # include "dof_accessor.templates.h" #endif - - - /*---------------------------- dof_iterator.h ---------------------------*/ -/* end of #ifndef __dof_iterator_H */ + #endif /*---------------------------- dof_iterator.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index be6c92a6f4..ece1ad920f 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -1,8 +1,17 @@ -/*---------------------------- dof_accessor.templates.h ---------------------------*/ -/* $Id$ */ -#ifndef __dof_accessor_templates_H -#define __dof_accessor_templates_H -/*---------------------------- dof_accessor.templates.h ---------------------------*/ +//---------------------------- dof_accessor.templates.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_accessor.templates.h --------------------------- +#ifndef __deal2__dof_accessor_templates_h +#define __deal2__dof_accessor_templates_h #include @@ -34,8 +43,6 @@ DoFObjectAccessor<1,dim>::dof_index (const unsigned int i) const }; - - template inline unsigned int @@ -55,7 +62,6 @@ DoFObjectAccessor<1,dim>::vertex_dof_index (const unsigned int vertex, }; - template inline void @@ -78,7 +84,6 @@ DoFObjectAccessor<1,dim>::get_dof_indices (vector &dof_indices) co }; - template inline TriaIterator > @@ -97,7 +102,6 @@ DoFObjectAccessor<1,dim>::child (const unsigned int i) const }; - template inline void @@ -108,8 +112,6 @@ DoFObjectAccessor<1,dim>::copy_from (const DoFObjectAccessor<1,dim> &a) }; - - /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ template @@ -128,7 +130,6 @@ unsigned int DoFObjectAccessor<2,dim>::dof_index (const unsigned int i) const }; - template inline unsigned int @@ -148,7 +149,6 @@ DoFObjectAccessor<2,dim>::vertex_dof_index (const unsigned int vertex, }; - template inline void @@ -176,7 +176,6 @@ DoFObjectAccessor<2,dim>::get_dof_indices (vector &dof_indices) co }; - template inline TriaIterator > @@ -194,7 +193,6 @@ DoFObjectAccessor<2,dim>::line (const unsigned int i) const }; - template inline TriaIterator > @@ -213,7 +211,6 @@ DoFObjectAccessor<2,dim>::child (const unsigned int i) const }; - template inline void @@ -224,8 +221,6 @@ DoFObjectAccessor<2,dim>::copy_from (const DoFObjectAccessor<2,dim> &a) }; - - /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ @@ -246,7 +241,6 @@ DoFObjectAccessor<3,dim>::dof_index (const unsigned int i) const }; - template inline unsigned int @@ -266,7 +260,6 @@ DoFObjectAccessor<3,dim>::vertex_dof_index (const unsigned int vertex, }; - template inline void @@ -299,7 +292,6 @@ DoFObjectAccessor<3,dim>::get_dof_indices (vector &dof_indices) co }; - template inline TriaIterator > @@ -316,7 +308,6 @@ DoFObjectAccessor<3,dim>::line (const unsigned int i) const }; - template inline TriaIterator > @@ -334,7 +325,6 @@ DoFObjectAccessor<3,dim>::quad (const unsigned int i) const }; - template inline TriaIterator > @@ -353,7 +343,6 @@ DoFObjectAccessor<3,dim>::child (const unsigned int i) const }; - template void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) { @@ -362,8 +351,6 @@ void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) }; - - /*------------------------- Functions: DoFCellAccessor -----------------------*/ @@ -385,7 +372,6 @@ DoFCellAccessor::neighbor (const unsigned int i) const }; - template inline TriaIterator > @@ -404,12 +390,4 @@ DoFCellAccessor::child (const unsigned int i) const }; - - - - - -/*---------------------------- dof_accessor.templates.h ---------------------------*/ -/* end of #ifndef __dof_accessor_templates_H */ #endif -/*---------------------------- dof_accessor.templates.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_constraints.h b/deal.II/deal.II/include/dofs/dof_constraints.h index b7755103f5..98ecb50dd1 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.h @@ -1,9 +1,17 @@ -/*---------------------------- dof_constraints.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __dof_constraints_H -#define __dof_constraints_H -/*---------------------------- dof_constraints.h ---------------------------*/ +//---------------------------- dof_constraints.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_constraints.h --------------------------- +#ifndef __deal2__dof_constraints_h +#define __deal2__dof_constraints_h #include @@ -13,7 +21,6 @@ #include - /** * This class represents the matrix denoting the distribution of the degrees * of freedom of hanging nodes. @@ -101,7 +108,7 @@ class ConstraintMatrix : public Subscriptor ConstraintMatrix (); - /** +/** * Add a new line to the matrix. */ void add_line (const unsigned int line); @@ -187,7 +194,7 @@ class ConstraintMatrix : public Subscriptor SparsityPattern &condensed) const; - /** +/** * This function does much the same as * the above one, except that it condenses * the matrix struct 'in-place'. It does @@ -274,8 +281,8 @@ class ConstraintMatrix : public Subscriptor template void set_zero (Vector &vec) const; - - /** + +/** * Print the constraint lines. Mainly for * debugging purposes. * @@ -290,7 +297,7 @@ class ConstraintMatrix : public Subscriptor void print (ostream &) const; - /** +/** * Exception */ DeclException0 (ExcMatrixIsClosed); @@ -397,9 +404,4 @@ class ConstraintMatrix : public Subscriptor }; - - -/*---------------------------- dof_constraints.h ---------------------------*/ -/* end of #ifndef __dof_constraints_H */ #endif -/*---------------------------- dof_constraints.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_constraints.templates.h b/deal.II/deal.II/include/dofs/dof_constraints.templates.h index cce8e27ab8..6e5f9eda86 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.templates.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.templates.h @@ -1,8 +1,17 @@ -/*---------------------------- dof_constraints.templates.h ---------------------------*/ -/* $Id$ */ -#ifndef __dof_constraints_templates_H -#define __dof_constraints_templates_H -/*---------------------------- dof_constraints.templates.h ---------------------------*/ +//---------------------------- dof_constraints.templates.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_constraints.templates.h --------------------------- +#ifndef __deal2__dof_constraints_templates_h +#define __deal2__dof_constraints_templates_h #include @@ -63,8 +72,8 @@ ConstraintMatrix::condense (const SparseMatrix &uncondensed, else new_line.push_back (row-shift); - - next_constraint = lines.begin(); + +next_constraint = lines.begin(); // note: in this loop we need not check // whether #next_constraint# is a valid // iterator, since #next_constraint# is @@ -134,7 +143,6 @@ ConstraintMatrix::condense (const SparseMatrix &uncondensed, }; - template void ConstraintMatrix::condense (SparseMatrix &uncondensed) const @@ -251,10 +259,6 @@ ConstraintMatrix::condense (SparseMatrix &uncondensed) const }; - - - - template void ConstraintMatrix::condense (const Vector &uncondensed, @@ -301,8 +305,8 @@ ConstraintMatrix::condense (const Vector &uncondensed, else new_line.push_back (row-shift); - - next_constraint = lines.begin(); + +next_constraint = lines.begin(); // note: in this loop we need not check // whether #next_constraint# is a valid // iterator, since #next_constraint# is @@ -356,7 +360,6 @@ ConstraintMatrix::condense (Vector &vec) const break; }; }; - template @@ -382,7 +385,6 @@ ConstraintMatrix::set_zero (Vector &vec) const break; }; }; - template @@ -431,8 +433,8 @@ ConstraintMatrix::distribute (const Vector &condensed, else old_line.push_back (row-shift); - - next_constraint = lines.begin(); + +next_constraint = lines.begin(); // note: in this loop we need not check // whether #next_constraint# is a valid // iterator, since #next_constraint# is @@ -477,10 +479,4 @@ ConstraintMatrix::distribute (Vector &vec) const }; - - - -/*---------------------------- dof_constraints.templates.h ---------------------------*/ -/* end of #ifndef __dof_constraints_templates_H */ #endif -/*---------------------------- dof_constraints.templates.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index c60f517129..67cc4a3b17 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -1,8 +1,19 @@ -/*---------------------------- dof.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __dof_H -#define __dof_H +//---------------------------- dof_handler.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_handler.h --------------------------- +#ifndef __deal2__dof_handler_h +#define __deal2__dof_handler_h + + /*---------------------------- dof.h ---------------------------*/ #include @@ -14,11 +25,6 @@ #include - - - - - /** * Define some types which differ between the dimensions. This class * is analogous to the \Ref{TriaDimensionInfo} class hierarchy. @@ -30,9 +36,6 @@ template class DoFDimensionInfo; - - - /** * Define some types for the DoF handling in one dimension. * @@ -62,10 +65,6 @@ class DoFDimensionInfo<1> { }; - - - - /** * Define some types for the DoF handling in two dimensions. * @@ -95,7 +94,6 @@ class DoFDimensionInfo<2> { }; - /** * Define some types for the DoF handling in two dimensions. * @@ -125,11 +123,6 @@ class DoFDimensionInfo<3> { }; - - - - - /** * Manage the distribution and numbering of the degrees of freedom for * non-multigrid algorithms. @@ -726,8 +719,8 @@ class DoFHandler : public Subscriptor, active_face_iterator last_active_face (const unsigned int level) const; //@} - - /*---------------------------------------*/ + +/*---------------------------------------*/ /** * @name Line iterator functions @@ -786,7 +779,7 @@ class DoFHandler : public Subscriptor, active_line_iterator end_active_line (const unsigned int level) const; - /** +/** * Return an iterator pointing to the * last line, used or not. */ @@ -883,7 +876,7 @@ class DoFHandler : public Subscriptor, active_quad_iterator end_active_quad (const unsigned int level) const; - /** +/** * Return an iterator pointing to the * last quad, used or not. */ @@ -1030,7 +1023,7 @@ class DoFHandler : public Subscriptor, /*---------------------------------------*/ - /** +/** * Return number of degrees of freedom. * Included in this number are those * DoFs which are constrained by @@ -1205,8 +1198,8 @@ class DoFHandler : public Subscriptor, * of freedom located at vertices. */ vector vertex_dofs; - - + + #if (__GNUC__==2) && (__GNUC_MINOR__ < 95) // this seems to be disallowed // by the standard, so gcc2.95 @@ -1223,10 +1216,6 @@ class DoFHandler : public Subscriptor, }; - - - - /* ----------------------- Inline functions ---------------------------------- */ @@ -1238,7 +1227,6 @@ unsigned int DoFHandler::n_dofs () const }; - template inline const FiniteElement & DoFHandler::get_fe () const @@ -1247,11 +1235,7 @@ const FiniteElement & DoFHandler::get_fe () const }; - - - - /*---------------------------- dof.h ---------------------------*/ -/* end of #ifndef __dof_H */ + #endif /*---------------------------- dof.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_levels.h b/deal.II/deal.II/include/dofs/dof_levels.h index c749c012e8..4bbdab445c 100644 --- a/deal.II/deal.II/include/dofs/dof_levels.h +++ b/deal.II/deal.II/include/dofs/dof_levels.h @@ -1,10 +1,17 @@ -/*---------------------------- dof_levels.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __dof_levels_H -#define __dof_levels_H -/*---------------------------- dof_levels.h ---------------------------*/ - +//---------------------------- dof_levels.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_levels.h --------------------------- +#ifndef __deal2__dof_levels_h +#define __deal2__dof_levels_h #include @@ -27,9 +34,6 @@ class DoFLevel }; - - - /** * Store the indices of the degrees of freedom which are located on the lines. * @@ -85,8 +89,6 @@ class DoFLevel<1> }; - - /** * Store the indices of the degrees of freedom which are located on quads. * See \Ref{DoFLevel<1>} for more information. @@ -102,7 +104,6 @@ class DoFLevel<2> : public DoFLevel<1> { }; - /** * Store the indices of the degrees of freedom which are located on hexhedra. * See \Ref{DoFLevel<1>} for more information. @@ -118,8 +119,4 @@ class DoFLevel<3> : public DoFLevel<2> { }; - -/*---------------------------- dof_levels.h ---------------------------*/ -/* end of #ifndef __dof_levels_H */ #endif -/*---------------------------- dof_levels.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 466e2be19f..5bcb95a0a4 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1,8 +1,19 @@ -/*---------------------------- dof_tools.h ---------------------------*/ -/* $Id$ */ -#ifndef __dof_tools_H -#define __dof_tools_H -/*---------------------------- dof_tools.h ---------------------------*/ +//---------------------------- dof_tools.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_tools.h --------------------------- +#ifndef __deal2__dof_tools_h +#define __deal2__dof_tools_h + + // Copyright Wolfgang Bangerth, Guido Kanschat, and others 1999 @@ -10,7 +21,6 @@ #include - /** * This is a collection of functions operating on, and manipulating * the numbers of degrees of freedom. The documentation of the member @@ -378,9 +388,4 @@ class DoFTools }; - - -/*---------------------------- dof_tools.h ---------------------------*/ -/* end of #ifndef __dof_tools_H */ #endif -/*---------------------------- dof_tools.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/geometry_info.h b/deal.II/deal.II/include/grid/geometry_info.h index a69159cccc..3daae3e46c 100644 --- a/deal.II/deal.II/include/grid/geometry_info.h +++ b/deal.II/deal.II/include/grid/geometry_info.h @@ -1,9 +1,17 @@ -/*---------------------------- geometry_info.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __geometry_info_H -#define __geometry_info_H -/*---------------------------- geometry_info.h ---------------------------*/ +//---------------------------- geometry_info.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- geometry_info.h --------------------------- +#ifndef __deal2__geometry_info_h +#define __deal2__geometry_info_h #include @@ -182,7 +190,6 @@ struct GeometryInfo }; - /*---------------------------- Inline functions --------------------------------*/ template<> @@ -219,8 +226,4 @@ unsigned int GeometryInfo<3>::child_cell_on_face (const unsigned int face, }; - -/*---------------------------- geometry_info.h ---------------------------*/ -/* end of #ifndef __geometry_info_H */ #endif -/*---------------------------- geometry_info.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h index 16deca0395..2766019c0b 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -1,8 +1,17 @@ -/*---------------------------- grid_generator.h ---------------------------*/ -/* $Id$ */ -#ifndef __grid_generator_H -#define __grid_generator_H -/*---------------------------- grid_generator.h ---------------------------*/ +//---------------------------- grid_generator.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_generator.h --------------------------- +#ifndef __deal2__grid_generator_h +#define __deal2__grid_generator_h #include @@ -10,8 +19,6 @@ #include - - /** * This class offers triangulations of some standard domains such as hypercubes, * hyperball and the like. Following is a list of domains that can be generated @@ -178,9 +185,4 @@ class GridGenerator }; - - -/*---------------------------- grid_generator.h ---------------------------*/ -/* end of #ifndef __grid_generator_H */ #endif -/*---------------------------- grid_generator.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/grid_in.h b/deal.II/deal.II/include/grid/grid_in.h index d827974552..fee29e5cd0 100644 --- a/deal.II/deal.II/include/grid/grid_in.h +++ b/deal.II/deal.II/include/grid/grid_in.h @@ -1,9 +1,17 @@ -/*---------------------------- grid_in.h ---------------------------*/ -/* $Id$ */ -#ifndef __grid_in_H -#define __grid_in_H -/*---------------------------- grid_in.h ---------------------------*/ - +//---------------------------- grid_in.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_in.h --------------------------- +#ifndef __deal2__grid_in_h +#define __deal2__grid_in_h #include @@ -14,7 +22,6 @@ #include - /** * This class implements an input mechanism for grid data. It allows to * read a grid structure into a triangulation object. Future versions @@ -178,11 +185,4 @@ class GridIn }; - - - - -/*---------------------------- grid_in.h ---------------------------*/ -/* end of #ifndef __grid_in_H */ #endif -/*---------------------------- grid_in.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/grid_out.h b/deal.II/deal.II/include/grid/grid_out.h index 92cbafbadf..a64027718c 100644 --- a/deal.II/deal.II/include/grid/grid_out.h +++ b/deal.II/deal.II/include/grid/grid_out.h @@ -1,15 +1,24 @@ -/*---------------------------- grid_out.h ---------------------------*/ -/* $Id$ */ -#ifndef __grid_out_H -#define __grid_out_H -/*---------------------------- grid_out.h ---------------------------*/ +//---------------------------- grid_out.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_out.h --------------------------- +#ifndef __deal2__grid_out_h +#define __deal2__grid_out_h + #include #include #include - /** * This class provides a means to output a triangulation to a file in different * formats. Presently provided are functions to write it in GNUPLOT and @@ -204,7 +213,7 @@ class GridOut }; - /** +/** * Flags describing the details of * output in GNUPLOT format. */ @@ -302,9 +311,9 @@ class GridOut const unsigned int size = 300, const double line_width = 0.5); }; - - - /** + + +/** * Flags describing the details of * output for encapsulated postscript * for all dimensions not explicitely @@ -360,10 +369,9 @@ class GridOut //#else //# warning Not implemented for gcc2.95 //#endif - - - - /** + + +/** * Declaration of a name for each of the * different output formats. */ @@ -490,7 +498,7 @@ class GridOut static string get_output_format_names (); - /** +/** * Exception */ DeclException0 (ExcInvalidState); @@ -538,10 +546,9 @@ class GridOut * function. */ EpsFlags<3> eps_flags_3; - - - /** + +/** * Write the grid information about * faces to #out#. Only those faces * are printed which are on the boundary @@ -593,9 +600,4 @@ class GridOut }; - - -/*---------------------------- grid_out.h ---------------------------*/ -/* end of #ifndef __grid_out_H */ #endif -/*---------------------------- grid_out.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/intergrid_map.h b/deal.II/deal.II/include/grid/intergrid_map.h index e07c6768f9..bc0bd22ddf 100644 --- a/deal.II/deal.II/include/grid/intergrid_map.h +++ b/deal.II/deal.II/include/grid/intergrid_map.h @@ -1,9 +1,17 @@ -/*---------------------------- intergrid_map.h ---------------------------*/ -/* $Id$ */ -#ifndef __intergrid_map_H -#define __intergrid_map_H -/*---------------------------- intergrid_map.h ---------------------------*/ - +//---------------------------- intergrid_map.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- intergrid_map.h --------------------------- +#ifndef __deal2__intergrid_map_h +#define __deal2__intergrid_map_h /** @@ -194,8 +202,4 @@ class InterGridMap }; - -/*---------------------------- intergrid_map.h ---------------------------*/ -/* end of #ifndef __intergrid_map_H */ #endif -/*---------------------------- intergrid_map.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/magic_numbers.h b/deal.II/deal.II/include/grid/magic_numbers.h index 0982b811c8..b6cfe71801 100644 --- a/deal.II/deal.II/include/grid/magic_numbers.h +++ b/deal.II/deal.II/include/grid/magic_numbers.h @@ -1,9 +1,17 @@ -/*---------------------------- magic_numbers.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __magic_numbers_H -#define __magic_numbers_H -/*---------------------------- magic_numbers.h ---------------------------*/ +//---------------------------- magic_numbers.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- magic_numbers.h --------------------------- +#ifndef __deal2__magic_numbers_h +#define __deal2__magic_numbers_h // This is a list of magic numbers used throughout the library. @@ -26,8 +34,4 @@ const unsigned int mn_persistent_tria_flags_begin= 0xa200; const unsigned int mn_persistent_tria_flags_end = 0xa201; - -/*---------------------------- magic_numbers.h ---------------------------*/ -/* end of #ifndef __magic_numbers_H */ #endif -/*---------------------------- magic_numbers.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/persistent_tria.h b/deal.II/deal.II/include/grid/persistent_tria.h index 90ae33a9d5..b1f22a8f6c 100644 --- a/deal.II/deal.II/include/grid/persistent_tria.h +++ b/deal.II/deal.II/include/grid/persistent_tria.h @@ -1,8 +1,17 @@ -/*---------------------------- persistent_tria.h ---------------------------*/ -/* $Id$ */ -#ifndef __persistent_tria_H -#define __persistent_tria_H -/*---------------------------- persistent_tria.h ---------------------------*/ +//---------------------------- persistent_tria.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- persistent_tria.h --------------------------- +#ifndef __deal2__persistent_tria_h +#define __deal2__persistent_tria_h #include @@ -223,8 +232,4 @@ class PersistentTriangulation : public Triangulation }; - -/*---------------------------- persistent_tria.h ---------------------------*/ -/* end of #ifndef __persistent_tria_H */ #endif -/*---------------------------- persistent_tria.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index 7540c12a74..71da673fcf 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -1,9 +1,18 @@ -/*---------------------------- tria.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998, 1999 */ -#ifndef __tria_H -#define __tria_H -/*---------------------------- tria.h ---------------------------*/ +//---------------------------- tria.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria.h --------------------------- +#ifndef __deal2__tria_h +#define __deal2__tria_h + #include #include @@ -35,16 +44,6 @@ enum MeshSmoothing { maximum_smoothing = 0xffff }; - - - - - - - - - - /*------------------------------------------------------------------------*/ @@ -65,9 +64,6 @@ struct CellData { }; - - - /** * Structure to be passed to the #Triangulation::create_triangulation# * function to describe boundary information. @@ -123,15 +119,9 @@ struct SubCellData { }; - - /*------------------------------------------------------------------------*/ - - - - /** * This class implements some types which differ between the dimensions. * Declare it to have a template parameter, but do not actually declare @@ -141,7 +131,6 @@ template class TriaDimensionInfo; - /** * This class implements some types which differ between the dimensions. * These are the declararions for the 1D case only. @@ -250,8 +239,6 @@ class TriaDimensionInfo<2> { }; - - /** * This class implements some types which differ between the dimensions. * These are the declararions for the 3D case only. @@ -294,7 +281,6 @@ class TriaDimensionInfo<3> { }; - /*------------------------------------------------------------------------*/ /** @@ -367,7 +353,6 @@ struct TriaNumberCache<1> }; - /** * Cache class used to store the number of used and active elements * (lines or quads etc) within the levels of a triangulation. This @@ -421,7 +406,6 @@ struct TriaNumberCache<2> : public TriaNumberCache<1> }; - /** * Cache class used to store the number of used and active elements * (lines or quads etc) within the levels of a triangulation. This @@ -475,8 +459,6 @@ struct TriaNumberCache<3> : public TriaNumberCache<2> }; - - /*------------------------------------------------------------------------*/ @@ -1796,9 +1778,9 @@ class Triangulation : public TriaDimensionInfo, */ void distort_random (const double factor, const bool keep_boundary=true); - - - /** + + +/** * @name Mesh refinement */ /*@{*/ @@ -2059,7 +2041,7 @@ class Triangulation : public TriaDimensionInfo, /*@}*/ - /** +/** * @name User flag handling */ /*@{*/ @@ -2242,8 +2224,8 @@ class Triangulation : public TriaDimensionInfo, */ active_cell_iterator end_active (const unsigned int level) const; - - /** + +/** * Return an iterator pointing to the * last cell, used or not. * @@ -2424,8 +2406,8 @@ class Triangulation : public TriaDimensionInfo, active_face_iterator last_active_face (const unsigned int level) const; /*@}*/ - - /*---------------------------------------*/ + +/*---------------------------------------*/ /** * @name Line iterator functions @@ -2905,7 +2887,7 @@ class Triangulation : public TriaDimensionInfo, /*@}*/ - /** +/** * @name Exceptions */ /*@{*/ @@ -3131,8 +3113,8 @@ class Triangulation : public TriaDimensionInfo, */ void update_number_cache_hexes (); - - /** + +/** * Array of pointers pointing to the * #TriangulationLevel# objects * storing the data on the different @@ -3223,15 +3205,6 @@ class Triangulation : public TriaDimensionInfo, }; - - - - -/*---------------------------- tria.h ---------------------------*/ -/* end of #ifndef __tria_H */ #endif -/*---------------------------- tria.h ---------------------------*/ - - diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 29a92ffbeb..4b5f455258 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -1,9 +1,17 @@ -/*---------------------------- tria_accessor.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_accessor_H -#define __tria_accessor_H -/*---------------------------- tria_accessor.h ---------------------------*/ +//---------------------------- tria_accessor.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_accessor.h --------------------------- +#ifndef __deal2__tria_accessor_h +#define __deal2__tria_accessor_h #include @@ -19,10 +27,6 @@ // inlining and thus faster code. - - - - /** * Implements the accessor class descibed in the documentation of * the iterator classes (see \Ref{TriaRawIterator}. @@ -62,8 +66,7 @@ class TriaAccessor tria (parent) {}; - - /** +/** * Copy operator. Since this is only * called from iterators, do not * return anything, since the @@ -239,7 +242,6 @@ class TriaAccessor }; - /** * Common template for line, quad, hex accessors. * According to #celldim# objects of this class represent lines, @@ -616,7 +618,6 @@ class TriaObjectAccessor : public TriaAccessor }; - /** * Closure class to stop induction of classes. Should never be called and thus * producesan error when created. @@ -646,8 +647,6 @@ class TriaObjectAccessor<0, dim> : public TriaAccessor }; - - /** * Accessor to dereference the data of lines. This accessor is used to * point to lines in #dim# space dimensions. There is a derived class @@ -933,9 +932,8 @@ class TriaObjectAccessor<1, dim> : public TriaAccessor */ void operator = (const TriaObjectAccessor<1, dim> &); - - protected: +protected: /**@name Advancement of iterators*/ /*@{*/ @@ -971,7 +969,6 @@ class TriaObjectAccessor<1, dim> : public TriaAccessor }; - /** * Accessor to dereference the data of quads. This accessor is used to * point to quads in #dim# space dimensions (only #dim>=2# seems reasonable @@ -1334,7 +1331,6 @@ class TriaObjectAccessor<2, dim> : public TriaAccessor }; - /** * Accessor to dereference the data of hexahedra. This accessor is used to * point to hexs in #dim# space dimensions (only #dim>=3# seems reasonable @@ -1699,10 +1695,6 @@ class TriaObjectAccessor<3, dim> : public TriaAccessor }; - - - - /** * This class allows access to a cell: a line in one dimension, a quad * in two dimension, etc. @@ -1826,7 +1818,7 @@ class CellAccessor : public TriaObjectAccessor void clear_refine_flag () const; - /** +/** * Return whether the coarsen flag * is set or not. */ @@ -1912,19 +1904,12 @@ class CellAccessor : public TriaObjectAccessor }; - // if in optimized mode: include more templates #ifndef DEBUG # include "tria_accessor.templates.h" #endif -/*---------------------------- tria_accessor.h ---------------------------*/ -/* end of #ifndef __tria_accessor_H */ #endif -/*---------------------------- tria_accessor.h ---------------------------*/ - - - diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index 569c6664af..c6280835c2 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -1,8 +1,17 @@ -/*---------------------------- tria_accessor.templates.h ---------------------------*/ -/* $Id$ */ -#ifndef __tria_accessor_templates_H -#define __tria_accessor_templates_H -/*---------------------------- tria_accessor.templates.h ---------------------------*/ +//---------------------------- tria_accessor.templates.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_accessor.templates.h --------------------------- +#ifndef __deal2__tria_accessor_templates_h +#define __deal2__tria_accessor_templates_h #include @@ -27,7 +36,6 @@ TriaAccessor::copy_from (const TriaAccessor &a) { tria = a.tria; }; - template inline @@ -39,7 +47,6 @@ TriaAccessor::operator == (const TriaAccessor &a) const { }; - template inline bool @@ -50,7 +57,6 @@ TriaAccessor::operator != (const TriaAccessor &a) const { }; - template inline int @@ -59,14 +65,12 @@ TriaAccessor::level () const { }; - template inline int TriaAccessor::index () const { return present_index; }; - template @@ -83,7 +87,6 @@ TriaAccessor::state () const { }; - template inline const Triangulation & @@ -93,12 +96,9 @@ TriaAccessor::get_triangulation () const }; - /*------------------------ Functions: LineAccessor ---------------------------*/ - - template inline bool @@ -108,8 +108,6 @@ TriaObjectAccessor<1,dim>::used () const { }; - - template inline bool @@ -119,7 +117,6 @@ TriaObjectAccessor<1,dim>::user_flag_set () const { }; - template inline void @@ -129,7 +126,6 @@ TriaObjectAccessor<1,dim>::set_user_flag () const { }; - template inline void @@ -139,8 +135,6 @@ TriaObjectAccessor<1,dim>::clear_user_flag () const { }; - - template inline TriaIterator > @@ -157,7 +151,6 @@ TriaObjectAccessor<1,dim>::child (const unsigned int i) const { }; - template inline int @@ -167,8 +160,6 @@ TriaObjectAccessor<1,dim>::child_index (unsigned int i) const { }; - - template inline bool @@ -178,7 +169,6 @@ TriaObjectAccessor<1,dim>::has_children () const { } - template inline unsigned int @@ -191,8 +181,6 @@ TriaObjectAccessor<1,dim>::max_refinement_depth () const child(1)->max_refinement_depth() + 1 }; return max (depths[0], depths[1]); }; - - template @@ -221,7 +209,6 @@ TriaObjectAccessor<1,dim>::operator ++ () { }; - template inline void @@ -246,12 +233,9 @@ TriaObjectAccessor<1,dim>::operator -- () { }; - - /*------------------------ Functions: QuadAccessor ---------------------------*/ - template inline bool @@ -261,8 +245,6 @@ TriaObjectAccessor<2,dim>::used () const { }; - - template inline bool @@ -272,7 +254,6 @@ TriaObjectAccessor<2,dim>::user_flag_set () const { }; - template inline void @@ -282,7 +263,6 @@ TriaObjectAccessor<2,dim>::set_user_flag () const { }; - template inline void @@ -292,8 +272,6 @@ TriaObjectAccessor<2,dim>::clear_user_flag () const { }; - - template inline TriaIterator > @@ -308,7 +286,6 @@ TriaObjectAccessor<2,dim>::line (const unsigned int i) const { }; - template inline unsigned int @@ -319,7 +296,6 @@ TriaObjectAccessor<2,dim>::line_index (unsigned int i) const { }; - template inline TriaIterator > @@ -336,7 +312,6 @@ TriaObjectAccessor<2,dim>::child (const unsigned int i) const { }; - template inline int TriaObjectAccessor<2,dim>::child_index (unsigned int i) const { @@ -345,8 +320,6 @@ int TriaObjectAccessor<2,dim>::child_index (unsigned int i) const { }; - - template inline bool @@ -356,7 +329,6 @@ TriaObjectAccessor<2,dim>::has_children () const { }; - template inline unsigned int @@ -374,7 +346,6 @@ TriaObjectAccessor<2,dim>::max_refinement_depth () const }; - template inline void @@ -400,7 +371,6 @@ TriaObjectAccessor<2,dim>::operator ++ () { }; - template inline void @@ -425,12 +395,9 @@ TriaObjectAccessor<2,dim>::operator -- () { }; - - /*------------------------ Functions: HexAccessor ---------------------------*/ - template inline bool @@ -440,7 +407,6 @@ TriaObjectAccessor<3,dim>::used () const { }; - template inline bool @@ -450,7 +416,6 @@ TriaObjectAccessor<3,dim>::user_flag_set () const { }; - template inline void @@ -460,7 +425,6 @@ TriaObjectAccessor<3,dim>::set_user_flag () const { }; - template inline void TriaObjectAccessor<3,dim>::clear_user_flag () const { @@ -469,8 +433,6 @@ void TriaObjectAccessor<3,dim>::clear_user_flag () const { }; - - template inline TriaIterator > @@ -508,7 +470,6 @@ TriaObjectAccessor<3,dim>::line (const unsigned int i) const { }; - template inline TriaIterator > @@ -524,7 +485,6 @@ TriaObjectAccessor<3,dim>::quad (const unsigned int i) const { }; - template inline unsigned int @@ -553,7 +513,6 @@ TriaObjectAccessor<3,dim>::line_index (unsigned int i) const { }; - template inline unsigned int @@ -564,7 +523,6 @@ TriaObjectAccessor<3,dim>::quad_index (unsigned int i) const { }; - template inline TriaIterator > @@ -581,7 +539,6 @@ TriaObjectAccessor<3,dim>::child (const unsigned int i) const { }; - template inline int TriaObjectAccessor<3,dim>::child_index (unsigned int i) const { @@ -590,7 +547,6 @@ int TriaObjectAccessor<3,dim>::child_index (unsigned int i) const { }; - template bool TriaObjectAccessor<3,dim>::has_children () const { Assert (state() == valid, ExcDereferenceInvalidObject()); @@ -598,7 +554,6 @@ bool TriaObjectAccessor<3,dim>::has_children () const { }; - template inline unsigned int @@ -622,7 +577,6 @@ TriaObjectAccessor<3,dim>::max_refinement_depth () const }; - template inline void @@ -648,7 +602,6 @@ TriaObjectAccessor<3,dim>::operator ++ () { }; - template inline void @@ -673,12 +626,9 @@ TriaObjectAccessor<3,dim>::operator -- () { }; - - /*------------------------ Functions: TriaObjectAccessor ---------------------------*/ - template inline bool @@ -689,7 +639,6 @@ TriaObjectAccessor::used () const }; - template inline bool @@ -700,7 +649,6 @@ TriaObjectAccessor::user_flag_set () const }; - template inline void @@ -711,7 +659,6 @@ TriaObjectAccessor::set_user_flag () const }; - template inline void TriaObjectAccessor::clear_user_flag () const @@ -721,8 +668,6 @@ void TriaObjectAccessor::clear_user_flag () const }; - - template inline TriaIterator > @@ -769,7 +714,6 @@ TriaObjectAccessor::line (const unsigned int i) const }; - template inline TriaIterator > @@ -788,7 +732,6 @@ TriaObjectAccessor::quad (const unsigned int i) const }; - template inline unsigned int @@ -828,7 +771,6 @@ TriaObjectAccessor::line_index (unsigned int i) const }; - template inline unsigned int @@ -841,7 +783,6 @@ TriaObjectAccessor::quad_index (unsigned int i) const }; - template inline TriaIterator > @@ -860,7 +801,6 @@ TriaObjectAccessor::child (const unsigned int i) const }; - template inline int TriaObjectAccessor::child_index (unsigned int i) const @@ -871,7 +811,6 @@ int TriaObjectAccessor::child_index (unsigned int i) const }; - template bool TriaObjectAccessor::has_children () const { @@ -880,7 +819,6 @@ bool TriaObjectAccessor::has_children () const }; - template inline unsigned int @@ -904,7 +842,6 @@ TriaObjectAccessor::max_refinement_depth () const }; - template inline void @@ -930,7 +867,6 @@ TriaObjectAccessor::operator ++ () { }; - template inline void @@ -956,8 +892,6 @@ TriaObjectAccessor::operator -- () }; - - /*------------------------ Functions: CellAccessor -----------------------*/ @@ -970,7 +904,6 @@ CellAccessor<1>::face (const unsigned int) const { }; - template <> inline Triangulation<2>::face_iterator @@ -979,7 +912,6 @@ CellAccessor<2>::face (const unsigned int i) const { }; - template <> inline Triangulation<3>::face_iterator @@ -988,7 +920,6 @@ CellAccessor<3>::face (const unsigned int i) const { }; - template inline int @@ -1000,7 +931,6 @@ CellAccessor::neighbor_index (const unsigned int i) const { }; - template inline int @@ -1012,8 +942,6 @@ CellAccessor::neighbor_level (const unsigned int i) const { }; - - template inline bool @@ -1030,7 +958,6 @@ CellAccessor::refine_flag_set () const { }; - template inline void @@ -1042,7 +969,6 @@ CellAccessor::set_refine_flag () const { }; - template inline void @@ -1052,7 +978,6 @@ CellAccessor::clear_refine_flag () const { }; - template inline bool @@ -1069,7 +994,6 @@ CellAccessor::coarsen_flag_set () const { }; - template inline void @@ -1081,7 +1005,6 @@ CellAccessor::set_coarsen_flag () const { }; - template inline void @@ -1091,7 +1014,6 @@ CellAccessor::clear_coarsen_flag () const { }; - template inline TriaIterator > @@ -1106,7 +1028,6 @@ CellAccessor::neighbor (const unsigned int i) const { }; - template inline TriaIterator > @@ -1121,7 +1042,6 @@ CellAccessor::child (const unsigned int i) const { }; - template inline bool @@ -1130,11 +1050,4 @@ CellAccessor::active () const { }; - - - - -/*---------------------------- tria_accessor.templates.h ---------------------------*/ -/* end of #ifndef __tria_accessor_templates_H */ #endif -/*---------------------------- tria_accessor.templates.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 233564c814..4d0ed02d82 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -1,8 +1,19 @@ -/*---------------------------- boundary-function.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_boundary_H -#define __tria_boundary_H +//---------------------------- tria_boundary.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_boundary.h --------------------------- +#ifndef __deal2__tria_boundary_h +#define __deal2__tria_boundary_h + + /*---------------------------- boundary-function.h ---------------------------*/ #include @@ -11,7 +22,6 @@ #include - /** * This class is used to represent a boundary to a triangulation. * When a triangulation creates a new vertex on the boundary of the @@ -113,9 +123,6 @@ class Boundary : public Subscriptor { }; - - - /** * Specialisation of \Ref{Boundary}, which places the new point right * into the middle of the given points. The middle is defined as the @@ -156,10 +163,7 @@ class StraightBoundary : public Boundary { }; - - - /*---------------------------- boundary-function.h ---------------------------*/ -/* end of #ifndef __tria_boundary_H */ + #endif /*---------------------------- boundary-function.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_boundary_lib.h b/deal.II/deal.II/include/grid/tria_boundary_lib.h index 5d17dcc0da..b919762350 100644 --- a/deal.II/deal.II/include/grid/tria_boundary_lib.h +++ b/deal.II/deal.II/include/grid/tria_boundary_lib.h @@ -1,15 +1,22 @@ -/*---------------------------- tria_boundary_lib.h ---------------------------*/ -/* $Id$ */ -#ifndef __tria_boundary_lib_H -#define __tria_boundary_lib_H -/*---------------------------- tria_boundary_lib.h ---------------------------*/ +//---------------------------- tria_boundary_lib.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_boundary_lib.h --------------------------- +#ifndef __deal2__tria_boundary_lib_h +#define __deal2__tria_boundary_lib_h #include - - /** * Specialisation of \Ref{Boundary}, which places the new point on * the boundary of a ball in arbitrary dimension. It works by projecting @@ -73,7 +80,6 @@ class HyperBallBoundary : public StraightBoundary { }; - /** * Variant of #HyperBallBoundary# which denotes a half hyper ball * where the first coordinate is restricted to the range $x>=0$ (or @@ -108,8 +114,6 @@ class HalfHyperBallBoundary : public HyperBallBoundary { get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const; }; - - /** * Class describing the boundaries of a hyper shell. Only the center @@ -150,9 +154,4 @@ class HyperShellBoundary : public StraightBoundary }; - - -/*---------------------------- tria_boundary_lib.h ---------------------------*/ -/* end of #ifndef __tria_boundary_lib_H */ #endif -/*---------------------------- tria_boundary_lib.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_hex.h b/deal.II/deal.II/include/grid/tria_hex.h index 186af1ac36..386936591e 100644 --- a/deal.II/deal.II/include/grid/tria_hex.h +++ b/deal.II/deal.II/include/grid/tria_hex.h @@ -1,9 +1,17 @@ -/*---------------------------- tria_hex.h ---------------------------*/ -/* $Id$ */ -#ifndef __tria_hex_H -#define __tria_hex_H -/*---------------------------- tria_hex.h ---------------------------*/ - +//---------------------------- tria_hex.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_hex.h --------------------------- +#ifndef __deal2__tria_hex_h +#define __deal2__tria_hex_h #include @@ -67,8 +75,6 @@ class Hexahedron { }; - - /*----------------------------- Inline Function: Hexahedron ------------------------*/ @@ -85,7 +91,6 @@ Hexahedron::Hexahedron (const int i0, const int i1, }; - inline int Hexahedron::quad (const int i) const { Assert ((i>=0) && (i<6), @@ -94,7 +99,6 @@ int Hexahedron::quad (const int i) const { }; - inline void Hexahedron::set_quad (const int i, const int index) { Assert ((i>=0) && (i<6), @@ -103,9 +107,4 @@ void Hexahedron::set_quad (const int i, const int index) { }; - - -/*---------------------------- tria_hex.h ---------------------------*/ -/* end of #ifndef __tria_hex_H */ #endif -/*---------------------------- tria_hex.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 19cc636837..d54fdd6fb2 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -1,11 +1,21 @@ -/*---------------------------- tria-iterator.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_iterator_H -#define __tria_iterator_H -/*---------------------------- tria-iterator.h ---------------------------*/ +//---------------------------- tria_iterator.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_iterator.h --------------------------- +#ifndef __deal2__tria_iterator_h +#define __deal2__tria_iterator_h +/*---------------------------- tria-iterator.h ---------------------------*/ + #include #include @@ -21,9 +31,6 @@ // inlining and thus faster code. - - - /** * This class implements an iterator, analogous to those of the standard * template library (STL). It fulfills the requirements of a bidirectional iterator. @@ -446,9 +453,8 @@ class TriaRawIterator : public bidirectional_iterator { */ void print (ostream &out) const; - - - /**@name Exceptions*/ + +/**@name Exceptions*/ /*@{*/ /** * Exception @@ -471,7 +477,7 @@ class TriaRawIterator : public bidirectional_iterator { Accessor accessor; - /** +/** * Make all other iterator class templates * friends of this class. This is * necessary for the implementation of @@ -490,11 +496,6 @@ class TriaRawIterator : public bidirectional_iterator { }; - - - - - /** * This specialization of \Ref{TriaRawIterator} provides access only to the * {\it used} lines, quads, cells, etc. @@ -640,11 +641,6 @@ class TriaIterator : public TriaRawIterator { }; - - - - - /** * This specialization of \Ref{TriaIterator} provides access only to the * {\it active} lines, quads, cells, etc. An active cell is a cell which is not @@ -811,14 +807,9 @@ class TriaActiveIterator : public TriaIterator { }; - - - - /*----------------------- Inline functions -------------------*/ - template inline TriaRawIterator::TriaRawIterator (const Accessor &a) : @@ -826,7 +817,6 @@ TriaRawIterator::TriaRawIterator (const Accessor &a) : {}; - template template inline @@ -835,7 +825,6 @@ TriaRawIterator::TriaRawIterator (const TriaRawIterator inline const Accessor & @@ -845,8 +834,6 @@ TriaRawIterator::operator * () const { }; - - template inline Accessor & @@ -856,7 +843,6 @@ TriaRawIterator::operator * () { }; - template inline const Accessor * @@ -865,7 +851,6 @@ TriaRawIterator::operator -> () const { }; - template inline Accessor * @@ -874,8 +859,6 @@ TriaRawIterator::operator -> () { }; - - template inline IteratorState @@ -884,7 +867,6 @@ TriaRawIterator::state () const { }; - // sorry that the declaration of this function looks so ragged; I had // to do it this way since otherwise doc++ could not parse it correctly. template @@ -905,7 +887,6 @@ TriaRawIterator::operator < (const TriaRawIterator &i) const { }; - template inline TriaRawIterator & @@ -917,7 +898,6 @@ TriaRawIterator::operator ++ () { }; - template inline TriaRawIterator & @@ -929,7 +909,6 @@ TriaRawIterator::operator -- () { }; - template inline void @@ -938,7 +917,6 @@ TriaRawIterator::print (ostream &out) const { }; - template template inline @@ -947,7 +925,6 @@ TriaIterator::TriaIterator (const TriaIterator {}; - template template inline @@ -968,7 +945,6 @@ TriaIterator::TriaIterator (const TriaRawIterator template inline @@ -977,7 +953,6 @@ TriaActiveIterator::TriaActiveIterator (const TriaActiveIterator template inline @@ -998,9 +973,6 @@ TriaActiveIterator::TriaActiveIterator (const TriaRawIterator inline ostream & operator << (ostream &out, const TriaRawIterator &i) { @@ -1009,7 +981,6 @@ ostream & operator << (ostream &out, const TriaRawIterator &i) { }; - template inline ostream & operator << (ostream &out, const TriaIterator &i) { @@ -1018,7 +989,6 @@ ostream & operator << (ostream &out, const TriaIterator &i) { }; - template inline ostream & operator << (ostream &out, const TriaActiveIterator &i) { @@ -1027,7 +997,6 @@ ostream & operator << (ostream &out, const TriaActiveIterator &i) }; - // if in optimized mode: include more templates #ifndef DEBUG # include "tria_iterator.templates.h" @@ -1035,7 +1004,7 @@ ostream & operator << (ostream &out, const TriaActiveIterator &i) /*---------------------------- tria-iterator.h ---------------------------*/ -/* end of #ifndef __tria_iterator_H */ + #endif /*---------------------------- tria-iterator.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_iterator.templates.h b/deal.II/deal.II/include/grid/tria_iterator.templates.h index 70f2024830..e22cae5eb3 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -1,9 +1,18 @@ -/*---------------------------- tria_iterator.templates.h ---------------------------*/ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -/* $Id$ */ -#ifndef __tria_iterator_templates_H -#define __tria_iterator_templates_H -/*---------------------------- tria_iterator.templates.h ---------------------------*/ +//---------------------------- tria_iterator.templates.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_iterator.templates.h --------------------------- +#ifndef __deal2__tria_iterator_templates_h +#define __deal2__tria_iterator_templates_h + #include #include @@ -15,7 +24,6 @@ */ - /*------------------------ Functions: TriaRawIterator ------------------*/ @@ -25,14 +33,12 @@ TriaRawIterator::TriaRawIterator () : accessor (0, -2, -2, 0) {}; - template inline TriaRawIterator::TriaRawIterator (const TriaRawIterator &i) : accessor (i.accessor) {}; - template inline TriaRawIterator::TriaRawIterator (Triangulation *parent, @@ -42,7 +48,6 @@ TriaRawIterator::TriaRawIterator (Triangulation *parent, accessor (parent, level, index, local_data) {}; - template inline TriaRawIterator & @@ -53,7 +58,6 @@ TriaRawIterator::operator = (const TriaRawIterator & }; - template inline bool @@ -62,7 +66,6 @@ TriaRawIterator::operator == (const TriaRawIterator }; - template inline bool @@ -82,7 +85,6 @@ TriaRawIterator::operator != (const TriaRawIterator }; - template inline TriaRawIterator @@ -94,7 +96,6 @@ TriaRawIterator::operator ++ (int) { }; - template inline TriaRawIterator @@ -106,8 +107,6 @@ TriaRawIterator::operator -- (int) { }; - - /*----------------------- functions: TriaIterator ---------------*/ @@ -123,7 +122,6 @@ TriaIterator::TriaIterator (const TriaIterator &i) : TriaRawIterator (static_cast >(i)) {}; - template inline TriaIterator::TriaIterator (const TriaRawIterator &i) : @@ -143,7 +141,6 @@ TriaIterator::TriaIterator (const TriaRawIterator &i }; - template inline TriaIterator::TriaIterator (Triangulation *parent, @@ -166,7 +163,6 @@ TriaIterator::TriaIterator (Triangulation *parent, }; - template inline TriaIterator & @@ -196,7 +192,6 @@ TriaIterator::operator = (const TriaRawIterator &i) }; - template inline TriaIterator & TriaIterator::operator ++ () { @@ -208,7 +203,6 @@ TriaIterator & TriaIterator::operator ++ () { }; - template inline TriaIterator TriaIterator::operator ++ (int) { @@ -219,7 +213,6 @@ TriaIterator TriaIterator::operator ++ (int) { }; - template inline TriaIterator & @@ -243,7 +236,6 @@ TriaIterator::operator -- (int) { }; - /*----------------------- functions: TriaActiveIterator ---------------*/ @@ -253,14 +245,12 @@ TriaActiveIterator::TriaActiveIterator () : TriaIterator () {}; - template inline TriaActiveIterator::TriaActiveIterator (const TriaActiveIterator &i) : TriaIterator (static_cast >(i)) {}; - template inline TriaActiveIterator::TriaActiveIterator (const TriaRawIterator &i) : @@ -299,7 +289,6 @@ TriaActiveIterator::TriaActiveIterator (const TriaIterator inline TriaActiveIterator::TriaActiveIterator (Triangulation *parent, @@ -322,7 +311,6 @@ TriaActiveIterator::TriaActiveIterator (Triangulation *parent }; - template inline TriaActiveIterator & @@ -332,7 +320,6 @@ TriaActiveIterator::operator = (const TriaActiveIterator inline TriaActiveIterator & @@ -353,7 +340,6 @@ TriaActiveIterator::operator = (const TriaRawIterator inline TriaActiveIterator & @@ -374,7 +360,6 @@ TriaActiveIterator::operator = (const TriaIterator & }; - template inline TriaActiveIterator & @@ -387,7 +372,6 @@ TriaActiveIterator::operator ++ () { }; - template inline TriaActiveIterator @@ -399,7 +383,6 @@ TriaActiveIterator::operator ++ (int) { }; - template inline TriaActiveIterator & @@ -412,7 +395,6 @@ TriaActiveIterator::operator -- () { }; - template inline TriaActiveIterator TriaActiveIterator::operator -- (int) { @@ -423,9 +405,4 @@ TriaActiveIterator TriaActiveIterator::operator -- ( }; - - -/*---------------------------- tria_iterator.templates.h ---------------------------*/ -/* end of #ifndef __tria_iterator_templates_H */ #endif -/*---------------------------- tria_iterator.templates.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_iterator_base.h b/deal.II/deal.II/include/grid/tria_iterator_base.h index 696b38426e..5d1c999498 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_base.h +++ b/deal.II/deal.II/include/grid/tria_iterator_base.h @@ -1,8 +1,17 @@ -/*---------------------------- tria_iterator_base.h ---------------------------*/ -/* $Id$ */ -#ifndef __tria_iterator_base_H -#define __tria_iterator_base_H -/*---------------------------- tria_iterator_base.h ---------------------------*/ +//---------------------------- tria_iterator_base.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_iterator_base.h --------------------------- +#ifndef __deal2__tria_iterator_base_h +#define __deal2__tria_iterator_base_h /** @@ -16,8 +25,4 @@ enum IteratorState { }; - -/*---------------------------- tria_iterator_base.h ---------------------------*/ -/* end of #ifndef __tria_iterator_base_H */ #endif -/*---------------------------- tria_iterator_base.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_levels.h b/deal.II/deal.II/include/grid/tria_levels.h index d7c30b0aca..b7444a186c 100644 --- a/deal.II/deal.II/include/grid/tria_levels.h +++ b/deal.II/deal.II/include/grid/tria_levels.h @@ -1,10 +1,17 @@ -/*---------------------------- tria_levels.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_levels_H -#define __tria_levels_H -/*---------------------------- tria_levels.h ---------------------------*/ - +//---------------------------- tria_levels.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_levels.h --------------------------- +#ifndef __deal2__tria_levels_h +#define __deal2__tria_levels_h #include @@ -168,7 +175,6 @@ class TriangulationLevel<0> { }; - /** * Store all information which belongs to one level of the multilevel hierarchy. * @@ -314,8 +320,6 @@ class TriangulationLevel<1> : public TriangulationLevel<0> { }; - - /** * Store all information which belongs to one level of the multilevel hierarchy. * @@ -388,8 +392,8 @@ class TriangulationLevel<2> : public TriangulationLevel<1> */ vector material_id; - - /** + +/** * Pointer which is not used by the * library but may be accessed an set * by the user to handle data local to @@ -422,8 +426,6 @@ class TriangulationLevel<2> : public TriangulationLevel<1> }; - - /** * Store all information which belongs to one level of the multilevel hierarchy. * @@ -496,8 +498,8 @@ class TriangulationLevel<3> : public TriangulationLevel<2> */ vector material_id; - - /** + +/** * Pointer which is not used by the * library but may be accessed an set * by the user to handle data local to @@ -530,9 +532,4 @@ class TriangulationLevel<3> : public TriangulationLevel<2> }; - - -/*---------------------------- tria_levels.h ---------------------------*/ -/* end of #ifndef __tria_levels_H */ #endif -/*---------------------------- tria_levels.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_line.h b/deal.II/deal.II/include/grid/tria_line.h index e4eec3876c..79e3fac168 100644 --- a/deal.II/deal.II/include/grid/tria_line.h +++ b/deal.II/deal.II/include/grid/tria_line.h @@ -1,9 +1,18 @@ -/*---------------------------- tria_line.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_line_H -#define __tria_line_H -/*---------------------------- tria_line.h ---------------------------*/ +//---------------------------- tria_line.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_line.h --------------------------- +#ifndef __deal2__tria_line_h +#define __deal2__tria_line_h + #include @@ -58,8 +67,6 @@ class Line { }; - - /*----------------------------- Inline Function: Line ------------------------*/ @@ -86,8 +93,4 @@ void Line::set_vertex (const int i, const int index) { }; - -/*---------------------------- tria_line.h ---------------------------*/ -/* end of #ifndef __tria_line_H */ #endif -/*---------------------------- tria_line.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_quad.h b/deal.II/deal.II/include/grid/tria_quad.h index 0fddc1bbb5..4a996f909e 100644 --- a/deal.II/deal.II/include/grid/tria_quad.h +++ b/deal.II/deal.II/include/grid/tria_quad.h @@ -1,16 +1,22 @@ -/*---------------------------- tria_quad.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __tria_quad_H -#define __tria_quad_H -/*---------------------------- tria_quad.h ---------------------------*/ +//---------------------------- tria_quad.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- tria_quad.h --------------------------- +#ifndef __deal2__tria_quad_h +#define __deal2__tria_quad_h #include - - /** * #Quad#s denote the fundamental entities of triangulations in two dimensions * and the boundaries of hexaeders in three dimensions. They are @@ -65,8 +71,6 @@ class Quad { }; - - /*----------------------------- Inline Function: Quad ------------------------*/ @@ -79,7 +83,6 @@ Quad::Quad (const int i0, const int i1, const int i2, const int i3) { }; - inline int Quad::line (const int i) const { Assert ((i>=0) && (i<4), @@ -88,7 +91,6 @@ int Quad::line (const int i) const { }; - inline void Quad::set_line (const int i, const int index) { Assert ((i>=0) && (i<4), @@ -97,8 +99,4 @@ void Quad::set_line (const int i, const int index) { }; - -/*---------------------------- tria_quad.h ---------------------------*/ -/* end of #ifndef __tria_quad_H */ #endif -/*---------------------------- tria_quad.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index ccc5e91787..4d6b2e755e 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -1,10 +1,21 @@ -/*---------------------------- mgbase.h ---------------------------*/ -/* $Id$ */ -#ifndef __mgbase_H -#define __mgbase_H -/*---------------------------- mgbase.h ---------------------------*/ +//---------------------------- mg_base.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- mg_base.h --------------------------- +#ifndef __deal2__mg_base_h +#define __deal2__mg_base_h +/*---------------------------- mgbase.h ---------------------------*/ + #include #include @@ -16,8 +27,6 @@ #include - - /** * An array with an object for each level. The purpose of this class * is mostly to allow access by level number, even if the lower levels @@ -99,9 +108,6 @@ class MGLevelObject : public Subscriptor }; - - - /** * Abstract base class for coarse grid solvers. The interface of a * function call operator is defined to execute coarse grid solution @@ -136,7 +142,6 @@ class MGCoarseGridSolver : public Subscriptor }; - /** * Coarse grid solver using LAC iterative methods. * This is a little wrapper, transforming a triplet of iterative @@ -190,11 +195,6 @@ class MGCoarseGridLACIteration : public MGCoarseGridSolver }; - - - - - /** * Base class used to declare the operations needed by a concrete class * implementing prolongation and restriction of vectors in the multigrid @@ -260,12 +260,6 @@ class MGTransferBase : public Subscriptor }; - - - - - - /** * Basic class for preconditioning by multigrid. * @@ -406,7 +400,6 @@ class MGBase : public Subscriptor }; - /** * Multi-level preconditioner. * Here, we collect all information needed for multi-level preconditioning @@ -469,8 +462,6 @@ class PreconditionMG }; - - /* ------------------------------------------------------------------- */ @@ -484,7 +475,6 @@ MGLevelObject::MGLevelObject(const unsigned int min, }; - template Object & MGLevelObject::operator[] (const unsigned int i) @@ -505,7 +495,6 @@ MGLevelObject::operator[] (const unsigned int i) const } - template void MGLevelObject::resize (const unsigned int new_minlevel, @@ -519,7 +508,6 @@ MGLevelObject::resize (const unsigned int new_minlevel, }; - template void MGLevelObject::clear () @@ -538,7 +526,6 @@ MGLevelObject::get_minlevel () const }; - template unsigned int MGLevelObject::get_maxlevel () const @@ -547,7 +534,6 @@ MGLevelObject::get_maxlevel () const }; - /* ------------------ Functions for MGCoarseGridLACIteration ------------ */ @@ -562,7 +548,6 @@ MGCoarseGridLACIteration::MGCoarseGridLACIteration(SOLVER {}; - template void MGCoarseGridLACIteration::operator() (const unsigned int /* level */, @@ -573,10 +558,6 @@ MGCoarseGridLACIteration::operator() (const unsigned int } - - - - /* ------------------------------------------------------------------- */ @@ -593,7 +574,6 @@ PreconditionMG::PreconditionMG(MG &mg, {} - template void PreconditionMG::operator() (VECTOR &dst, @@ -605,8 +585,7 @@ PreconditionMG::operator() (VECTOR &dst, } - /*---------------------------- mgbase.h ---------------------------*/ -/* end of #ifndef __mgbase_H */ + #endif /*---------------------------- mgbase.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index 05f401412e..bd9eb79008 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -1,16 +1,22 @@ -/*---------------------------- mg_dof_accessor.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __mg_dof_accessor_H -#define __mg_dof_accessor_H -/*---------------------------- mg_dof_accessor.h ---------------------------*/ +//---------------------------- mg_dof_accessor.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- mg_dof_accessor.h --------------------------- +#ifndef __deal2__mg_dof_accessor_h +#define __deal2__mg_dof_accessor_h #include - - /** * Define the basis for accessors to the degrees of freedom for * a multigrid DoF handler object. @@ -116,7 +122,6 @@ class MGDoFObjectAccessor_Inheritance }; - /** * This is a switch class which only declares a #typdef#. It is meant to * determine which class a #DoFObjectAccessor# class is to be derived @@ -142,12 +147,9 @@ class MGDoFObjectAccessor_Inheritance }; - - /* -------------------------------------------------------------------------- */ - /** * Common template for line, quad, hex. * @@ -161,7 +163,6 @@ class MGDoFObjectAccessor : public MGDoFAccessor, {}; - /** * Closure class. */ @@ -185,7 +186,6 @@ class MGDoFObjectAccessor<0, dim> }; - /** * Grant access to the degrees of freedom located on lines. * This class follows mainly the route laid out by the accessor library @@ -326,10 +326,6 @@ class MGDoFObjectAccessor<1, dim> : public MGDoFAccessor, }; - - - - /** * Grant access to the multilevel degrees of freedom located on quads. * @@ -455,8 +451,6 @@ class MGDoFObjectAccessor<2, dim> : public MGDoFAccessor, }; - - /** * Grant access to the multilevel degrees of freedom located on hexhedra. * @@ -588,7 +582,6 @@ class MGDoFObjectAccessor<3, dim> : public MGDoFAccessor, }; - /** * Grant access to the degrees of freedom on a cell. In fact, since all * access to the degrees of freedom has been enabled by the classes @@ -662,12 +655,4 @@ class MGDoFCellAccessor : public MGDoFObjectAccessor { }; - - - - - -/*---------------------------- mg_dof_accessor.h ---------------------------*/ -/* end of #ifndef __mg_dof_accessor_H */ #endif -/*---------------------------- mg_dof_accessor.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 48c55b0b80..287d9322c1 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -1,15 +1,25 @@ -/*---------------------------- mg_dof.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __mg_dof_H -#define __mg_dof_H +//---------------------------- mg_dof_handler.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- mg_dof_handler.h --------------------------- +#ifndef __deal2__mg_dof_handler_h +#define __deal2__mg_dof_handler_h + + /*---------------------------- mg_dof.h ---------------------------*/ #include - /** * Define some types which differ between the dimensions. This class * is analogous to the \Ref{TriaDimensionInfo} class hierarchy. @@ -21,9 +31,6 @@ template class MGDoFDimensionInfo; - - - /** * Define some types for the DoF handling in one dimension. * @@ -53,10 +60,6 @@ class MGDoFDimensionInfo<1> { }; - - - - /** * Define some types for the DoF handling in two dimensions. * @@ -86,8 +89,6 @@ class MGDoFDimensionInfo<2> { }; - - /** * Define some types for the DoF handling in two dimensions. * @@ -117,8 +118,6 @@ class MGDoFDimensionInfo<3> { }; - - /** * This class manages degrees of freedom for a multilevel hierarchy of * grids. It does mostly the same as does the #DoDHandler# class, but @@ -450,8 +449,8 @@ class MGDoFHandler : public DoFHandler active_face_iterator last_active_face (const unsigned int level) const; //@} - - /*---------------------------------------*/ + +/*---------------------------------------*/ /** * @name Line iterator functions @@ -510,7 +509,7 @@ class MGDoFHandler : public DoFHandler active_line_iterator end_active_line (const unsigned int level) const; - /** +/** * Return an iterator pointing to the * last line, used or not. */ @@ -607,7 +606,7 @@ class MGDoFHandler : public DoFHandler active_quad_iterator end_active_quad (const unsigned int level) const; - /** +/** * Return an iterator pointing to the * last quad, used or not. */ @@ -704,7 +703,7 @@ class MGDoFHandler : public DoFHandler active_hex_iterator end_active_hex (const unsigned int level) const; - /** +/** * Return an iterator pointing to the * last hex, used or not. */ @@ -896,7 +895,7 @@ class MGDoFHandler : public DoFHandler }; - /** +/** * Distribute dofs on the given cell, * with new dofs starting with index * #next_free_dof#. Return the next @@ -962,11 +961,6 @@ class MGDoFHandler : public DoFHandler #endif }; - - - - - /* ----------------------- Inline functions of MGVertexDoFs -------------------*/ @@ -986,8 +980,6 @@ void MGDoFHandler::MGVertexDoFs::set_index (const unsigned int level, }; - - template inline unsigned int @@ -1003,8 +995,7 @@ MGDoFHandler::MGVertexDoFs::get_index (const unsigned int level, }; - /*---------------------------- mg_dof.h ---------------------------*/ -/* end of #ifndef __mg_dof_H */ + #endif /*---------------------------- mg_dof.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_tools.h b/deal.II/deal.II/include/multigrid/mg_dof_tools.h index 8926c91bb9..5c23a77418 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_tools.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_tools.h @@ -1,8 +1,17 @@ -/*---------------------------- mg_dof_tools.h ---------------------------*/ -/* $Id$ */ -#ifndef __mg_dof_tools_H -#define __mg_dof_tools_H -/*---------------------------- mg_dof_tools.h ---------------------------*/ +//---------------------------- mg_dof_tools.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- mg_dof_tools.h --------------------------- +#ifndef __deal2__mg_dof_tools_h +#define __deal2__mg_dof_tools_h #include @@ -62,8 +71,4 @@ class MGDoFTools }; - -/*---------------------------- mg_dof_tools.h ---------------------------*/ -/* end of #ifndef __mg_dof_tools_H */ #endif -/*---------------------------- mg_dof_tools.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index 49e3688103..aff3374722 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -1,8 +1,17 @@ -/*---------------------------- mg_smoother.h ---------------------------*/ -/* $Id$ */ -#ifndef __mg_smoother_H -#define __mg_smoother_H -/*---------------------------- mg_smoother.h ---------------------------*/ +//---------------------------- mg_smoother.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- mg_smoother.h --------------------------- +#ifndef __deal2__mg_smoother_h +#define __deal2__mg_smoother_h #include @@ -12,7 +21,6 @@ #include - /** * Abstract base class for multigrid smoothers. * In fact, this class only provides the interface of the smoothing function. @@ -54,9 +62,6 @@ class MGSmootherBase : public Subscriptor }; - - - /** * Smoother doing nothing. This class is not useful for many applications other * than for testing some multigrid procedures. Also some applications might @@ -84,7 +89,6 @@ class MGSmootherIdentity : public MGSmootherBase }; - /** * Base class for multigrid smoothers. It declares the interface * to smoothers by inheriting #MGSmootherBase# and implements some functionality for setting @@ -185,8 +189,6 @@ class MGSmoother : public MGSmootherBase }; - - /** * Implementation of a smoother using matrix builtin relaxation methods. * @@ -264,7 +266,6 @@ class MGSmootherRelaxation : public MGSmoother }; - /* ------------------------------- Inline functions -------------------------- */ inline @@ -281,8 +282,6 @@ MGSmoother::get_steps() const return steps; } -/*---------------------------- mg_smoother.h ---------------------------*/ -/* end of #ifndef __mg_smoother_H */ + #endif -/*---------------------------- mg_smoother.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h index 4854e02f62..cc98583b82 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h @@ -16,7 +16,6 @@ MGSmootherRelaxation::MGSmootherRelaxation (const MGDoFHandler {}; - template void MGSmootherRelaxation::smooth (const unsigned int level, diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h index 602e11bafa..cd98244072 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.h +++ b/deal.II/deal.II/include/multigrid/multigrid.h @@ -1,8 +1,18 @@ -/*---------------------------- multigrid.h ---------------------------*/ -/* $Id$ */ -#ifndef __multigrid_H -#define __multigrid_H -/*---------------------------- multigrid.h ---------------------------*/ +//---------------------------- multigrid.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- multigrid.h --------------------------- +#ifndef __deal2__multigrid_h +#define __deal2__multigrid_h + #include #include @@ -15,7 +25,6 @@ #include - /** * Implementation of multigrid with matrices. * While #MGBase# was only an abstract framework for the V-cycle, @@ -108,7 +117,7 @@ class Multigrid : public MGBase SmartPointer > mg_dof_handler; - /** +/** * Sparsity patterns for each level. */ SmartPointer > level_sparsities; @@ -130,9 +139,6 @@ class Multigrid : public MGBase }; - - - /** * Implementation of the #MGTransferBase# interface for which the transfer * operations are prebuilt upon construction of the object of this class as @@ -219,8 +225,6 @@ class MGTransferPrebuilt : public MGTransferBase }; - - /* --------------------------- inline functions --------------------- */ @@ -236,7 +240,4 @@ Multigrid::get_matrix (const unsigned int level) const } -/*---------------------------- multigrid.h ---------------------------*/ -/* end of #ifndef __multigrid_H */ #endif -/*---------------------------- multigrid.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 412a840924..f93caa8f46 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -1,8 +1,17 @@ -/*---------------------------- multigrid.templates.h ---------------------------*/ -/* $Id$ */ -#ifndef __multigrid_templates_H -#define __multigrid_templates_H -/*---------------------------- multigrid.templates.h ---------------------------*/ +//---------------------------- multigrid.templates.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- multigrid.templates.h --------------------------- +#ifndef __deal2__multigrid_templates_h +#define __deal2__multigrid_templates_h #include @@ -156,9 +165,4 @@ Multigrid::copy_from_mg(Vector &dst) const } - - -/*---------------------------- multigrid.templates.h ---------------------------*/ -/* end of #ifndef __multigrid.templates_H */ #endif -/*---------------------------- multigrid.templates.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/assembler.h b/deal.II/deal.II/include/numerics/assembler.h index 0386f7ff93..03c28129e4 100644 --- a/deal.II/deal.II/include/numerics/assembler.h +++ b/deal.II/deal.II/include/numerics/assembler.h @@ -1,8 +1,19 @@ -/*---------------------------- problem_assembler.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __problem_assembler_H -#define __problem_assembler_H +//---------------------------- assembler.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- assembler.h --------------------------- +#ifndef __deal2__assembler_h +#define __deal2__assembler_h + + /*---------------------------- problem_assembler.h ---------------------------*/ #include @@ -12,9 +23,6 @@ #include - - - /** * This is the base class for equation objects. Equations objects describe the * finite element discretisation of one or more equations. @@ -121,9 +129,6 @@ class Equation { }; - - - /** * An #Assembler# is a specialized version of a #DoFCellAccessor# which adds * functionality to assemble global matrices and vectors from cell base ones. @@ -200,10 +205,9 @@ class Assembler : public DoFCellAccessor { */ const UpdateFlags update_flags; }; - - - /** + +/** * Declare the data type that this accessor * class expects to get passed from the * iterator classes. @@ -295,11 +299,8 @@ class Assembler : public DoFCellAccessor { FEValues fe_values; }; - - - /*---------------------------- problem_assembler.h ---------------------------*/ -/* end of #ifndef __problem_assembler_H */ + #endif /*---------------------------- problem_assembler.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/base.h b/deal.II/deal.II/include/numerics/base.h index a153b14737..d5f1d02380 100644 --- a/deal.II/deal.II/include/numerics/base.h +++ b/deal.II/deal.II/include/numerics/base.h @@ -1,8 +1,19 @@ -/*---------------------------- problem_base.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __problem_base_H -#define __problem_base_H +//---------------------------- base.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- base.h --------------------------- +#ifndef __deal2__base_h +#define __deal2__base_h + + /*---------------------------- problem_base.h ---------------------------*/ @@ -14,8 +25,6 @@ #include - - /** * Base class for user problems. This class stores the system matrix and right * hand side vectors as well as a solution vector. It initiates the assemblage @@ -177,7 +186,7 @@ class ProblemBase { virtual void fill_data (DataOut &) const; - /** +/** * Return the name of the solution as a * #string#. The default implementation * returns #"solution"#. @@ -236,10 +245,8 @@ class ProblemBase { friend class Assembler; }; - - /*---------------------------- problem_base.h ---------------------------*/ -/* end of #ifndef __problem_base_H */ + #endif /*---------------------------- problem_base.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/data_io.h b/deal.II/deal.II/include/numerics/data_io.h index 426b562e44..4ddbbc247a 100644 --- a/deal.II/deal.II/include/numerics/data_io.h +++ b/deal.II/deal.II/include/numerics/data_io.h @@ -1,9 +1,18 @@ -/*---------------------------- data_io.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __data_io_H -#define __data_io_H -/*---------------------------- data_io.h ---------------------------*/ +//---------------------------- data_io.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- data_io.h --------------------------- +#ifndef __deal2__data_io_h +#define __deal2__data_io_h + #include #include @@ -12,8 +21,6 @@ #include - - /** * This class is deprecated. Use the #DataOut# class instead. * @@ -476,7 +483,7 @@ class DataOut_Old { vector cell_data; - /** +/** * Return the number of faces in the * triangulation which have a boundary * indicator not equal to zero. Only @@ -592,8 +599,6 @@ class DataOut_Old { }; - - /** * Structure for the control of encapsulated postscript output. See * general documentation of class #DataOut_Old# for description. @@ -715,8 +720,5 @@ class EpsOutputData{ }; -/*---------------------------- data_io.h ---------------------------*/ -/* end of #ifndef __data_io_H */ #endif -/*---------------------------- data_io.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 0fbe8386aa..237c187f06 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -1,15 +1,24 @@ -/*---------------------------- data_out.h ---------------------------*/ -/* $Id$ */ -#ifndef __data_out_H -#define __data_out_H -/*---------------------------- data_out.h ---------------------------*/ +//---------------------------- data_out.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- data_out.h --------------------------- +#ifndef __deal2__data_out_h +#define __deal2__data_out_h + #include #include #include - /** * This is an abstract class which provides the functionality to generate * patches for output by base classes from data vectors on a grid. It alloes @@ -312,8 +321,6 @@ class DataOut_DoFData : public DataOutInterface }; - - /** * This class is an actual implementation of the functionality proposed by * the #DataOut_DoFData# class. It offers a function #build_patches# that @@ -388,9 +395,9 @@ class DataOut : public DataOut_DoFData */ virtual void build_patches (const unsigned int n_subdivisions = 1, const unsigned int n_threads_ = 1); - - /** + +/** * Return the first cell which we * want output for. The default * implementation returns the first @@ -457,10 +464,4 @@ class DataOut : public DataOut_DoFData }; - - - -/*---------------------------- data_out.h ---------------------------*/ -/* end of #ifndef __data_out_H */ #endif -/*---------------------------- data_out.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/data_out_stack.h b/deal.II/deal.II/include/numerics/data_out_stack.h index 5e7c3b20c9..af0bfbb5c5 100644 --- a/deal.II/deal.II/include/numerics/data_out_stack.h +++ b/deal.II/deal.II/include/numerics/data_out_stack.h @@ -1,8 +1,17 @@ -/*---------------------------- data_out_stack.h ---------------------------*/ -/* $Id$ */ -#ifndef __data_out_stack_H -#define __data_out_stack_H -/*---------------------------- data_out_stack.h ---------------------------*/ +//---------------------------- data_out_stack.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- data_out_stack.h --------------------------- +#ifndef __deal2__data_out_stack_h +#define __deal2__data_out_stack_h #include @@ -14,7 +23,6 @@ #include - /** * This class is used to stack the output from several computations * into one output file by stacking the data sets in another @@ -168,9 +176,9 @@ class DataOutStack : public DataOutInterface */ void declare_data_vector (const vector &name, const VectorType vector_type); - - /** + +/** * Add a data vector for the presently * set value of the parameter. * @@ -383,7 +391,7 @@ class DataOutStack : public DataOutInterface virtual const vector > & get_patches () const; - /** +/** * Virtual function through * which the names of data sets are * obtained by the output functions @@ -393,8 +401,4 @@ class DataOutStack : public DataOutInterface }; - -/*---------------------------- data_out_stack.h ---------------------------*/ -/* end of #ifndef __data_out_stack_H */ #endif -/*---------------------------- data_out_stack.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/dof_renumbering.h b/deal.II/deal.II/include/numerics/dof_renumbering.h index 9c4923f6d5..af0809ae95 100644 --- a/deal.II/deal.II/include/numerics/dof_renumbering.h +++ b/deal.II/deal.II/include/numerics/dof_renumbering.h @@ -1,16 +1,23 @@ -/*---------------------------- dof_renumbering.h ---------------------------*/ -/* $Id$ */ -#ifndef __dof_renumbering_H -#define __dof_renumbering_H -/*---------------------------- dof_renumbering.h ---------------------------*/ +//---------------------------- dof_renumbering.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_renumbering.h --------------------------- +#ifndef __deal2__dof_renumbering_h +#define __deal2__dof_renumbering_h #include #include - - /** * Implementation of a number of renumbering algorithms for the degrees of * freedom on a triangulation. @@ -238,8 +245,8 @@ class DoFRenumbering static void component_wise (DoFHandler &dof_handler, const vector &component_order = vector()); - - /** + +/** * Exception */ DeclException0 (ExcRenumberingIncomplete); @@ -250,13 +257,4 @@ class DoFRenumbering }; - - - - - - -/*---------------------------- dof_renumbering.h ---------------------------*/ -/* end of #ifndef __dof_renumbering_H */ #endif -/*---------------------------- dof_renumbering.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index 92d766f3e7..f2ab12e961 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -1,9 +1,17 @@ -/*---------------------------- error_estimator.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __error_estimator_H -#define __error_estimator_H -/*---------------------------- error_estimator.h ---------------------------*/ +//---------------------------- error_estimator.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- error_estimator.h --------------------------- +#ifndef __deal2__error_estimator_h +#define __deal2__error_estimator_h #include @@ -199,8 +207,8 @@ class KellyErrorEstimator */ typedef map*> FunctionMap; - - /** + +/** * Implementation of the error * estimator described above. You * may give a coefficient, but @@ -273,13 +281,12 @@ class KellyErrorEstimator * Exception */ DeclException0 (ExcInvalidBoundaryFunction); - - private: +private: - /** +/** * Declare a data type to represent the * mapping between faces and integrated * jumps of gradients. See the general @@ -288,14 +295,14 @@ class KellyErrorEstimator typedef map::face_iterator,double> FaceIntegrals; - /** +/** * Redeclare an active cell iterator. * This is simply for convenience. */ typedef DoFHandler::active_cell_iterator active_cell_iterator; - /** +/** * All data needed by the several functions * of the error estimator is gathered in * this struct. It is passed as a reference @@ -414,8 +421,8 @@ class KellyErrorEstimator unsigned int n_threads); }; - - /** + +/** * Computates the error on all cells * of the domain with the number n, * satisfying @@ -453,15 +460,15 @@ class KellyErrorEstimator */ - static void integrate_over_regular_face (Data &data, +static void integrate_over_regular_face (Data &data, const unsigned int this_thread, const active_cell_iterator &cell, const unsigned int face_no, FEFaceValues &fe_face_values_cell, FEFaceValues &fe_face_values_neighbor); - - - /** + + +/** * The same applies as for the function * above, except that integration is * over face #face_no# of #cell#, where @@ -478,12 +485,6 @@ class KellyErrorEstimator }; - - - -/*---------------------------- error_estimator.h ---------------------------*/ -/* end of #ifndef __error_estimator_H */ #endif -/*---------------------------- error_estimator.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/histogram.h b/deal.II/deal.II/include/numerics/histogram.h index 8bdacaaf41..e0c78a5dff 100644 --- a/deal.II/deal.II/include/numerics/histogram.h +++ b/deal.II/deal.II/include/numerics/histogram.h @@ -1,8 +1,17 @@ -/*---------------------------- histogram.h ---------------------------*/ -/* $Id$ */ -#ifndef __histogram_H -#define __histogram_H -/*---------------------------- histogram.h ---------------------------*/ +//---------------------------- histogram.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- histogram.h --------------------------- +#ifndef __deal2__histogram_h +#define __deal2__histogram_h #include @@ -11,7 +20,6 @@ #include - /** * This class provides some facilities to generate 2d and 3d histograms. * It is used by giving it one or several data sets and a rule how to @@ -62,9 +70,9 @@ class Histogram enum IntervalSpacing { linear, logarithmic }; - - /** + +/** * Take several lists of values, each on * to produce one histogram that will * then be arrange one behind each other. @@ -241,9 +249,4 @@ class Histogram }; - - -/*---------------------------- histogram.h ---------------------------*/ -/* end of #ifndef __histogram_H */ #endif -/*---------------------------- histogram.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index 3e15f0914c..37c761551a 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -1,18 +1,23 @@ -/*---------------------------- matrices.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __matrices_H -#define __matrices_H -/*---------------------------- matrices.h ---------------------------*/ - +//---------------------------- matrices.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- matrices.h --------------------------- +#ifndef __deal2__matrices_h +#define __deal2__matrices_h #include #include - - /** * Provide a class which assembles certain standard matrices for a given * triangulation, using a given finite element and a quadrature formula. @@ -339,9 +344,6 @@ class MatrixCreator }; - - - /** * Provide a collection of functions operating on matrices. These include * the application of boundary conditions to a linear system of equations @@ -435,8 +437,6 @@ class MatrixTools : public MatrixCreator }; - - /** * Equation class to be passed to the #Assembler# if you want to make up the * mass matrix for your problem. The mass matrix is the matrix with @@ -589,9 +589,6 @@ class MassMatrix : public Equation { }; - - - /** * Equation class to be passed to the #Assembler# if you want to make up the * laplace matrix for your problem. The laplace matrix is the matrix with @@ -692,13 +689,4 @@ class LaplaceMatrix : public Equation { }; - - - - - - -/*---------------------------- matrices.h ---------------------------*/ -/* end of #ifndef __matrices_H */ #endif -/*---------------------------- matrices.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/solution_transfer.h b/deal.II/deal.II/include/numerics/solution_transfer.h index 90dc38aada..f8d155c014 100644 --- a/deal.II/deal.II/include/numerics/solution_transfer.h +++ b/deal.II/deal.II/include/numerics/solution_transfer.h @@ -1,8 +1,19 @@ -/*---------------------------- solutiontransfer.h ----------------------*/ -/* $Id$ */ -/* Ralf Hartmann, University of Heidelberg */ -#ifndef __solutiontransfer_H -#define __solutiontransfer_H +//---------------------------- solution_transfer.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- solution_transfer.h --------------------------- +#ifndef __deal2__solution_transfer_h +#define __deal2__solution_transfer_h + + /*---------------------------- solutiontransfer.h ----------------------*/ @@ -13,8 +24,6 @@ #include - - /** * Transfers a discrete FE function (like a solution vector) by interpolation * while refining and/or coarsening a grid. During interpolation the @@ -341,7 +350,7 @@ class SolutionTransfer PreparationState prepared_for; - /** +/** * Is used for #prepare_for_refining# * (of course also for * #repare_for_refining_and_coarsening#) @@ -396,11 +405,7 @@ class SolutionTransfer }; - - - - /*---------------------------- solutiontransfer.h ---------------------------*/ -/* end of #ifndef __solutiontransfer_H */ + #endif /*---------------------------- solutiontransfer.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index 3e73d67915..a2f700ea55 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -1,7 +1,19 @@ -/*---------------------------- time-dependent.h ---------------------------*/ -/* $Id$ */ -#ifndef __time_dependent_H -#define __time_dependent_H +//---------------------------- time_dependent.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- time_dependent.h --------------------------- +#ifndef __deal2__time_dependent_h +#define __deal2__time_dependent_h + + /*---------------------------- time-dependent.h ---------------------------*/ @@ -14,8 +26,6 @@ #include - - /** * This class provides an abstract interface to time dependent problems in that * it addresses some of the most annoying aspects of this class of problems: @@ -422,9 +432,9 @@ class TimeDependent TimeDependent (const TimeSteppingData &data_primal, const TimeSteppingData &data_dual, const TimeSteppingData &data_postprocess); - - - /** + + +/** * Destructor. This will delete the * objects pointed to by the pointers * given to the #insert_*# and @@ -592,9 +602,9 @@ class TimeDependent LoopFunctionObject loop_function, const TimeSteppingData ×tepping_data, const Direction direction); - - - /** + + +/** * Initialize the objects for the next * sweep. This function specifically does * the following: assign each time @@ -718,11 +728,6 @@ class TimeDependent }; - - - - - /** * Base class for a time step in time dependent problems. This class provides * barely more than the basic framework, defining the necessary virtual @@ -1065,9 +1070,9 @@ class TimeStepBase : public Subscriptor * sweep. */ void set_sweep_no (const unsigned int sweep_no); - - /** + +/** * Copy constructor. I can see no reason * why someone might want to use it, so * I don't provide it. Since this class @@ -1093,10 +1098,6 @@ class TimeStepBase : public Subscriptor friend class TimeDependent; }; - - - - /** * Specialisation of #TimeStepBase# which addresses some aspects of grid handling. @@ -1132,10 +1133,9 @@ class TimeStepBase_Tria : public TimeStepBase enum SolutionState { grid_refinement = 0x1000 }; - - - - /** + + +/** * Default constructor. Does nothing but * throws an exception. We need to have * such a constructor in order to satisfy @@ -1378,8 +1378,6 @@ class TimeStepBase_Tria : public TimeStepBase }; - - /** * This structure is used to tell the #TimeStepBase_Tria# class how grids should * be handled. It has flags defining the moments where grids shall be @@ -1455,8 +1453,6 @@ struct TimeStepBase_Tria::Flags }; - - /** * This structure is used to tell the #TimeStepBase_Tria# class how grids should * be refined. Before we explain all the different variables, fist some terminology: @@ -1634,7 +1630,7 @@ struct TimeStepBase_Tria::RefinementFlags const unsigned int first_sweep_with_correction; - /** +/** * Apply cell number correction with the * previous time level only if there are * more than this number of cells. @@ -1710,8 +1706,6 @@ struct TimeStepBase_Tria::RefinementFlags }; - - /** * Structure given to the actual refinement function, telling it which * thresholds to take for coarsening and refinement. The actual refinement @@ -1754,8 +1748,6 @@ struct TimeStepBase_Tria::RefinementData }; - - /*----------------------------- template functions ------------------------------*/ template @@ -1791,9 +1783,9 @@ void TimeDependent::do_loop (InitFunctionObject init_function, (timesteps[n_timesteps-step-1])); break; }; - - // wake up the first few time levels + +// wake up the first few time levels for (int step=-timestepping_data.look_ahead; step<0; ++step) for (int look_ahead=0; look_ahead<=static_cast(timestepping_data.look_ahead); ++look_ahead) @@ -1808,9 +1800,9 @@ void TimeDependent::do_loop (InitFunctionObject init_function, timesteps[n_timesteps-(step+look_ahead)]->wake_up(look_ahead); break; }; - - - for (unsigned int step=0; stepwake_up(look_ahead); break; }; - - - // actually do the work + + +// actually do the work switch (direction) { case forward: @@ -1881,9 +1873,7 @@ void TimeDependent::do_loop (InitFunctionObject init_function, }; - - /*---------------------------- time-dependent.h ---------------------------*/ -/* end of #ifndef __time_dependent_H */ + #endif /*---------------------------- time-dependent.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/vectors.h b/deal.II/deal.II/include/numerics/vectors.h index be4b482896..762234c0db 100644 --- a/deal.II/deal.II/include/numerics/vectors.h +++ b/deal.II/deal.II/include/numerics/vectors.h @@ -1,9 +1,17 @@ -/*---------------------------- vectors.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __vectors_H -#define __vectors_H -/*---------------------------- vectors.h ---------------------------*/ +//---------------------------- vectors.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- vectors.h --------------------------- +#ifndef __deal2__vectors_h +#define __deal2__vectors_h #include @@ -35,8 +43,6 @@ enum NormType { }; - - /** * Provide a class which offers some operations on vectors. Amoung these are * assemblage of standard vectors, integration of the difference of a @@ -503,9 +509,9 @@ class VectorTools */ static void subtract_mean_value(Vector &v, const vector &p_select); - - /** + +/** * Exception */ DeclException0 (ExcNotUseful); @@ -524,8 +530,4 @@ class VectorTools }; - -/*---------------------------- vectors.h ---------------------------*/ -/* end of #ifndef __vectors_H */ #endif -/*---------------------------- vectors.h ---------------------------*/ -- 2.39.5