From f9f4374a27a15682c15f222e8407e72552315d1a Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 22 Feb 2000 17:43:01 +0000 Subject: [PATCH] new heads git-svn-id: https://svn.dealii.org/trunk@2467 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/convergence_table.h | 29 ++--- deal.II/base/include/base/data_out_base.h | 48 ++++----- deal.II/base/include/base/exceptions.h | 34 +++--- deal.II/base/include/base/function.h | 31 +++--- deal.II/base/include/base/function_lib.h | 24 +++-- deal.II/base/include/base/function_time.h | 25 +++-- deal.II/base/include/base/job_identifier.h | 17 ++- deal.II/base/include/base/logstream.h | 30 +++--- deal.II/base/include/base/parameter_handler.h | 42 ++++---- deal.II/base/include/base/point.h | 52 +++------ deal.II/base/include/base/quadrature.h | 30 +++--- deal.II/base/include/base/quadrature_lib.h | 36 +++---- deal.II/base/include/base/smartpointer.h | 40 +++---- deal.II/base/include/base/subscriptor.h | 29 ++--- deal.II/base/include/base/table_handler.h | 29 +++-- deal.II/base/include/base/tensor.h | 61 +++-------- deal.II/base/include/base/tensor_base.h | 53 +++------ deal.II/base/include/base/tensor_function.h | 30 +++--- deal.II/base/include/base/thread_manager.h | 101 ++++++------------ deal.II/base/include/base/timer.h | 28 ++--- 20 files changed, 329 insertions(+), 440 deletions(-) diff --git a/deal.II/base/include/base/convergence_table.h b/deal.II/base/include/base/convergence_table.h index cfe4aae8f4..0dfe1480b7 100644 --- a/deal.II/base/include/base/convergence_table.h +++ b/deal.II/base/include/base/convergence_table.h @@ -1,8 +1,17 @@ -/*---------------------------- convergence_table.h ---------------------------*/ -/* $Id$ */ -#ifndef __convergence_table_H -#define __convergence_table_H -/*---------------------------- convergence_table.h ---------------------------*/ +//---------------------------- convergence_table.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. +// +//---------------------------- convergence_table.h --------------------------- +#ifndef __deal2__convergence_table_h +#define __deal2__convergence_table_h #include @@ -98,8 +107,8 @@ class ConvergenceTable: public TableHandler const string &reference_column_key, const RateMode rate_mode); - - /** + +/** * Evaluates the convergence rates of the * data column #data_column_key# * due to the #RateMode#. @@ -200,11 +209,5 @@ class ConvergenceTable: public TableHandler << "Rate column <" << arg1 << "> does already exist."); }; - - - -/*---------------------------- convergence_table.h ---------------------------*/ -/* end of #ifndef __convergence_table_H */ #endif -/*---------------------------- convergence_table.h ---------------------------*/ diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index 05ff4c046f..57d0c7f57f 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -1,8 +1,17 @@ -/*---------------------------- data_out_base.h ---------------------------*/ -/* $Id$ */ -#ifndef __data_out_base_H -#define __data_out_base_H -/*---------------------------- data_out_base.h ---------------------------*/ +//---------------------------- data_out_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. +// +//---------------------------- data_out_base.h --------------------------- +#ifndef __deal2__data_out_base_h +#define __deal2__data_out_base_h #include @@ -14,10 +23,6 @@ #include - - - - /** * This is a base class for output of data on meshes of very general * form. It basically only provides a set of functions for several output @@ -403,7 +408,7 @@ class DataOutBase }; - /** +/** * Flags describing the details of * output in UCD format. */ @@ -546,8 +551,8 @@ class DataOutBase void parse_parameters (ParameterHandler &prm); }; - - /** + +/** * Flags describing the details of * output in encapsulated postscript * format. @@ -755,7 +760,7 @@ class DataOutBase ColorFunction color_function; - /** +/** * Default colorization function. This * one does what one usually wants: * It shifts colors from black (lowest @@ -926,8 +931,8 @@ class DataOutBase const GmvFlags &flags, ostream &out); - - /** + +/** * Exception */ DeclException2 (ExcUnexpectedNumberOfDatasets, @@ -1009,10 +1014,6 @@ class DataOutBase }; - - - - /** * This class is the interface to the #DataOutBase# class, as already its name @@ -1220,8 +1221,8 @@ class DataOutInterface : private DataOutBase */ void set_flags (const GmvFlags &gmv_flags); - - /** + +/** * Provide a function which tells us which * suffix with a given output format * usually has. At present the following @@ -1385,9 +1386,4 @@ class DataOutInterface : private DataOutBase }; - - -/*---------------------------- data_out_base.h ---------------------------*/ -/* end of #ifndef __data_out_base_H */ #endif -/*---------------------------- data_out_base.h ---------------------------*/ diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index 85ecd00a1f..ae4ae21897 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -1,8 +1,17 @@ -/*---------------------------- exceptions.h ---------------------------*/ -/* $Id$ */ -#ifndef __exceptions_H -#define __exceptions_H -/*---------------------------- exceptions.h ---------------------------*/ +//---------------------------- exceptions.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. +// +//---------------------------- exceptions.h --------------------------- +#ifndef __deal2__exceptions_h +#define __deal2__exceptions_h #include @@ -310,8 +319,8 @@ class ExceptionBase : public exception { */ virtual void PrintInfo (ostream &out) const; - - /** + +/** * Function derived from the base class * which allows to pass information like * the line and name of the file where the @@ -353,7 +362,6 @@ class ExceptionBase : public exception { }; - /** * This routine does the main work for the * exception generation mechanism used in the @@ -383,7 +391,6 @@ void __IssueError_Assert (const char *file, }; - /** * This routine does the main work for the * exception generation mechanism used in the @@ -404,8 +411,6 @@ void __IssueError_Throw (const char *file, }; - - #ifdef DEBUG //////////////////////////////////////// /** @@ -434,7 +439,6 @@ void __IssueError_Throw (const char *file, #endif //////////////////////////////////////// - /** * This is the main routine in the exception mechanism for run-time mode * error checking. See the @@ -453,8 +457,6 @@ void __IssueError_Throw (const char *file, __PRETTY_FUNCTION__, #cond, #exc, exc);\ } - - /** * See the #ExceptionBase# class for a detailed description. @@ -586,8 +588,4 @@ namespace StandardExceptions using namespace StandardExceptions; - -/*---------------------------- exceptions.h ---------------------------*/ -/* end of #ifndef __exceptions_H */ #endif -/*---------------------------- exceptions.h ---------------------------*/ diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index f7e6829548..d9e0f3f7eb 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -1,9 +1,17 @@ -/*---------------------------- function.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __function_H -#define __function_H -/*---------------------------- function.h ---------------------------*/ +//---------------------------- function.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. +// +//---------------------------- function.h --------------------------- +#ifndef __deal2__function_h +#define __deal2__function_h #include @@ -13,7 +21,6 @@ #include - /** * This class is a model for a general function. It serves the purpose * of representing scalar and vector valued functions. To this end, we @@ -264,8 +271,6 @@ class Function : public FunctionTime, }; - - /** * Provide a function which always returns zero. Obviously, also the * derivates of this function are zero. Also, it returns zero on all @@ -382,9 +387,6 @@ class ZeroFunction : public Function { }; - - - /** * Provide a function which always returns a constant value, which is * delivered upon construction. Obviously, the derivates of this @@ -472,9 +474,4 @@ class ConstantFunction : public ZeroFunction { }; - - -/*---------------------------- function.h ---------------------------*/ -/* end of #ifndef __function_H */ #endif -/*---------------------------- function.h ---------------------------*/ diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index a4615e3095..c60b0fa871 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -1,9 +1,17 @@ -/*---------------------------- function_lib.h ---------------------------*/ -/* $Id$ */ -/* Copyright Guido Kanschat, University of Minnesota, 1999 */ -#ifndef __function_lib_H -#define __function_lib_H -/*---------------------------- function_lib.h ---------------------------*/ +//---------------------------- function_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. +// +//---------------------------- function_lib.h --------------------------- +#ifndef __deal2__function_lib_h +#define __deal2__function_lib_h #include @@ -209,8 +217,4 @@ class SlitSingularityFunction : public Function<2> }; - -/*---------------------------- function_lib.h ---------------------------*/ -/* end of #ifndef __function_lib_H */ #endif -/*---------------------------- function_lib.h ---------------------------*/ diff --git a/deal.II/base/include/base/function_time.h b/deal.II/base/include/base/function_time.h index a3c1d46abe..9f8273802e 100644 --- a/deal.II/base/include/base/function_time.h +++ b/deal.II/base/include/base/function_time.h @@ -1,10 +1,17 @@ -/*---------------------------- functiontime.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, Guido Kanschat - * University of Heidelberg, 1998, 1999 */ -#ifndef __functiontime_H -#define __functiontime_H -/*---------------------------- functiontime.h ---------------------------*/ +//---------------------------- function_time.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. +// +//---------------------------- function_time.h --------------------------- +#ifndef __deal2__function_time_h +#define __deal2__function_time_h #include @@ -96,7 +103,5 @@ FunctionTime::get_time () const return time; }; -/*---------------------------- functiontime.h ---------------------------*/ -/* end of #ifndef __functiontime_H */ #endif -/*---------------------------- functiontime.h ---------------------------*/ + diff --git a/deal.II/base/include/base/job_identifier.h b/deal.II/base/include/base/job_identifier.h index 3659615975..a856356181 100644 --- a/deal.II/base/include/base/job_identifier.h +++ b/deal.II/base/include/base/job_identifier.h @@ -1,7 +1,18 @@ -// $Id$ +//---------------------------- job_identifier.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. +// +//---------------------------- job_identifier.h --------------------------- +#ifndef __deal2__job_identifier_h +#define __deal2__job_identifier_h -#ifndef __jobidentifier_H -#define __jobidentifier_H #include diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index a50cd00d80..2d887c41a0 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -1,8 +1,17 @@ -/*---------------------------- logstream.h ---------------------------*/ -/* $Id$ */ -#ifndef __logstream_H -#define __logstream_H -/*---------------------------- logstream.h ---------------------------*/ +//---------------------------- logstream.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. +// +//---------------------------- logstream.h --------------------------- +#ifndef __deal2__logstream_h +#define __deal2__logstream_h #include @@ -12,8 +21,6 @@ #include - - /** * A class that simplifies the process of execution logging. It does so by * providing @@ -225,8 +232,6 @@ private: }; - - /* ----------------------------- Inline functions and templates ---------------- */ @@ -258,8 +263,6 @@ LogStream::operator<< (const T& t) } - - /** * Replacement of #endl# for #LogStream#. * @@ -290,10 +293,5 @@ inline void endl(LogStream& s) extern LogStream deallog; - - -/*---------------------------- logstream.h ---------------------------*/ -/* end of #ifndef __logstream_H */ #endif -/*---------------------------- logstream.h ---------------------------*/ diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index 1f6f0be22e..d6eb3e7977 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -1,9 +1,17 @@ -/********************** parameter-handler.h ****************************/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __parameter_handler_H -#define __parameter_handler_H -/********************** parameter-handler.h ****************************/ +//---------------------------- parameter_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. +// +//---------------------------- parameter_handler.h --------------------------- +#ifndef __deal2__parameter_handler_h +#define __deal2__parameter_handler_h // public classes; to be declared below @@ -20,7 +28,6 @@ class istream; class ostream; - /** * List of possible output formats. */ @@ -29,7 +36,6 @@ enum OutputStyle { }; - /** * Declare some regexps which * may be used to define patterns. @@ -114,7 +120,7 @@ struct Patterns { }; - /** +/** * This class is much like the #Selection# * class, but it allows the input to be * a comma-separated list of values which @@ -175,9 +181,6 @@ struct Patterns { }; - - - /** * The #ParameterHandler# class provides a standard interface to an input file * which provides at run-time for program parameters such as time step sizes, @@ -671,7 +674,7 @@ class ParameterHandler void clear (); - /** +/** * Declare a new entry with name #entry#, * default and for which * any input has to match the #pattern# @@ -753,10 +756,9 @@ class ParameterHandler void print_parameters_section (ostream &out, const OutputStyle Style, const unsigned int indent_level); - - - /** + +/** * Exception */ DeclException1 (ExcEntryAlreadyExists, @@ -882,9 +884,6 @@ class ParameterHandler friend class MultipleParameterLoop; }; - - - /** * The class #MultipleParameterLoop# offers an easy possibility to test several @@ -1279,7 +1278,6 @@ ParameterHandler::ok() const return status; } -/********************** parameter-handler.h ****************************/ -/* end of #ifndef __parameter_handler_H */ + #endif -/********************** parameter-handler.h ****************************/ + diff --git a/deal.II/base/include/base/point.h b/deal.II/base/include/base/point.h index beeed14083..da2adacda0 100644 --- a/deal.II/base/include/base/point.h +++ b/deal.II/base/include/base/point.h @@ -1,9 +1,17 @@ -/*---------------------------- point.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __point_H -#define __point_H -/*---------------------------- point.h ---------------------------*/ +//---------------------------- point.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. +// +//---------------------------- point.h --------------------------- +#ifndef __deal2__point_h +#define __deal2__point_h #include @@ -128,7 +136,7 @@ class Point : public Tensor<1,dim> { double square () const; - /** +/** * Exception */ DeclException1 (ExcDimTooSmall, @@ -141,15 +149,9 @@ class Point : public Tensor<1,dim> { }; - - - - - /*------------------------------- Inline functions: Point ---------------------------*/ - template inline Point::Point (const bool initialize) : @@ -162,7 +164,6 @@ Point::Point (const Tensor<1,dim> &t) : Tensor<1,dim>(t) {}; - template <> inline Point<1>::Point (const double x) { @@ -170,7 +171,6 @@ Point<1>::Point (const double x) { }; - template <> inline Point<1>::Point (const double, const double) { @@ -178,7 +178,6 @@ Point<1>::Point (const double, const double) { }; - template <> inline Point<1>::Point (const double, const double, const double) { @@ -186,7 +185,6 @@ Point<1>::Point (const double, const double, const double) { }; - template <> inline Point<2>::Point (const double x, const double y) { @@ -195,7 +193,6 @@ Point<2>::Point (const double x, const double y) { }; - template <> inline Point<2>::Point (const double, const double, const double) { @@ -203,7 +200,6 @@ Point<2>::Point (const double, const double, const double) { }; - template <> inline Point<3>::Point (const double, const double) { @@ -211,7 +207,6 @@ Point<3>::Point (const double, const double) { }; - template <> inline Point<3>::Point (const double x, const double y, const double z) { @@ -221,7 +216,6 @@ Point<3>::Point (const double x, const double y, const double z) { }; - template <> inline Point<4>::Point (const double, const double) { @@ -229,7 +223,6 @@ Point<4>::Point (const double, const double) { }; - template <> inline Point<4>::Point (const double, const double, const double) { @@ -237,7 +230,6 @@ Point<4>::Point (const double, const double, const double) { }; - template inline double Point::operator () (const unsigned int index) const { @@ -246,7 +238,6 @@ double Point::operator () (const unsigned int index) const { }; - template inline double & Point::operator () (const unsigned int index) { @@ -255,7 +246,6 @@ double & Point::operator () (const unsigned int index) { }; - template inline Point Point::operator + (const Point &p) const { @@ -263,7 +253,6 @@ Point Point::operator + (const Point &p) const { }; - template inline Point Point::operator - (const Point &p) const { @@ -271,7 +260,6 @@ Point Point::operator - (const Point &p) const { }; - template inline Point Point::operator * (const double factor) const { @@ -279,7 +267,6 @@ Point Point::operator * (const double factor) const { }; - template inline double Point::operator * (const Point &p) const { @@ -288,7 +275,6 @@ double Point::operator * (const Point &p) const { }; - template inline Point operator * (const double factor, const Point &p) { @@ -296,7 +282,6 @@ Point operator * (const double factor, const Point &p) { }; - template inline Point Point::operator / (const double factor) const { @@ -304,7 +289,6 @@ Point Point::operator / (const double factor) const { }; - template inline double Point::square () const { @@ -315,10 +299,4 @@ double Point::square () const { }; - - - -/*---------------------------- point.h ---------------------------*/ -/* end of #ifndef __point_H */ #endif -/*---------------------------- point.h ---------------------------*/ diff --git a/deal.II/base/include/base/quadrature.h b/deal.II/base/include/base/quadrature.h index b620acfa30..d75b92c208 100644 --- a/deal.II/base/include/base/quadrature.h +++ b/deal.II/base/include/base/quadrature.h @@ -1,16 +1,23 @@ -/*---------------------------- quadrature.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __quadrature_H -#define __quadrature_H -/*---------------------------- quadrature.h ---------------------------*/ +//---------------------------- quadrature.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. +// +//---------------------------- quadrature.h --------------------------- +#ifndef __deal2__quadrature_h +#define __deal2__quadrature_h #include #include - /** * Base class for quadrature formulae in arbitrary dimensions. This class * stores quadrature points and weights on the unit line [0,1], unit @@ -142,7 +149,6 @@ class Quadrature }; - /** * Quadrature formula constructed by iteration of another quadrature formula in * each direction. In more than one space dimension, the resulting quadrature @@ -200,8 +206,6 @@ class QIterated : public Quadrature }; - - /** * This class is a helper class to facilitate the usage of quadrature formulae * on faces or subfaces of cells. It computes the locations of quadrature @@ -266,10 +270,4 @@ class QProjector { }; - - - -/*---------------------------- quadrature.h ---------------------------*/ -/* end of #ifndef __quadrature_H */ #endif -/*---------------------------- quadrature.h ---------------------------*/ diff --git a/deal.II/base/include/base/quadrature_lib.h b/deal.II/base/include/base/quadrature_lib.h index aef5ab7805..4446712a0b 100644 --- a/deal.II/base/include/base/quadrature_lib.h +++ b/deal.II/base/include/base/quadrature_lib.h @@ -1,9 +1,17 @@ -/*---------------------------- quadrature_lib.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __quadrature_lib_H -#define __quadrature_lib_H -/*---------------------------- quadrature_lib.h ---------------------------*/ +//---------------------------- quadrature_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. +// +//---------------------------- quadrature_lib.h --------------------------- +#ifndef __deal2__quadrature_lib_h +#define __deal2__quadrature_lib_h #include @@ -24,7 +32,6 @@ class QGauss2 : public Quadrature }; - /** * 3-Point-Gauss quadrature formula, exact for polynomials of degree 5. * @@ -40,7 +47,6 @@ class QGauss3 : public Quadrature }; - /** * 4-Point-Gauss quadrature formula, exact for polynomials of degree 7. * @@ -56,8 +62,6 @@ class QGauss4 : public Quadrature }; - - /** * 5-Point-Gauss quadrature formula, exact for polynomials of degree 9. * @@ -73,7 +77,6 @@ class QGauss5 : public Quadrature }; - /** * 6-Point-Gauss quadrature formula, exact for polynomials of degree 11. * I have not found explicite @@ -94,7 +97,6 @@ class QGauss6 : public Quadrature }; - /** * 7-Point-Gauss quadrature formula, exact for polynomials of degree 13. * I have not found explicite @@ -115,7 +117,6 @@ class QGauss7 : public Quadrature }; - /** * 8-Point-Gauss quadrature formula, exact for polynomials of degree 15. * I have not found explicite @@ -136,9 +137,6 @@ class QGauss8 : public Quadrature }; - - - /** * Midpoint quadrature rule, exact for linear polynomials. */ @@ -150,7 +148,6 @@ class QMidpoint : public Quadrature }; - /** * Simpson quadrature rule, exact for polynomials of degree 3. */ @@ -162,7 +159,6 @@ class QSimpson : public Quadrature }; - /** * Trapezoidal quadrature rule, exact for linear polynomials. */ @@ -174,8 +170,4 @@ class QTrapez : public Quadrature }; - -/*---------------------------- quadrature_lib.h ---------------------------*/ -/* end of #ifndef __quadrature_lib_H */ #endif -/*---------------------------- quadrature_lib.h ---------------------------*/ diff --git a/deal.II/base/include/base/smartpointer.h b/deal.II/base/include/base/smartpointer.h index e7bd6cbbf3..8ac3f00a1b 100644 --- a/deal.II/base/include/base/smartpointer.h +++ b/deal.II/base/include/base/smartpointer.h @@ -1,8 +1,18 @@ -/*---------------------------- smartpointer.h ---------------------------*/ -/* $Id$ */ -#ifndef __smartpointer_H -#define __smartpointer_H -/*---------------------------- smartpointer.h ---------------------------*/ +//---------------------------- smartpointer.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. +// +//---------------------------- smartpointer.h --------------------------- +#ifndef __deal2__smartpointer_h +#define __deal2__smartpointer_h + #ifndef __subscriptor_H #include @@ -65,9 +75,8 @@ class SmartPointer */ SmartPointer (T *t); - - /** +/** * Destructor, removing the subscription. */ ~SmartPointer(); @@ -110,9 +119,6 @@ class SmartPointer }; - - - /* --------------------------- inline Template functions ------------------------------*/ @@ -122,7 +128,6 @@ SmartPointer::SmartPointer () : {}; - template SmartPointer::SmartPointer (T *t) : t (t) @@ -132,7 +137,6 @@ SmartPointer::SmartPointer (T *t) : }; - template SmartPointer::SmartPointer (const SmartPointer &tt) : t (tt.t) @@ -142,7 +146,6 @@ SmartPointer::SmartPointer (const SmartPointer &tt) : }; - template SmartPointer::~SmartPointer () { @@ -151,7 +154,6 @@ SmartPointer::~SmartPointer () }; - template SmartPointer & SmartPointer::operator = (T *tt) { @@ -169,7 +171,6 @@ SmartPointer & SmartPointer::operator = (T *tt) }; - template SmartPointer & SmartPointer::operator = (const SmartPointer& tt) { @@ -188,7 +189,6 @@ SmartPointer & SmartPointer::operator = (const SmartPointer& tt) }; - template inline SmartPointer::operator T* () const @@ -197,7 +197,6 @@ SmartPointer::operator T* () const }; - template inline T & SmartPointer::operator * () const @@ -206,7 +205,6 @@ T & SmartPointer::operator * () const }; - template inline T * SmartPointer::operator -> () const @@ -215,10 +213,4 @@ T * SmartPointer::operator -> () const }; - - - -/*---------------------------- smartpointer.h ---------------------------*/ -/* end of #ifndef __smartpointer_H */ #endif -/*---------------------------- smartpointer.h ---------------------------*/ diff --git a/deal.II/base/include/base/subscriptor.h b/deal.II/base/include/base/subscriptor.h index b7914c46da..12b439166f 100644 --- a/deal.II/base/include/base/subscriptor.h +++ b/deal.II/base/include/base/subscriptor.h @@ -1,8 +1,17 @@ -/*---------------------------- subscriptor.h ---------------------------*/ -/* $Id$ */ -#ifndef __subscriptor_H -#define __subscriptor_H -/*---------------------------- subscriptor.h ---------------------------*/ +//---------------------------- subscriptor.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. +// +//---------------------------- subscriptor.h --------------------------- +#ifndef __deal2__subscriptor_h +#define __deal2__subscriptor_h #ifndef __exceptions_H @@ -91,9 +100,9 @@ class Subscriptor * when #unsubscribe# is called. */ DeclException0(ExcNotUsed); - - private: + +private: /** * Store the number of objects which * subscribed to this object. Initialally, @@ -113,10 +122,4 @@ class Subscriptor }; - - - -/*---------------------------- subscriptor.h ---------------------------*/ -/* end of #ifndef __subscriptor_H */ #endif -/*---------------------------- subscriptor.h ---------------------------*/ diff --git a/deal.II/base/include/base/table_handler.h b/deal.II/base/include/base/table_handler.h index 98ec08a9ea..fb62247815 100644 --- a/deal.II/base/include/base/table_handler.h +++ b/deal.II/base/include/base/table_handler.h @@ -1,9 +1,17 @@ -/*---------------------------- table_handler.h ---------------------------*/ -/* $Id$ */ -#ifndef __table_handler_H -#define __table_handler_H -/*---------------------------- table_handler.h ---------------------------*/ - +//---------------------------- table_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. +// +//---------------------------- table_handler.h --------------------------- +#ifndef __deal2__table_handler_h +#define __deal2__table_handler_h #include @@ -16,7 +24,6 @@ #include - /** * Abstract base class for the #TableEntry# class. See there. * This class is not to be used by the user. @@ -96,8 +103,6 @@ class TableEntry : public TableEntryBase }; - - /** * The #TableHandler# stores #TableEntries# of arbitrary value type and * writes the table as text or in tex format to an output stream. The value @@ -451,10 +456,4 @@ class TableHandler }; - - - -/*---------------------------- table_handler.h ---------------------------*/ -/* end of #ifndef __table_handler_H */ #endif -/*---------------------------- table_handler.h ---------------------------*/ diff --git a/deal.II/base/include/base/tensor.h b/deal.II/base/include/base/tensor.h index 9528404739..28e799caef 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -1,8 +1,17 @@ -/*---------------------------- tensor.h ---------------------------*/ -/* $Id$ */ -#ifndef __tensor_H -#define __tensor_H -/*---------------------------- tensor.h ---------------------------*/ +//---------------------------- tensor.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. +// +//---------------------------- tensor.h --------------------------- +#ifndef __deal2__tensor_h +#define __deal2__tensor_h #include @@ -141,9 +150,9 @@ class Tensor * index of the tensor marches fastest. */ void unroll(Vector & result) const; - - /** + +/** * Reset all values to zero. */ void clear (); @@ -181,8 +190,6 @@ class Tensor }; - - /*--------------------------- Inline functions -----------------------------*/ // in the following, declarations of operators look rather weird because they are // split over several lines. this is necessary, however, because otherwise doc++ @@ -199,7 +206,6 @@ Tensor::Tensor () }; - template inline Tensor::Tensor (const array_type &initializer) @@ -208,8 +214,6 @@ Tensor::Tensor (const array_type &initializer) subtensor[i] = Tensor(initializer[i]); }; - - template inline @@ -222,7 +226,6 @@ Tensor::operator[] (const unsigned int i) }; - template inline const Tensor & @@ -234,7 +237,6 @@ Tensor::operator[] (const unsigned int i) const }; - template inline Tensor & @@ -246,7 +248,6 @@ Tensor::operator = (const Tensor &t) }; - template inline bool @@ -258,7 +259,6 @@ Tensor::operator == (const Tensor &p) const }; - template inline bool @@ -268,7 +268,6 @@ Tensor::operator != (const Tensor &p) const }; - template inline Tensor & @@ -280,7 +279,6 @@ Tensor::operator += (const Tensor &p) }; - template inline Tensor & @@ -292,7 +290,6 @@ Tensor::operator -= (const Tensor &p) }; - template inline Tensor & @@ -304,7 +301,6 @@ Tensor::operator *= (const double &s) }; - template inline Tensor & @@ -316,7 +312,6 @@ Tensor::operator /= (const double &s) }; - template inline Tensor @@ -331,7 +326,6 @@ Tensor::operator + (const Tensor &t) const }; - template inline Tensor @@ -346,7 +340,6 @@ Tensor::operator - (const Tensor &t) const }; - template inline void Tensor::clear () @@ -356,13 +349,9 @@ void Tensor::clear () }; - - - /* ----------------- Non-member functions operating on tensors. ------------ */ - /* Exception class. This is certainly not the best possible place for its declaration, but at present, local classes to any of Tensor<> can't be properly accessed (haven't investigated why). If anyone has a better @@ -373,7 +362,6 @@ DeclException1 (ExcInvalidTensorIndex, << "Invalid tensor index " << arg1); - template inline void contract (Tensor<1,dim> &dest, @@ -386,7 +374,6 @@ void contract (Tensor<1,dim> &dest, }; - template inline void contract (Tensor<2,dim> &dest, @@ -400,7 +387,6 @@ void contract (Tensor<2,dim> &dest, }; - template inline void contract (Tensor<2,dim> &dest, @@ -457,7 +443,6 @@ void contract (Tensor<2,dim> &dest, }; - template inline void contract (Tensor<2,dim> &dest, @@ -494,7 +479,6 @@ void contract (Tensor<2,dim> &dest, }; - template inline void contract (Tensor<3,dim> &dest, @@ -509,7 +493,6 @@ void contract (Tensor<3,dim> &dest, }; - template inline void contract (Tensor<3,dim> &dest, @@ -524,7 +507,6 @@ void contract (Tensor<3,dim> &dest, }; - template inline void contract (Tensor<4,dim> &dest, @@ -540,7 +522,6 @@ void contract (Tensor<4,dim> &dest, }; - template inline double determinant (const Tensor &t) { @@ -557,8 +538,6 @@ double determinant (const Tensor<1,1> &t) { }; - - inline double determinant (const Tensor<2,2> &t) { return ((t[0][0] * t[1][1]) - @@ -566,7 +545,6 @@ double determinant (const Tensor<2,2> &t) { }; - inline double determinant (const Tensor<2,3> &t) { // get this using Maple: @@ -583,12 +561,5 @@ double determinant (const Tensor<2,3> &t) { -t[2][0]*t[0][2]*t[1][1] ); }; - - - - -/*---------------------------- tensor.h ---------------------------*/ -/* end of #ifndef __tensor_H */ #endif -/*---------------------------- tensor.h ---------------------------*/ diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h index 4f6764444a..9539b4d986 100644 --- a/deal.II/base/include/base/tensor_base.h +++ b/deal.II/base/include/base/tensor_base.h @@ -1,8 +1,17 @@ -/*---------------------------- tensor_base.h ---------------------------*/ -/* $Id$ */ -#ifndef __tensor_base_H -#define __tensor_base_H -/*---------------------------- tensor_base.h ---------------------------*/ +//---------------------------- tensor_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. +// +//---------------------------- tensor_base.h --------------------------- +#ifndef __deal2__tensor_base_h +#define __deal2__tensor_base_h // single this file out from tensor.h, since we want to derive Point @@ -17,7 +26,6 @@ template class Vector; - // general template; specialized for rank==1; the general template is in // tensor.h template class Tensor; @@ -239,7 +247,7 @@ DeclException1 (ExcDimTooSmall, << "Given dimensions must be >= 1, but was " << arg1); - /** +/** * Prints the values of this point in the * form #x1 x2 x3 etc#. */ @@ -247,17 +255,12 @@ template ostream & operator << (ostream &out, const Tensor<1,dim> &p); - - - - /*------------------------------- Inline functions: Tensor ---------------------------*/ // in the following, declarations of operators look rather weird because they are // split over several lines. this is necessary, however, because otherwise doc++ // gets really confused about this all... :-( - template inline Tensor<1,dim>::Tensor (const bool initialize) @@ -270,7 +273,6 @@ Tensor<1,dim>::Tensor (const bool initialize) }; - template inline Tensor<1,dim>::Tensor (const array_type &initializer) @@ -280,7 +282,6 @@ Tensor<1,dim>::Tensor (const array_type &initializer) }; - template inline Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) @@ -290,7 +291,6 @@ Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) }; - template inline double Tensor<1,dim>::operator [] (const unsigned int index) const @@ -300,7 +300,6 @@ double Tensor<1,dim>::operator [] (const unsigned int index) const }; - template inline double & Tensor<1,dim>::operator [] (const unsigned int index) @@ -310,7 +309,6 @@ double & Tensor<1,dim>::operator [] (const unsigned int index) }; - template inline Tensor<1,dim> & Tensor<1,dim>::operator = (const Tensor<1,dim> &p) @@ -321,7 +319,6 @@ Tensor<1,dim> & Tensor<1,dim>::operator = (const Tensor<1,dim> &p) }; - template inline bool Tensor<1,dim>::operator == (const Tensor<1,dim> &p) const @@ -332,7 +329,6 @@ bool Tensor<1,dim>::operator == (const Tensor<1,dim> &p) const }; - template inline bool Tensor<1,dim>::operator != (const Tensor<1,dim> &p) const @@ -341,7 +337,6 @@ bool Tensor<1,dim>::operator != (const Tensor<1,dim> &p) const }; - template inline Tensor<1,dim> & Tensor<1,dim>::operator += (const Tensor<1,dim> &p) @@ -352,7 +347,6 @@ Tensor<1,dim> & Tensor<1,dim>::operator += (const Tensor<1,dim> &p) }; - template inline Tensor<1,dim> & Tensor<1,dim>::operator -= (const Tensor<1,dim> &p) @@ -363,7 +357,6 @@ Tensor<1,dim> & Tensor<1,dim>::operator -= (const Tensor<1,dim> &p) }; - template inline Tensor<1,dim> & Tensor<1,dim>::operator *= (const double &s) @@ -374,7 +367,6 @@ Tensor<1,dim> & Tensor<1,dim>::operator *= (const double &s) }; - template inline Tensor<1,dim> & Tensor<1,dim>::operator /= (const double &s) @@ -385,7 +377,6 @@ Tensor<1,dim> & Tensor<1,dim>::operator /= (const double &s) }; - template inline double Tensor<1,dim>::operator * (const Tensor<1,dim> &p) const @@ -397,7 +388,6 @@ double Tensor<1,dim>::operator * (const Tensor<1,dim> &p) const }; - template inline Tensor<1,dim> Tensor<1,dim>::operator + (const Tensor<1,dim> &p) const @@ -406,7 +396,6 @@ Tensor<1,dim> Tensor<1,dim>::operator + (const Tensor<1,dim> &p) const }; - template inline Tensor<1,dim> Tensor<1,dim>::operator - (const Tensor<1,dim> &p) const @@ -415,7 +404,6 @@ Tensor<1,dim> Tensor<1,dim>::operator - (const Tensor<1,dim> &p) const }; - template inline void Tensor<1,dim>::clear () @@ -425,10 +413,6 @@ void Tensor<1,dim>::clear () }; - - - - template inline ostream & operator << (ostream &out, const Tensor<1,dim> &p) @@ -449,13 +433,6 @@ ostream & operator << (ostream &out, const Tensor<1,1> &p) return out; }; - - - - -/*---------------------------- tensor_base.h ---------------------------*/ -/* end of #ifndef __tensor_base_H */ #endif -/*---------------------------- tensor_base.h ---------------------------*/ diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index 18ea31e0dd..cd07307a0f 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -1,9 +1,17 @@ -/*---------------------------- tensorfunction.h ---------------------------*/ -/* $Id$ */ -/* Copyright G. Kanschat, University of Heidelberg, 1999 */ -#ifndef __tensorfunction_H -#define __tensorfunction_H -/*---------------------------- tensorfunction.h ---------------------------*/ +//---------------------------- tensor_function.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. +// +//---------------------------- tensor_function.h --------------------------- +#ifndef __deal2__tensor_function_h +#define __deal2__tensor_function_h #include @@ -16,8 +24,6 @@ #include - - /** * This class is a model for a tensor valued function. * It returns the value @@ -104,11 +110,5 @@ class TensorFunction : public FunctionTime, }; - - - - -/*---------------------------- tensorfunction.h ---------------------------*/ -/* end of #ifndef __tensorfunction_H */ #endif -/*---------------------------- tensorfunction.h ---------------------------*/ + diff --git a/deal.II/base/include/base/thread_manager.h b/deal.II/base/include/base/thread_manager.h index 3e75edfcd5..e7f5e70e7e 100644 --- a/deal.II/base/include/base/thread_manager.h +++ b/deal.II/base/include/base/thread_manager.h @@ -1,8 +1,17 @@ -/*---------------------------- thread_manager.h ---------------------------*/ -/* $Id$ */ -#ifndef __thread_manager_H -#define __thread_manager_H -/*---------------------------- thread_manager.h ---------------------------*/ +//---------------------------- thread_manager.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. +// +//---------------------------- thread_manager.h --------------------------- +#ifndef __deal2__thread_manager_h +#define __deal2__thread_manager_h #ifdef DEAL_II_USE_MT @@ -341,8 +350,8 @@ class ThreadManager : public ACE_Thread_Manager void_mem_fun (void_mem_fun) {}; }; - - /** + +/** * This class is used to package all * data needed to call a specific unary * member function of an object. It is @@ -486,7 +495,7 @@ class ThreadManager : public ACE_Thread_Manager }; - /** +/** * This class is used to package * all data needed to call a * specific ternary member @@ -534,9 +543,9 @@ class ThreadManager : public ACE_Thread_Manager mem_fun (0), void_mem_fun (void_mem_fun) {}; }; - - /** + +/** * This class is used to package * all data needed to call a * specific quaternary member @@ -653,8 +662,8 @@ class ThreadManager : public ACE_Thread_Manager void_mem_fun (void_mem_fun) {}; }; - - /** + +/** * This class is used to package * all data needed to call a * specific hexary member @@ -825,7 +834,7 @@ class ThreadManager : public ACE_Thread_Manager }; - /** +/** * This class is used to package * all data needed to call a * specific nonary member @@ -883,7 +892,7 @@ class ThreadManager : public ACE_Thread_Manager }; - /** +/** * This class is used to package * all data needed to call a * specific decary member @@ -942,11 +951,9 @@ class ThreadManager : public ACE_Thread_Manager arg10 (arg10), mem_fun (mem_fun) {}; }; - - - - /** + +/** * This class is used to package * all data needed to call a * global function. See the @@ -979,7 +986,7 @@ class ThreadManager : public ACE_Thread_Manager }; - /** +/** * This class is used to package * all data needed to call a * global function. See the @@ -1403,7 +1410,7 @@ class ThreadManager : public ACE_Thread_Manager }; - /** +/** * Wrapper function to allow spawning * threads for member functions as well, * rather than for global functions only. @@ -1601,8 +1608,7 @@ class ThreadManager : public ACE_Thread_Manager size_t stack_size = 0); - - /** +/** * Wrapper function to allow spawning * threads for member functions as well, * rather than for global functions only. @@ -1626,8 +1632,7 @@ class ThreadManager : public ACE_Thread_Manager size_t stack_size = 0); - - /** +/** * Wrapper function to allow spawning * threads for funtions. * @@ -2280,13 +2285,12 @@ class ThreadManager : public ACE_Thread_Manager ACE_hthread_t thread_handles[] = 0, void *stack[] = 0, size_t stack_size[] = 0); - - - private: +private: - /** + +/** * This is a function satisfying the * requirements for thread entry points. * It takes as argument all the @@ -2415,7 +2419,7 @@ class ThreadManager : public ACE_Thread_Manager static void * thread_entry_point10 (void *_arg); - /** +/** * This is a function satisfying the * requirements for thread entry points. * It takes as argument all the @@ -2538,7 +2542,6 @@ class ThreadManager : public ACE_Thread_Manager }; - /* ------------------------------ Template functions -------------------------------- */ @@ -2564,7 +2567,6 @@ int ThreadManager::spawn (Mem_Fun_Data0 *mem_fun_data, }; - template int ThreadManager::spawn (Mem_Fun_Data1 *mem_fun_data, long flags, @@ -2587,7 +2589,6 @@ int ThreadManager::spawn (Mem_Fun_Data1 *mem_fun_data, }; - template int ThreadManager::spawn (Mem_Fun_Data2 *mem_fun_data, long flags, @@ -2610,7 +2611,6 @@ int ThreadManager::spawn (Mem_Fun_Data2 *mem_fun_data, }; - template int ThreadManager::spawn (Mem_Fun_Data3 *mem_fun_data, long flags, @@ -2633,7 +2633,6 @@ int ThreadManager::spawn (Mem_Fun_Data3 *mem_fun_dat }; - template int ThreadManager::spawn (Mem_Fun_Data4 *mem_fun_data, long flags, @@ -2656,7 +2655,6 @@ int ThreadManager::spawn (Mem_Fun_Data4 *mem_fu }; - template @@ -2681,7 +2679,6 @@ int ThreadManager::spawn (Mem_Fun_Data5 *m }; - template @@ -2733,7 +2730,6 @@ int ThreadManager::spawn (Mem_Fun_Data7 int ThreadManager::spawn_n (size_t n, Mem_Fun_Data1 *mem_fun_data, @@ -3126,7 +3116,6 @@ int ThreadManager::spawn_n (size_t n, }; - template int ThreadManager::spawn_n (size_t n, Mem_Fun_Data2 *mem_fun_data, @@ -3151,7 +3140,6 @@ int ThreadManager::spawn_n (size_t n, }; - template int ThreadManager::spawn_n (size_t n, Mem_Fun_Data3 *mem_fun_data, @@ -3176,7 +3164,6 @@ int ThreadManager::spawn_n (size_t n, }; - template int ThreadManager::spawn_n (size_t n, Mem_Fun_Data4 *mem_fun_data, @@ -3201,7 +3188,6 @@ int ThreadManager::spawn_n (size_t n, }; - template @@ -3228,7 +3214,6 @@ int ThreadManager::spawn_n (size_t n, }; - template @@ -3608,8 +3593,6 @@ int ThreadManager::spawn_n (size_t n, }; - - template void * ThreadManager::thread_entry_point1 (void *_arg) { @@ -3685,7 +3667,6 @@ void * ThreadManager::thread_entry_point1 (void *_arg) }; - template void * ThreadManager::thread_entry_point2 (void *_arg) { @@ -3709,7 +3690,6 @@ void * ThreadManager::thread_entry_point2 (void *_arg) }; - template void * ThreadManager::thread_entry_point3 (void *_arg) { @@ -3737,7 +3717,6 @@ void * ThreadManager::thread_entry_point3 (void *_arg) }; - template void * ThreadManager::thread_entry_point4 (void *_arg) { @@ -3767,7 +3746,6 @@ void * ThreadManager::thread_entry_point4 (void *_arg) }; - template @@ -3801,7 +3779,6 @@ void * ThreadManager::thread_entry_point5 (void *_arg) }; - template @@ -3837,7 +3814,6 @@ void * ThreadManager::thread_entry_point6 (void *_arg) }; - template @@ -4235,14 +4209,7 @@ void * ThreadManager::thread_entry_point_10 (void *_arg) }; - #endif -/*---------------------------- thread_manager.h ---------------------------*/ -/* end of #ifndef __thread_manager_H */ -#endif -/*---------------------------- thread_manager.h ---------------------------*/ - - - +#endif diff --git a/deal.II/base/include/base/timer.h b/deal.II/base/include/base/timer.h index be5c19aab2..6e6cbf46c9 100644 --- a/deal.II/base/include/base/timer.h +++ b/deal.II/base/include/base/timer.h @@ -1,9 +1,17 @@ -/*---------------------------- timer.h ---------------------------*/ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#ifndef __timer_H -#define __timer_H -/*---------------------------- timer.h ---------------------------*/ +//---------------------------- timer.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. +// +//---------------------------- timer.h --------------------------- +#ifndef __deal2__timer_h +#define __deal2__timer_h /** @@ -96,7 +104,7 @@ class Timer double cumulative_time; - /** +/** * Store whether the timer is presently * running. */ @@ -113,10 +121,4 @@ class Timer }; - - - -/*---------------------------- timer.h ---------------------------*/ -/* end of #ifndef __timer_H */ #endif -/*---------------------------- timer.h ---------------------------*/ -- 2.39.5