From: Wolfgang Bangerth Date: Mon, 9 Jun 2003 17:01:06 +0000 (+0000) Subject: Lots, lots, lots of small reindentations, etc (several thousands of them...). X-Git-Tag: v8.0.0~16427 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31616a5b79bf3b514664a597119baf4be0fcbd6e;p=dealii.git Lots, lots, lots of small reindentations, etc (several thousands of them...). git-svn-id: https://svn.dealii.org/trunk@7776 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/auto_derivative_function.h b/deal.II/base/include/base/auto_derivative_function.h index 526ebb7975..c0d772ab86 100644 --- a/deal.II/base/include/base/auto_derivative_function.h +++ b/deal.II/base/include/base/auto_derivative_function.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002 by the deal authors +// Copyright (C) 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -223,7 +223,9 @@ class AutoDerivativeFunction : public Function * @p{DifferenceFormula} of the * order @p{ord} at minimum. */ - static DifferenceFormula get_formula_of_order(const unsigned int ord); + static + DifferenceFormula + get_formula_of_order (const unsigned int ord); /** * Exception. diff --git a/deal.II/base/include/base/convergence_table.h b/deal.II/base/include/base/convergence_table.h index b237379433..de038f81f8 100644 --- a/deal.II/base/include/base/convergence_table.h +++ b/deal.II/base/include/base/convergence_table.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -104,9 +104,10 @@ class ConvergenceTable: public TableHandler * * Still not implemented. */ - void evaluate_convergence_rates (const std::string &data_column_key, - const std::string &reference_column_key, - const RateMode rate_mode); + void + evaluate_convergence_rates (const std::string &data_column_key, + const std::string &reference_column_key, + const RateMode rate_mode); /** @@ -126,8 +127,9 @@ class ConvergenceTable: public TableHandler * the @p{set_tex_supercaption (...)} function * of the base class @p{TableHandler}. */ - void evaluate_convergence_rates (const std::string &data_column_key, - const RateMode rate_mode); + void + evaluate_convergence_rates (const std::string &data_column_key, + const RateMode rate_mode); /** * Omit this column @p{key} @@ -140,7 +142,8 @@ class ConvergenceTable: public TableHandler * omitting the column from convergence * rate evalution. */ - void omit_column_from_convergence_rate_evaluation(const std::string &key); + void + omit_column_from_convergence_rate_evaluation(const std::string &key); /** * Evaluates convergence rates @@ -168,8 +171,9 @@ class ConvergenceTable: public TableHandler * should omitted by calling the * @p{omit_column_from_convergence_rate_evaluation(..)}. */ - void evaluate_all_convergence_rates(const std::string &reference_column_key, - const RateMode rate_mode); + void + evaluate_all_convergence_rates(const std::string &reference_column_key, + const RateMode rate_mode); /** * Evaluates convergence rates @@ -195,7 +199,8 @@ class ConvergenceTable: public TableHandler * should omitted by calling the * @p{omit_column_from_convergence_rate_evaluation(..)}. */ - void evaluate_all_convergence_rates(const RateMode rate_mode); + void + evaluate_all_convergence_rates(const RateMode rate_mode); /** * Exception diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index e9d1c64dfb..aaab631ad4 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -554,8 +554,7 @@ class DataOutBase */ DXFlags (const bool write_multigrid = false, const bool write_neighbors = false); - - public: + /** * Declare all flags with name * and type as offered by this @@ -1011,9 +1010,10 @@ class DataOutBase * This function was originally written * by Stefan Nauber. */ - static RgbValues default_color_function (const double value, - const double min_value, - const double max_value); + static RgbValues + default_color_function (const double value, + const double min_value, + const double max_value); /** * This is an alternative color @@ -1024,9 +1024,10 @@ class DataOutBase * @p{color_function} variable to the * address of this function. */ - static RgbValues grey_scale_color_function (const double value, - const double min_value, - const double max_value); + static RgbValues + grey_scale_color_function (const double value, + const double min_value, + const double max_value); /** * This is one more @@ -1042,9 +1043,10 @@ class DataOutBase * variable to the address of * this function. */ - static RgbValues reverse_grey_scale_color_function (const double value, - const double min_value, - const double max_value); + static RgbValues + reverse_grey_scale_color_function (const double value, + const double min_value, + const double max_value); /** * Constructor. @@ -2059,7 +2061,7 @@ class DataOutInterface : private DataOutBase inline bool -DataOutBase::EpsFlags::RgbValues::is_grey () const +DataOutBase::EpsFlags::RgbValues::is_grey () const { return (red == green) && (red == blue); } diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index 3c6a208068..3cc0c21b4b 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -656,7 +656,7 @@ class Exception1 : public ExceptionBase { \ #define DeclException2(Exception2, type1, type2, outsequence) \ class Exception2 : public ExceptionBase { \ public: \ - Exception2 (const type1 a1, const type2 a2) : \ + Exception2 (const type1 a1, const type2 a2) : \ arg1 (a1), arg2(a2) {}; \ virtual ~Exception2 () throw () {}; \ virtual void PrintInfo (std::ostream &out) const { \ @@ -678,7 +678,7 @@ class Exception2 : public ExceptionBase { \ #define DeclException3(Exception3, type1, type2, type3, outsequence) \ class Exception3 : public ExceptionBase { \ public: \ - Exception3 (const type1 a1, const type2 a2, const type3 a3) : \ + Exception3 (const type1 a1, const type2 a2, const type3 a3) : \ arg1 (a1), arg2(a2), arg3(a3) {}; \ virtual ~Exception3 () throw () {}; \ virtual void PrintInfo (std::ostream &out) const { \ @@ -702,7 +702,7 @@ class Exception3 : public ExceptionBase { \ class Exception4 : public ExceptionBase { \ public: \ Exception4 (const type1 a1, const type2 a2, \ - const type3 a3, const type4 a4) : \ + const type3 a3, const type4 a4) : \ arg1 (a1), arg2(a2), arg3(a3), arg4(a4) {}; \ virtual ~Exception4 () throw () {}; \ virtual void PrintInfo (std::ostream &out) const { \ @@ -727,7 +727,7 @@ class Exception4 : public ExceptionBase { \ class Exception5 : public ExceptionBase { \ public: \ Exception5 (const type1 a1, const type2 a2, const type3 a3, \ - const type4 a4, const type5 a5) : \ + const type4 a4, const type5 a5) : \ arg1 (a1), arg2(a2), arg3(a3), arg4(a4), arg5(a5) {}; \ virtual ~Exception5 () throw () {}; \ virtual void PrintInfo (std::ostream &out) const { \ diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index 90349aaf96..b0d925b8d1 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -23,7 +23,7 @@ template class Point; template class Tensor; template class Tensor<1,dim>; -template class Vector; +template class Vector; /** * This class is a model for a general function. It serves the purpose @@ -202,8 +202,8 @@ class Function : public FunctionTime, * size beforehand, * i.e. @p{n_components}. */ - virtual void vector_value (const Point &p, - Vector &values) const; + virtual void vector_value (const Point &p, + Vector &values) const; /** * Set @p{values} to the point @@ -245,8 +245,8 @@ class Function : public FunctionTime, * components of the * function at the given point. */ - virtual void vector_gradient (const Point &p, - std::vector > &gradients) const; + virtual void vector_gradient (const Point &p, + std::vector > &gradients) const; /** * Set @p{gradients} to the @@ -379,8 +379,8 @@ class ZeroFunction : public Function * at the given point for all * components. */ - virtual void vector_value (const Point &p, - Vector &return_value) const; + virtual void vector_value (const Point &p, + Vector &return_value) const; /** * Set @p{values} to the point values @@ -421,8 +421,8 @@ class ZeroFunction : public Function * function at the given point, * for all components. */ - virtual void vector_gradient (const Point &p, - std::vector > &gradients) const; + virtual void vector_gradient (const Point &p, + std::vector > &gradients) const; /** * Set @p{gradients} to the gradients of @@ -562,6 +562,8 @@ class ConstantFunction : public ZeroFunction const double function_value; }; + + /** * This is a constant vector-valued function, that is different from * zero only in one component. diff --git a/deal.II/base/include/base/function_derivative.h b/deal.II/base/include/base/function_derivative.h index d5a717f74e..a3cdfcaac3 100644 --- a/deal.II/base/include/base/function_derivative.h +++ b/deal.II/base/include/base/function_derivative.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -56,9 +56,9 @@ class FunctionDerivative : public Function * and the step size @p{h} of the * difference formula. */ - FunctionDerivative (const Function& f, - const Point& direction, - const double h = 1.e-6); + FunctionDerivative (const Function &f, + const Point &direction, + const double h = 1.e-6); /** * Constructor. Provided are the @@ -110,8 +110,8 @@ class FunctionDerivative : public Function * points. */ virtual void value_list (const std::vector > &points, - std::vector &values, - const unsigned int component = 0) const; + std::vector &values, + const unsigned int component = 0) const; /** * Determine an estimate for @@ -147,10 +147,12 @@ class FunctionDerivative : public Function * formula. */ double h; + /** * Difference formula. */ DifferenceFormula formula; + /** * Helper object. Contains the * increment vector for the diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index a43c781bbb..376f165471 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -256,13 +256,15 @@ namespace Functions const unsigned int component = 0) const; /** - * Gradient at a single point. + * Second derivatives at a + * single point. */ virtual Tensor<2,dim> hessian (const Point &p, const unsigned int component = 0) const; /** - * Gradients at multiple points. + * Second derivatives at + * multiple points. */ virtual void hessian_list (const std::vector > &points, std::vector > &hessians, @@ -502,7 +504,8 @@ namespace Functions const unsigned int component = 0) const; /** - * Function values at multiple points. + * Function values at multiple + * points. */ virtual void value_list (const std::vector > &points, std::vector &values, diff --git a/deal.II/base/include/base/function_time.h b/deal.II/base/include/base/function_time.h index a747284bb9..434c21bb7b 100644 --- a/deal.II/base/include/base/function_time.h +++ b/deal.II/base/include/base/function_time.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer diff --git a/deal.II/base/include/base/job_identifier.h b/deal.II/base/include/base/job_identifier.h index d295606e6a..c8ee8639e5 100644 --- a/deal.II/base/include/base/job_identifier.h +++ b/deal.II/base/include/base/job_identifier.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,7 +55,7 @@ class JobIdentifier /** * Return the value of @p{id}. */ - const std::string operator () ()const; + const std::string operator () () const; private: /** diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 09a9eb4ded..9acea8a886 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -117,7 +117,7 @@ class LogStream * this function with @p{n=0}, no * console output will be written. */ - void depth_console (unsigned int n); + void depth_console (const unsigned int n); /** * Maximum number of levels to be @@ -128,7 +128,7 @@ class LogStream * with care, since it may spoile * the value of a log file. */ - void depth_file (unsigned int n); + void depth_file (const unsigned int n); /** * Set time printing flag. If this flag @@ -136,7 +136,7 @@ class LogStream * be prepended by the user time used * by the running program so far. */ - void log_execution_time (bool flag); + void log_execution_time (const bool flag); /** * Output time differences @@ -155,7 +155,7 @@ class LogStream * not changed by this function, * just the output. */ - void log_time_differences (bool flag); + void log_time_differences (const bool flag); /** * Output a constant something @@ -280,7 +280,7 @@ class LogStream * optional time information and * the contents of the prefix stack. */ - void print_line_head(); + void print_line_head (); /** * Actually do the work of diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index 026b7e8ec9..e779d940da 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -390,7 +390,7 @@ namespace MemoryConsumption namespace MemoryConsumption { inline - unsigned int memory_consumption (const bool) + unsigned int memory_consumption (const bool) { return sizeof(bool); } diff --git a/deal.II/base/include/base/multithread_info.h b/deal.II/base/include/base/multithread_info.h index e1ad34062d..e99b25bd98 100644 --- a/deal.II/base/include/base/multithread_info.h +++ b/deal.II/base/include/base/multithread_info.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002 by the deal authors +// Copyright (C) 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -46,7 +46,7 @@ class MultithreadInfo * detection failed or if * detection is not supported. */ - MultithreadInfo(); + MultithreadInfo (); /** * The number of CPUs in the diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index 270ea4d554..ced2614aad 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -1184,13 +1184,13 @@ class ParameterHandler * Inhibit automatic * CopyConstructor. */ - ParameterHandler(const ParameterHandler&); + ParameterHandler (const ParameterHandler&); /** * Inhibit automatic * assignment operator. */ - ParameterHandler& operator=(const ParameterHandler&); + ParameterHandler& operator= (const ParameterHandler&); public: /** diff --git a/deal.II/base/include/base/point.h b/deal.II/base/include/base/point.h index 4c224d9983..ad8f3933e6 100644 --- a/deal.II/base/include/base/point.h +++ b/deal.II/base/include/base/point.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -47,12 +47,15 @@ class Point : public Tensor<1,dim> { public: /** - * Standard constructor. Creates an origin. + * Standard constructor. Creates + * an origin. */ Point (); + /** - * Constructor. Initialize all entries - * to zero if @p{initialize==true}. + * Constructor. Initialize all + * entries to zero if + * @p{initialize==true}. */ explicit Point (const bool initialize); @@ -182,7 +185,8 @@ Point::Point () template inline -Point::Point (const bool initialize) : +Point::Point (const bool initialize) + : Tensor<1,dim>(initialize) {} @@ -190,7 +194,8 @@ Point::Point (const bool initialize) : template inline -Point::Point (const Tensor<1,dim> &t) : +Point::Point (const Tensor<1,dim> &t) + : Tensor<1,dim>(t) {} @@ -241,7 +246,7 @@ double Point::operator () (const unsigned int index) const template inline -double & Point::operator () (const unsigned int index) +double & Point::operator () (const unsigned int index) { Assert (indexvalues[index]; @@ -251,7 +256,7 @@ double & Point::operator () (const unsigned int index) template inline -Point Point::operator + (const Tensor<1,dim> &p) const +Point Point::operator + (const Tensor<1,dim> &p) const { return (Point(*this) += p); } @@ -260,7 +265,7 @@ Point Point::operator + (const Tensor<1,dim> &p) const template inline -Point Point::operator - (const Tensor<1,dim> &p) const +Point Point::operator - (const Tensor<1,dim> &p) const { return (Point(*this) -= p); } @@ -269,7 +274,7 @@ Point Point::operator - (const Tensor<1,dim> &p) const template inline -Point Point::operator - () const +Point Point::operator - () const { Point result; for (unsigned int i=0; i Point::operator - () const template inline -Point Point::operator * (const double factor) const +Point Point::operator * (const double factor) const { return (Point(*this) *= factor); } @@ -290,7 +295,7 @@ Point Point::operator * (const double factor) const template inline -double Point::operator * (const Tensor<1,dim> &p) const +double Point::operator * (const Tensor<1,dim> &p) const { // simply pass down return Tensor<1,dim>::operator * (p); @@ -299,7 +304,7 @@ double Point::operator * (const Tensor<1,dim> &p) const template inline -double Point::square () const +double Point::square () const { double q=0; for (unsigned int i=0; i::distance (const Point &p) const template inline -Point Point::operator / (const double factor) const +Point Point::operator / (const double factor) const { return (Point(*this) /= factor); } @@ -340,7 +345,7 @@ Point Point::operator / (const double factor) const */ template inline -Point operator * (const double factor, const Point &p) +Point operator * (const double factor, const Point &p) { return p*factor; } diff --git a/deal.II/base/include/base/quadrature.h b/deal.II/base/include/base/quadrature.h index 4a2682425e..2a94844eca 100644 --- a/deal.II/base/include/base/quadrature.h +++ b/deal.II/base/include/base/quadrature.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -104,7 +104,7 @@ class Quadrature : public Subscriptor * @p{Quadrature}. */ Quadrature (const SubQuadrature &, - const Quadrature<1> &); + const Quadrature<1> &); /** * Construct a quadrature formula @@ -149,13 +149,15 @@ class Quadrature : public Subscriptor virtual ~Quadrature (); /** - * Return the @p{i}th quadrature point. + * Return the @p{i}th quadrature + * point. */ const Point & point (const unsigned int i) const; /** - * Return a reference to the whole array of - * quadrature points. + * Return a reference to the + * whole array of quadrature + * points. */ const std::vector > & get_points () const; @@ -195,6 +197,7 @@ class Quadrature : public Subscriptor }; + /** * Quadrature formula constructed by iteration of another quadrature formula in * each direction. In more than one space dimension, the resulting quadrature @@ -255,10 +258,12 @@ class QIterated : public Quadrature * points at the left and right end points * of the interval. */ - static bool uses_both_endpoints (const Quadrature<1> &base_quadrature); + static bool + uses_both_endpoints (const Quadrature<1> &base_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 @@ -417,45 +422,54 @@ template <> const std::vector & Quadrature<0>::get_weights () const; template <> -void QProjector<1>::project_to_face (const Quadrature<0> &, - const unsigned int, - std::vector > &); +void +QProjector<1>::project_to_face (const Quadrature<0> &, + const unsigned int, + std::vector > &); template <> -void QProjector<2>::project_to_face (const Quadrature<1> &quadrature, - const unsigned int face_no, - std::vector > &q_points); +void +QProjector<2>::project_to_face (const Quadrature<1> &quadrature, + const unsigned int face_no, + std::vector > &q_points); template <> -void QProjector<3>::project_to_face (const Quadrature<2> &quadrature, - const unsigned int face_no, - std::vector > &q_points); +void +QProjector<3>::project_to_face (const Quadrature<2> &quadrature, + const unsigned int face_no, + std::vector > &q_points); template <> -Quadrature<1> QProjector<1>::project_to_all_faces (const Quadrature<0> &quadrature); +Quadrature<1> +QProjector<1>::project_to_all_faces (const Quadrature<0> &quadrature); template <> -void QProjector<1>::project_to_subface (const Quadrature<0> &, - const unsigned int, - const unsigned int, - std::vector > &); +void +QProjector<1>::project_to_subface (const Quadrature<0> &, + const unsigned int, + const unsigned int, + std::vector > &); template <> -void QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, - const unsigned int face_no, - const unsigned int subface_no, - std::vector > &q_points); +void +QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, + const unsigned int face_no, + const unsigned int subface_no, + std::vector > &q_points); template <> -void QProjector<3>::project_to_subface (const Quadrature<2> &quadrature, - const unsigned int face_no, - const unsigned int subface_no, - std::vector > &q_points); +void +QProjector<3>::project_to_subface (const Quadrature<2> &quadrature, + const unsigned int face_no, + const unsigned int subface_no, + std::vector > &q_points); template <> -Quadrature<1> QProjector<1>::project_to_all_subfaces (const Quadrature<0> &quadrature); +Quadrature<1> +QProjector<1>::project_to_all_subfaces (const Quadrature<0> &quadrature); template <> bool QIterated<1>::uses_both_endpoints (const Quadrature<1> &base_quadrature); + template <> QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, const unsigned int n_copies); diff --git a/deal.II/base/include/base/smartpointer.h b/deal.II/base/include/base/smartpointer.h index ef32d229f3..3434c8d5ca 100644 --- a/deal.II/base/include/base/smartpointer.h +++ b/deal.II/base/include/base/smartpointer.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -57,29 +57,33 @@ class SmartPointer /** * Standard constructor for null pointer. */ - SmartPointer(); + SmartPointer (); /* * Copy constructor for - * @p{SmartPointer}. We copy the object - * subscribed to from @p{tt}, but subscribe + * @p{SmartPointer}. We do now + * copy the object subscribed to + * from @p{tt}, but subscribe * ourselves to it again. */ SmartPointer (const SmartPointer &tt); /** - * Constructor taking a normal pointer. - * If possible, i.e. if the pointer - * is not a null pointer, the constructor - * subscribes to the given object to - * lock it, i.e. to prevent its - * destruction before the end of its use. + * Constructor taking a normal + * pointer. If possible, i.e. if + * the pointer is not a null + * pointer, the constructor + * subscribes to the given object + * to lock it, i.e. to prevent + * its destruction before the end + * of its use. */ SmartPointer (T *t); /** - * Destructor, removing the subscription. + * Destructor, removing the + * subscription. */ ~SmartPointer(); @@ -183,14 +187,16 @@ class SmartPointer template -SmartPointer::SmartPointer () : +SmartPointer::SmartPointer () + : t (0) {} template -SmartPointer::SmartPointer (T *t) : +SmartPointer::SmartPointer (T *t) + : t (t) { if (t != 0) @@ -200,7 +206,8 @@ SmartPointer::SmartPointer (T *t) : template -SmartPointer::SmartPointer (const SmartPointer &tt) : +SmartPointer::SmartPointer (const SmartPointer &tt) + : t (tt.t) { if (t != 0) @@ -237,7 +244,8 @@ SmartPointer & SmartPointer::operator = (T *tt) template -SmartPointer & SmartPointer::operator = (const SmartPointer& tt) +SmartPointer & +SmartPointer::operator = (const SmartPointer& tt) { // if objects on the left and right // hand side of the operator= are diff --git a/deal.II/base/include/base/table.h b/deal.II/base/include/base/table.h index 38d6c8a4c8..ed48415406 100644 --- a/deal.II/base/include/base/table.h +++ b/deal.II/base/include/base/table.h @@ -409,6 +409,7 @@ namespace internal * private. */ Accessor (); + /** * Copy constructor. Not * needed, and invisible, so @@ -897,7 +898,7 @@ class TableBase : public Subscriptor * don't know here whether * copying is expensive or not. */ - const T & el (const TableIndices &indices) const; + const T & el (const TableIndices &indices) const; /** * Direct read-only access to @@ -953,7 +954,8 @@ class TableBase : public Subscriptor */ template class Table : public TableBase -{}; +{ +}; /** @@ -1575,7 +1577,7 @@ TableIndices<1>::TableIndices () inline -TableIndices<1>::TableIndices (const unsigned int index1) +TableIndices<1>::TableIndices (const unsigned int index1) { this->indices[0] = index1; } @@ -1620,7 +1622,7 @@ TableIndices<3>::TableIndices (const unsigned int index1, inline -TableIndices<4>::TableIndices () +TableIndices<4>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = 0; } @@ -1642,9 +1644,12 @@ TableIndices<4>::TableIndices (const unsigned int index1, inline -TableIndices<5>::TableIndices () +TableIndices<5>::TableIndices () { - this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = this->indices[4] = 0; + this->indices[0] = this->indices[1] + = this->indices[2] + = this->indices[3] + = this->indices[4] = 0; } @@ -1666,7 +1671,7 @@ TableIndices<5>::TableIndices (const unsigned int index1, inline -TableIndices<6>::TableIndices () +TableIndices<6>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = this->indices[4] = 0; @@ -1788,7 +1793,7 @@ namespace internal template inline Accessor - Accessor::operator [] (const unsigned int i) const + Accessor::operator [] (const unsigned int i) const { Assert (i < table.size()[N-P], ExcIndexRange (i, 0, table.size()[N-P])); @@ -1857,7 +1862,7 @@ namespace internal template inline typename Accessor::reference - Accessor::operator [] (const unsigned int i) const + Accessor::operator [] (const unsigned int i) const { Assert (i < table.size()[N-1], ExcIndexRange (i, 0, table.size()[N-1])); @@ -1910,7 +1915,7 @@ TableBase::~TableBase () template TableBase& -TableBase::operator = (const TableBase& m) +TableBase::operator = (const TableBase& m) { reinit (m.size()); if (!empty()) @@ -1924,7 +1929,7 @@ TableBase::operator = (const TableBase& m) template template TableBase& -TableBase::operator = (const TableBase& m) +TableBase::operator = (const TableBase& m) { reinit (m.size()); if (!empty()) @@ -2047,7 +2052,7 @@ TableBase::memory_consumption () const template inline unsigned int -TableBase::position (const TableIndices &indices) const +TableBase::position (const TableIndices &indices) const { // specialize this for the // different numbers of dimensions, @@ -2130,7 +2135,7 @@ TableBase::data () const template -Table<1,T>::Table () +Table<1,T>::Table () {} @@ -2316,7 +2321,7 @@ Table<2,T>::n_cols () const template -Table<3,T>::Table () +Table<3,T>::Table () {} @@ -2402,7 +2407,7 @@ Table<3,T>::operator () (const unsigned int i, template -Table<4,T>::Table () +Table<4,T>::Table () {} @@ -2500,7 +2505,7 @@ Table<4,T>::operator () (const unsigned int i, template -Table<5,T>::Table () +Table<5,T>::Table () {} @@ -2608,7 +2613,7 @@ Table<5,T>::operator () (const unsigned int i, template -Table<6,T>::Table () +Table<6,T>::Table () {} diff --git a/deal.II/base/include/base/table_handler.h b/deal.II/base/include/base/table_handler.h index 571eef05e7..0cebb6f1b5 100644 --- a/deal.II/base/include/base/table_handler.h +++ b/deal.II/base/include/base/table_handler.h @@ -54,12 +54,12 @@ class TableEntryBase /** * Write the table entry as text. */ - virtual void write_text (std::ostream &) const =0; + virtual void write_text (std::ostream &) const = 0; /** * Write the table entry in tex format. */ - virtual void write_tex (std::ostream &) const =0; + virtual void write_tex (std::ostream &) const = 0; }; @@ -81,7 +81,7 @@ class TableEntry : public TableEntryBase /** * Constructor. */ - TableEntry(const value_type value); + TableEntry (const value_type value); /** * Destructor. @@ -92,7 +92,7 @@ class TableEntry : public TableEntryBase * Returns the value of this * table entry. */ - value_type value() const; + value_type value () const; /** * Write the table entry as text. @@ -180,7 +180,7 @@ class TableHandler /** * Constructor. */ - TableHandler(); + TableHandler (); /** * Adds a column (if not yet diff --git a/deal.II/base/include/base/tensor.h b/deal.II/base/include/base/tensor.h index 8bafe9c136..b39b5ee528 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -209,7 +209,7 @@ class Tensor // also, it would be sufficient to make // the function unroll_loops a friend, // but that seems to be impossible as well. - template friend class Tensor; + template friend class Tensor; }; @@ -706,7 +706,7 @@ void contract (Tensor<4,dim> &dest, template void outer_product (Tensor<2,dim> &dst, const Tensor<1,dim> &src1, - const Tensor<1,dim> &src2) + const Tensor<1,dim> &src2) { for (unsigned int i=0; i &dst, template void outer_product (Tensor<3,dim> &dst, const Tensor<1,dim> &src1, - const Tensor<2,dim> &src2) + const Tensor<2,dim> &src2) { for (unsigned int i=0; i &dst, template void outer_product (Tensor<3,dim> &dst, const Tensor<2,dim> &src1, - const Tensor<1,dim> &src2) + const Tensor<1,dim> &src2) { for (unsigned int i=0; i &dst, template void outer_product (Tensor<1,dim> &dst, const double src1, - const Tensor<1,dim> &src2) + const Tensor<1,dim> &src2) { for (unsigned int i=0; i &dst, template void outer_product (Tensor<1,dim> &dst, const Tensor<1,dim> src1, - const double src2) + const double src2) { for (unsigned int i=0; i &t) template inline Tensor<2,dim> -transpose (const Tensor<2,dim> &t) +transpose (const Tensor<2,dim> &t) { Tensor<2,dim> tt = t; for (unsigned int i=0; i &t) */ inline Tensor<2,1> -transpose (const Tensor<2,1> &t) +transpose (const Tensor<2,1> &t) { return t; } @@ -1057,7 +1057,7 @@ transpose (const Tensor<2,1> &t) */ inline Tensor<2,2> -transpose (const Tensor<2,2> &t) +transpose (const Tensor<2,2> &t) { const double x[2][2] = {{t[0][0], t[1][0]}, {t[0][1], t[1][1]}}; return Tensor<2,2>(x); @@ -1074,7 +1074,7 @@ transpose (const Tensor<2,2> &t) */ inline Tensor<2,3> -transpose (const Tensor<2,3> &t) +transpose (const Tensor<2,3> &t) { const double x[3][3] = {{t[0][0], t[1][0], t[2][0]}, {t[0][1], t[1][1], t[2][1]}, diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h index 7030178acc..1e0429ff47 100644 --- a/deal.II/base/include/base/tensor_base.h +++ b/deal.II/base/include/base/tensor_base.h @@ -147,12 +147,14 @@ class Tensor<1,dim> Tensor<1,dim> & operator = (const Tensor<1,dim> &); /** - * Test for equality of two points. + * Test for equality of two + * tensors. */ bool operator == (const Tensor<1,dim> &) const; /** - * Test for inequality of two points. + * Test for inequality of two + * tensors. */ bool operator != (const Tensor<1,dim> &) const; @@ -162,6 +164,7 @@ class Tensor<1,dim> * offset. */ Tensor<1,dim> & operator += (const Tensor<1,dim> &); + /** * Subtract another vector. */ @@ -281,7 +284,7 @@ class Tensor<1,dim> * that seems to be impossible as * well. */ - template friend class Tensor; + template friend class Tensor; /** * Point is allowed access to diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index e61d0ad6b3..d1fc171c5b 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 03383d5478..636e91961e 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -704,7 +704,7 @@ namespace Threads * for use in the template * functions below. */ - void deregister_thread (); + void deregister_thread (); } } // end declarations of namespace Threads diff --git a/deal.II/base/include/base/timer.h b/deal.II/base/include/base/timer.h index a4551d4fb5..427b025ff9 100644 --- a/deal.II/base/include/base/timer.h +++ b/deal.II/base/include/base/timer.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer diff --git a/deal.II/base/source/auto_derivative_function.cc b/deal.II/base/source/auto_derivative_function.cc index af219f9f40..5527ffea40 100644 --- a/deal.II/base/source/auto_derivative_function.cc +++ b/deal.II/base/source/auto_derivative_function.cc @@ -20,9 +20,11 @@ template -AutoDerivativeFunction::AutoDerivativeFunction (const double hh, - const unsigned int n_components, - const double initial_time): +AutoDerivativeFunction:: +AutoDerivativeFunction (const double hh, + const unsigned int n_components, + const double initial_time) + : Function(n_components, initial_time), h(1), ht(dim), @@ -111,8 +113,10 @@ AutoDerivativeFunction::gradient (const Point &p, template -void AutoDerivativeFunction::vector_gradient (const Point &p, - std::vector > &gradients) const +void +AutoDerivativeFunction:: +vector_gradient (const Point &p, + std::vector > &gradients) const { Assert (gradients.size() == this->n_components, ExcDimensionMismatch(gradients.size(), this->n_components)); @@ -135,6 +139,7 @@ void AutoDerivativeFunction::vector_gradient (const Point &p, } break; } + case Euler: { Point q1, q2; @@ -152,6 +157,7 @@ void AutoDerivativeFunction::vector_gradient (const Point &p, } break; } + case FourthOrder: { Point q1, q2, q3, q4; @@ -175,6 +181,7 @@ void AutoDerivativeFunction::vector_gradient (const Point &p, } break; } + default: Assert(false, ExcInvalidFormula()); } @@ -182,9 +189,11 @@ void AutoDerivativeFunction::vector_gradient (const Point &p, template -void AutoDerivativeFunction::gradient_list (const std::vector > &points, - std::vector > &gradients, - const unsigned int comp) const +void +AutoDerivativeFunction:: +gradient_list (const std::vector > &points, + std::vector > &gradients, + const unsigned int comp) const { Assert (gradients.size() == points.size(), ExcDimensionMismatch(gradients.size(), points.size())); @@ -202,6 +211,7 @@ void AutoDerivativeFunction::gradient_list (const std::vector > } break; } + case Euler: { Point q1, q2; @@ -214,6 +224,7 @@ void AutoDerivativeFunction::gradient_list (const std::vector > } break; } + case FourthOrder: { Point q1, q2, q3, q4; @@ -231,6 +242,7 @@ void AutoDerivativeFunction::gradient_list (const std::vector > } break; } + default: Assert(false, ExcInvalidFormula()); } @@ -264,6 +276,7 @@ vector_gradient_list (const std::vector > &points, } break; } + case Euler: { Point q1, q2; @@ -273,10 +286,12 @@ vector_gradient_list (const std::vector > &points, q1=points[p]+ht[i]; q2=points[p]-ht[i]; for (unsigned int comp=0; compn_components; ++comp) - gradients[p][comp][i]=(this->value(q1, comp)-this->value(q2, comp))/(2*h); + gradients[p][comp][i]=(this->value(q1, comp) - + this->value(q2, comp))/(2*h); } break; } + case FourthOrder: { Point q1, q2, q3, q4; @@ -295,6 +310,7 @@ vector_gradient_list (const std::vector > &points, } break; } + default: Assert(false, ExcInvalidFormula()); } diff --git a/deal.II/base/source/convergence_table.cc b/deal.II/base/source/convergence_table.cc index f9d17e4036..6b7ac32917 100644 --- a/deal.II/base/source/convergence_table.cc +++ b/deal.II/base/source/convergence_table.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,7 +16,7 @@ #include -ConvergenceTable::ConvergenceTable() +ConvergenceTable::ConvergenceTable() {} @@ -77,8 +77,10 @@ void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column } -void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column_key, - const RateMode rate_mode) + +void +ConvergenceTable::evaluate_convergence_rates(const std::string &data_column_key, + const RateMode rate_mode) { Assert(columns.count(data_column_key), ExcColumnNotExistent(data_column_key)); @@ -106,6 +108,7 @@ void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column { case none: break; + case reduction_rate: rate_key+="red.rate"; Assert(columns.count(rate_key)==0, ExcRateColumnAlreadyExists(rate_key)); @@ -115,6 +118,7 @@ void ConvergenceTable::evaluate_convergence_rates(const std::string &data_column for (unsigned int i=1; i::const_iterator col_iter=columns.begin(); col_iter!=columns.end(); ++col_iter) @@ -164,7 +174,9 @@ void ConvergenceTable::evaluate_all_convergence_rates(const std::string &referen } -void ConvergenceTable::evaluate_all_convergence_rates(const RateMode rate_mode) + +void +ConvergenceTable::evaluate_all_convergence_rates(const RateMode rate_mode) { for (std::map::const_iterator col_iter=columns.begin(); col_iter!=columns.end(); ++col_iter) diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 37feed730b..677801b0b7 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -28,10 +28,10 @@ const unsigned int DataOutBase::Patch::no_neighbor; template -DataOutBase::Patch::Patch () : +DataOutBase::Patch::Patch () + : patch_index(no_neighbor), n_subdivisions (1) - // all the other data has a // constructor of its own, except // for the "neighbors" field, which @@ -60,7 +60,8 @@ DataOutBase::Patch::memory_consumption () const -DataOutBase::UcdFlags::UcdFlags (const bool write_preamble) : +DataOutBase::UcdFlags::UcdFlags (const bool write_preamble) + : write_preamble (write_preamble) {} @@ -68,7 +69,8 @@ DataOutBase::UcdFlags::UcdFlags (const bool write_preamble) : DataOutBase::PovrayFlags::PovrayFlags (const bool smooth, const bool bicubic_patch, - const bool external_data) : + const bool external_data) + : smooth (smooth), bicubic_patch(bicubic_patch), external_data(external_data) @@ -76,7 +78,8 @@ DataOutBase::PovrayFlags::PovrayFlags (const bool smooth, DataOutBase::DXFlags::DXFlags (const bool write_multigrid, - const bool write_neighbors) : + const bool write_neighbors) + : write_multigrid(write_multigrid), write_neighbors(write_neighbors) {} @@ -195,7 +198,8 @@ DataOutBase::EpsFlags::EpsFlags (const unsigned int height_vector, const bool draw_mesh, const bool draw_cells, const bool shade_cells, - const ColorFunction color_function) : + const ColorFunction color_function) + : height_vector(height_vector), color_vector(color_vector), size_type(size_type), @@ -425,10 +429,11 @@ DataOutBase::GmvFlags::memory_consumption () const -DataOutBase::TecplotFlags::TecplotFlags (const char* tecplot_binary_file_name) : - tecplot_binary_file_name(tecplot_binary_file_name) -{ -} +DataOutBase::TecplotFlags:: +TecplotFlags (const char* tecplot_binary_file_name) + : + tecplot_binary_file_name(tecplot_binary_file_name) +{} @@ -3082,21 +3087,21 @@ namespace { class TecplotMacros { - public: - TecplotMacros(const unsigned int n_nodes = 0, - const unsigned int n_vars = 0, - const unsigned int n_cells = 0, - const unsigned int n_vert = 0); - ~TecplotMacros(); - float & nd(const unsigned int i, const unsigned int j); - int & cd(const unsigned int i, const unsigned int j); - std::vector nodalData; - std::vector connData; - private: - unsigned int n_nodes; - unsigned int n_vars; - unsigned int n_cells; - unsigned int n_vert; + public: + TecplotMacros(const unsigned int n_nodes = 0, + const unsigned int n_vars = 0, + const unsigned int n_cells = 0, + const unsigned int n_vert = 0); + ~TecplotMacros(); + float & nd(const unsigned int i, const unsigned int j); + int & cd(const unsigned int i, const unsigned int j); + std::vector nodalData; + std::vector connData; + private: + unsigned int n_nodes; + unsigned int n_vars; + unsigned int n_cells; + unsigned int n_vert; }; @@ -3104,7 +3109,8 @@ namespace TecplotMacros::TecplotMacros(const unsigned int n_nodes, const unsigned int n_vars, const unsigned int n_cells, - const unsigned int n_vert) : + const unsigned int n_vert) + : n_nodes(n_nodes), n_vars(n_vars), n_cells(n_cells), @@ -3118,13 +3124,13 @@ namespace inline TecplotMacros::~TecplotMacros() - { - } + {} inline - float & TecplotMacros::nd(const unsigned int i, const unsigned int j) + float & TecplotMacros::nd (const unsigned int i, + const unsigned int j) { return nodalData[(i)*(n_nodes) + (j)]; } @@ -3132,7 +3138,8 @@ namespace inline - int & TecplotMacros::cd(const unsigned int i, const unsigned int j) + int & TecplotMacros::cd (const unsigned int i, + const unsigned int j) { return connData[(i) + (j)*(n_vert)]; } @@ -3154,22 +3161,27 @@ void DataOutBase::write_tecplot_binary (const std::vector > #ifndef DEAL_II_HAVE_TECPLOT - // simply call the ASCII output function if the Tecplot API isn't present + // simply call the ASCII output + // function if the Tecplot API + // isn't present write_tecplot (patches, data_names, flags, out); return; #else - // Tecplot binary output only good for 2D & 3D + // Tecplot binary output only good + // for 2D & 3D if (dim == 1) { write_tecplot (patches, data_names, flags, out); return; }; - // if the user hasn't specified a file name we should - // call the ASCII function and use the ostream @p{out} - // instead of doing something silly later + // if the user hasn't specified a + // file name we should call the + // ASCII function and use the + // ostream @p{out} instead of doing + // something silly later char* file_name = (char*) flags.tecplot_binary_file_name; if (file_name == NULL) @@ -3197,7 +3209,8 @@ void DataOutBase::write_tecplot_binary (const std::vector > // and cells for later use unsigned int n_cells = 0, n_nodes = 0; - for (typename std::vector >::const_iterator patch=patches.begin(); + for (typename std::vector >::const_iterator + patch=patches.begin(); patch!=patches.end(); ++patch) switch (dim) { @@ -4078,16 +4091,18 @@ DataOutInterface::write (std::ostream &out, template -void DataOutInterface::set_default_format(const OutputFormat fmt) +void +DataOutInterface::set_default_format(const OutputFormat fmt) { - Assert(fmt != default_format, ExcNotImplemented()); + Assert (fmt != default_format, ExcNotImplemented()); default_fmt = fmt; } template -void DataOutInterface::set_flags (const DXFlags &flags) +void +DataOutInterface::set_flags (const DXFlags &flags) { dx_flags = flags; } @@ -4095,7 +4110,8 @@ void DataOutInterface::set_flags (const DXFlags &flags) template -void DataOutInterface::set_flags (const UcdFlags &flags) +void +DataOutInterface::set_flags (const UcdFlags &flags) { ucd_flags = flags; } @@ -4103,7 +4119,8 @@ void DataOutInterface::set_flags (const UcdFlags &flags) template -void DataOutInterface::set_flags (const GnuplotFlags &flags) +void +DataOutInterface::set_flags (const GnuplotFlags &flags) { gnuplot_flags = flags; } @@ -4111,7 +4128,8 @@ void DataOutInterface::set_flags (const GnuplotFlags &flags) template -void DataOutInterface::set_flags (const PovrayFlags &flags) +void +DataOutInterface::set_flags (const PovrayFlags &flags) { povray_flags = flags; } @@ -4119,7 +4137,8 @@ void DataOutInterface::set_flags (const PovrayFlags &flags) template -void DataOutInterface::set_flags (const EpsFlags &flags) +void +DataOutInterface::set_flags (const EpsFlags &flags) { eps_flags = flags; } @@ -4127,7 +4146,8 @@ void DataOutInterface::set_flags (const EpsFlags &flags) template -void DataOutInterface::set_flags (const GmvFlags &flags) +void +DataOutInterface::set_flags (const GmvFlags &flags) { gmv_flags = flags; } @@ -4135,7 +4155,8 @@ void DataOutInterface::set_flags (const GmvFlags &flags) template -void DataOutInterface::set_flags (const TecplotFlags &flags) +void +DataOutInterface::set_flags (const TecplotFlags &flags) { tecplot_flags = flags; } @@ -4143,7 +4164,8 @@ void DataOutInterface::set_flags (const TecplotFlags &flags) template -void DataOutInterface::set_flags (const VtkFlags &flags) +void +DataOutInterface::set_flags (const VtkFlags &flags) { vtk_flags = flags; } @@ -4152,7 +4174,8 @@ void DataOutInterface::set_flags (const VtkFlags &flags) template std::string -DataOutInterface::default_suffix (const OutputFormat output_format_) const +DataOutInterface:: +default_suffix (const OutputFormat output_format_) const { OutputFormat output_format = output_format_; if (output_format == default_format) @@ -4197,7 +4220,8 @@ DataOutInterface::default_suffix (const OutputFormat output_format template typename DataOutInterface::OutputFormat -DataOutInterface::parse_output_format (const std::string &format_name) +DataOutInterface:: +parse_output_format (const std::string &format_name) { if (format_name == "dx") return dx; @@ -4235,7 +4259,8 @@ DataOutInterface::parse_output_format (const std::string &format_n template -std::string DataOutInterface::get_output_format_names () +std::string +DataOutInterface::get_output_format_names () { return "dx|ucd|gnuplot|povray|eps|gmv|tecplot|vtk"; } @@ -4243,7 +4268,8 @@ std::string DataOutInterface::get_output_format_names () template -void DataOutInterface::declare_parameters (ParameterHandler &prm) +void +DataOutInterface::declare_parameters (ParameterHandler &prm) { prm.declare_entry ("Output format", "gnuplot", Patterns::Selection (get_output_format_names ())); @@ -4284,7 +4310,8 @@ void DataOutInterface::declare_parameters (ParameterHandler &prm) template -void DataOutInterface::parse_parameters (ParameterHandler &prm) +void +DataOutInterface::parse_parameters (ParameterHandler &prm) { const std::string& output_name = prm.get ("Output format"); default_fmt = parse_output_format (output_name); @@ -4323,6 +4350,7 @@ void DataOutInterface::parse_parameters (ParameterHandler &prm) } + template unsigned int DataOutInterface::memory_consumption () const diff --git a/deal.II/base/source/exceptions.cc b/deal.II/base/source/exceptions.cc index da7bcf9473..cd706d3c06 100644 --- a/deal.II/base/source/exceptions.cc +++ b/deal.II/base/source/exceptions.cc @@ -25,14 +25,16 @@ -ExceptionBase::ExceptionBase () : +ExceptionBase::ExceptionBase () + : file(""), line(0), function(""), cond(""), exc("") {} ExceptionBase::ExceptionBase (const char* f, const int l, const char *func, - const char* c, const char *e) : + const char* c, const char *e) + : file(f), line(l), function(func), cond(c), exc(e) {} diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index fd46e61793..fdad456fd2 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -20,7 +20,8 @@ template Function::Function (const unsigned int n_components, - const double initial_time) : + const double initial_time) + : FunctionTime(initial_time), n_components(n_components) {} @@ -200,7 +201,8 @@ Function::memory_consumption () const //------------------------------------------------------------// template -ZeroFunction::ZeroFunction (const unsigned int n_components) : +ZeroFunction::ZeroFunction (const unsigned int n_components) + : Function (n_components) {} @@ -309,16 +311,19 @@ void ZeroFunction::vector_gradient_list (const std::vector > template ConstantFunction::ConstantFunction (const double value, - const unsigned int n_components) : + const unsigned int n_components) + : ZeroFunction (n_components), function_value (value) {} + template ConstantFunction::~ConstantFunction () {} + template double ConstantFunction::value (const Point &, const unsigned int) const @@ -327,6 +332,7 @@ double ConstantFunction::value (const Point &, } + template void ConstantFunction::vector_value (const Point &, Vector &return_value) const @@ -338,6 +344,7 @@ void ConstantFunction::vector_value (const Point &, } + template void ConstantFunction::value_list (const std::vector > &points, std::vector &values, @@ -350,6 +357,7 @@ void ConstantFunction::value_list (const std::vector > &points, } + template void ConstantFunction::vector_value_list (const std::vector > &points, std::vector > &values) const @@ -379,15 +387,17 @@ ConstantFunction::memory_consumption () const //------------------------------------------------------------// template -ComponentSelectFunction::ComponentSelectFunction (const unsigned int selected, - const double value, - const unsigned int n_components) +ComponentSelectFunction:: +ComponentSelectFunction (const unsigned int selected, + const double value, + const unsigned int n_components) : ConstantFunction (value, n_components), - selected(selected) + selected(selected) {} + template void ComponentSelectFunction::vector_value (const Point &, Vector &return_value) const diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index e7e7555cba..b1892e52d6 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -1321,8 +1321,8 @@ namespace Functions const std::vector &weights) : Function (1), - fourier_coefficients (fourier_coefficients), - weights (weights) + fourier_coefficients (fourier_coefficients), + weights (weights) { Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); Assert (fourier_coefficients.size() == weights.size(), diff --git a/deal.II/base/source/function_lib_cutoff.cc b/deal.II/base/source/function_lib_cutoff.cc index 9c9e2ae8fc..8010871e32 100644 --- a/deal.II/base/source/function_lib_cutoff.cc +++ b/deal.II/base/source/function_lib_cutoff.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer diff --git a/deal.II/base/source/function_time.cc b/deal.II/base/source/function_time.cc index 365acfae91..00aadd4aec 100644 --- a/deal.II/base/source/function_time.cc +++ b/deal.II/base/source/function_time.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,15 +20,21 @@ FunctionTime::FunctionTime(const double initial_time) time(initial_time) {} + + FunctionTime::~FunctionTime() {} + + void FunctionTime::set_time (const double new_time) { time = new_time; } + + void FunctionTime::advance_time (const double delta_t) { diff --git a/deal.II/base/source/log.cc b/deal.II/base/source/log.cc index 2e4a77dc7a..c3dbdf7d28 100644 --- a/deal.II/base/source/log.cc +++ b/deal.II/base/source/log.cc @@ -112,28 +112,28 @@ void LogStream::pop () void -LogStream::depth_console(unsigned n) +LogStream::depth_console (const unsigned n) { std_depth = n; } void -LogStream::depth_file(unsigned n) +LogStream::depth_file (const unsigned n) { file_depth = n; } void -LogStream::log_execution_time (bool flag) +LogStream::log_execution_time (const bool flag) { print_utime = flag; } void -LogStream::log_time_differences (bool flag) +LogStream::log_time_differences (const bool flag) { diff_utime = flag; } diff --git a/deal.II/base/source/multithread_info.cc b/deal.II/base/source/multithread_info.cc index 37550c2ba3..5fc7a3e49a 100644 --- a/deal.II/base/source/multithread_info.cc +++ b/deal.II/base/source/multithread_info.cc @@ -101,7 +101,8 @@ unsigned int MultithreadInfo::get_n_cpus() #endif -MultithreadInfo::MultithreadInfo () : +MultithreadInfo::MultithreadInfo () + : n_cpus (get_n_cpus()), n_default_threads (n_cpus) {} diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 22f3f6a1e3..d2e7729c02 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -31,6 +31,7 @@ # include #endif +//TODO[WB]: Remove the "status" flag -- it's only a remnant of the DiffPack past of this class and doesn't really serve any useful purpose any more namespace Patterns { @@ -72,7 +73,8 @@ namespace Patterns Integer::Integer (const int lower_bound, - const int upper_bound) : + const int upper_bound) + : lower_bound (lower_bound), upper_bound (upper_bound) {} @@ -157,7 +159,8 @@ namespace Patterns #endif Double::Double (const double lower_bound, - const double upper_bound) : + const double upper_bound) + : lower_bound (lower_bound), upper_bound (upper_bound) {} @@ -495,7 +498,8 @@ namespace Patterns - Bool::Bool () : + Bool::Bool () + : Selection ("true|false") {} @@ -538,7 +542,8 @@ namespace Patterns -ParameterHandler::ParameterHandler () : +ParameterHandler::ParameterHandler () + : status(true) {} @@ -668,10 +673,12 @@ bool ParameterHandler::declare_entry (const std::string &entry, if (p->entries.find (entry) != p->entries.end()) return false; + // entry doesn't yet exist, but + // map::operator[] will create it p->entries[entry] = std::make_pair(default_value, pattern.clone()); - // check whether default answer matches - // the pattern + // check whether default answer + // matches the pattern if (!pattern.match(default_value)) return false; @@ -738,8 +745,8 @@ const std::string & ParameterHandler::get (const std::string &entry_string) cons }; -// entry exists; now find out whether - // it was changed: + // entry exists; now find out + // whether it was changed: Section::EntryType::const_iterator ptr; ptr = pc->entries.find (entry_string); if (ptr != pc->entries.end()) @@ -840,7 +847,8 @@ void ParameterHandler::log_parameters (LogStream &out) { out.push("parameters"); - // dive recursively into the subsections + // dive recursively into the + // subsections log_parameters_section (out); out.pop(); @@ -1261,7 +1269,8 @@ ParameterHandler::Section::memory_consumption () const -MultipleParameterLoop::MultipleParameterLoop() : +MultipleParameterLoop::MultipleParameterLoop() + : n_branches(0) {} @@ -1484,7 +1493,8 @@ MultipleParameterLoop::memory_consumption () const MultipleParameterLoop::Entry::Entry (const std::vector &ssp, const std::string &Name, - const std::string &Value) : + const std::string &Value) + : subsection_path (ssp), entry_name(Name), entry_value(Value) {} diff --git a/deal.II/base/source/polynomial.cc b/deal.II/base/source/polynomial.cc index 1792e49d27..9266f9f3bf 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -121,8 +121,8 @@ namespace Polynomials template void - Polynomial::scale(std::vector &coefficients, - const number factor) + Polynomial::scale (std::vector &coefficients, + const number factor) { double f = 1.; for (typename std::vector::iterator c = coefficients.begin(); @@ -137,7 +137,7 @@ namespace Polynomials template void - Polynomial::scale(const number factor) + Polynomial::scale (const number factor) { scale (coefficients, factor); } @@ -146,8 +146,8 @@ namespace Polynomials template void - Polynomial::multiply(std::vector &coefficients, - const number factor) + Polynomial::multiply (std::vector &coefficients, + const number factor) { for (typename std::vector::iterator c = coefficients.begin(); c != coefficients.end(); ++c) @@ -230,15 +230,15 @@ namespace Polynomials template template void - Polynomial::shift(const number2 offset) + Polynomial::shift (const number2 offset) { - shift(coefficients, offset); + shift (coefficients, offset); } template void - Polynomial::print(std::ostream& out) const + Polynomial::print (std::ostream& out) const { for (int i=degree();i>=0;--i) { diff --git a/deal.II/base/source/polynomial_space.cc b/deal.II/base/source/polynomial_space.cc index 1debf26e89..0fdfb58753 100644 --- a/deal.II/base/source/polynomial_space.cc +++ b/deal.II/base/source/polynomial_space.cc @@ -34,8 +34,8 @@ PolynomialSpace::compute_n_pols (const unsigned int n) template <> void PolynomialSpace<1>:: -compute_index(const unsigned int n, - unsigned int (&index)[1]) const +compute_index (const unsigned int n, + unsigned int (&index)[1]) const { index[0] = n; } diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 49401242e8..8f303403dd 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -42,14 +42,14 @@ Quadrature::Quadrature (const unsigned int n_q) : template Quadrature::Quadrature (const std::vector > &points, - const std::vector &weights) + const std::vector &weights) : n_quadrature_points(points.size()), quadrature_points(points), weights(weights) { - Assert(weights.size() == points.size(), - ExcDimensionMismatch(weights.size(), points.size())); + Assert (weights.size() == points.size(), + ExcDimensionMismatch(weights.size(), points.size())); } @@ -68,7 +68,8 @@ Quadrature::Quadrature (const std::vector > &points) template -Quadrature::Quadrature (const Point &point): +Quadrature::Quadrature (const Point &point) + : n_quadrature_points(1), quadrature_points(std::vector > (1, point)), weights(std::vector (1, 1.)) @@ -78,7 +79,8 @@ Quadrature::Quadrature (const Point &point): template <> Quadrature<0>::Quadrature (const Quadrature<-1> &, const Quadrature<1> &) - : n_quadrature_points (0) + : + n_quadrature_points (0) { Assert (false, ExcInternalError()); } @@ -87,7 +89,8 @@ Quadrature<0>::Quadrature (const Quadrature<-1> &, template <> Quadrature<1>::Quadrature (const Quadrature<0> &, - const Quadrature<1> &) : + const Quadrature<1> &) + : n_quadrature_points (0) { Assert (false, ExcInternalError()); @@ -97,7 +100,7 @@ Quadrature<1>::Quadrature (const Quadrature<0> &, template Quadrature::Quadrature (const SubQuadrature &q1, - const Quadrature<1> &q2) + const Quadrature<1> &q2) : n_quadrature_points (q1.n_quadrature_points * q2.n_quadrature_points), @@ -142,7 +145,8 @@ Quadrature::~Quadrature () template <> -const Point<0> & Quadrature<0>::point (const unsigned int) const +const Point<0> & +Quadrature<0>::point (const unsigned int) const { Assert (false, ExcInternalError()); static const Point<0> dummy; @@ -152,7 +156,8 @@ const Point<0> & Quadrature<0>::point (const unsigned int) const template -const Point & Quadrature::point (const unsigned int i) const +const Point & +Quadrature::point (const unsigned int i) const { Assert (i & Quadrature::point (const unsigned int i) const template <> -const std::vector > & Quadrature<0>::get_points () const +const std::vector > & +Quadrature<0>::get_points () const { Assert (false, ExcInternalError()); return quadrature_points; @@ -170,7 +176,8 @@ const std::vector > & Quadrature<0>::get_points () const template -const std::vector > & Quadrature::get_points () const +const std::vector > & +Quadrature::get_points () const { return quadrature_points; } @@ -178,7 +185,8 @@ const std::vector > & Quadrature::get_points () const template <> -double Quadrature<0>::weight (const unsigned int) const +double +Quadrature<0>::weight (const unsigned int) const { Assert (false, ExcInternalError()); return 0; @@ -187,7 +195,8 @@ double Quadrature<0>::weight (const unsigned int) const template -double Quadrature::weight (const unsigned int i) const +double +Quadrature::weight (const unsigned int i) const { Assert (i::weight (const unsigned int i) const template -const std::vector & Quadrature::get_weights () const +const std::vector & +Quadrature::get_weights () const { return weights; } @@ -204,7 +214,8 @@ const std::vector & Quadrature::get_weights () const template <> -const std::vector & Quadrature<0>::get_weights () const +const std::vector & +Quadrature<0>::get_weights () const { Assert (false, ExcInternalError()); return weights; @@ -225,19 +236,21 @@ Quadrature::memory_consumption () const template <> -void QProjector<1>::project_to_face (const Quadrature<0> &, - const unsigned int, - std::vector > &) +void +QProjector<1>::project_to_face (const Quadrature<0> &, + const unsigned int, + std::vector > &) { - Assert(false, ExcNotImplemented()); + Assert (false, ExcNotImplemented()); } template <> -void QProjector<2>::project_to_face (const Quadrature<1> &quadrature, - const unsigned int face_no, - std::vector > &q_points) +void +QProjector<2>::project_to_face (const Quadrature<1> &quadrature, + const unsigned int face_no, + std::vector > &q_points) { const unsigned int dim=2; Assert (face_no<2*dim, ExcIndexRange (face_no, 0, 2*dim)); @@ -267,9 +280,10 @@ void QProjector<2>::project_to_face (const Quadrature<1> &quadrature, template <> -void QProjector<3>::project_to_face (const Quadrature<2> &quadrature, - const unsigned int face_no, - std::vector > &q_points) +void +QProjector<3>::project_to_face (const Quadrature<2> &quadrature, + const unsigned int face_no, + std::vector > &q_points) { const unsigned int dim=3; Assert (face_no<2*dim, ExcIndexRange (face_no, 0, 2*dim)); @@ -318,10 +332,11 @@ void QProjector<3>::project_to_face (const Quadrature<2> &quadrature, template <> -void QProjector<1>::project_to_subface (const Quadrature<0> &, - const unsigned int, - const unsigned int, - std::vector > &) +void +QProjector<1>::project_to_subface (const Quadrature<0> &, + const unsigned int, + const unsigned int, + std::vector > &) { Assert(false, ExcNotImplemented()); } @@ -329,10 +344,11 @@ void QProjector<1>::project_to_subface (const Quadrature<0> &, template <> -void QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, - const unsigned int face_no, - const unsigned int subface_no, - std::vector > &q_points) +void +QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, + const unsigned int face_no, + const unsigned int subface_no, + std::vector > &q_points) { const unsigned int dim=2; Assert (face_no<2*dim, ExcIndexRange (face_no, 0, 2*dim)); @@ -405,10 +421,11 @@ void QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, template <> -void QProjector<3>::project_to_subface (const Quadrature<2> &quadrature, - const unsigned int face_no, - const unsigned int subface_no, - std::vector > &q_points) +void +QProjector<3>::project_to_subface (const Quadrature<2> &quadrature, + const unsigned int face_no, + const unsigned int subface_no, + std::vector > &q_points) { const unsigned int dim=3; Assert (face_no<2*dim, ExcIndexRange (face_no, 0, 2*dim)); @@ -728,7 +745,8 @@ QIterated<1>::uses_both_endpoints (const Quadrature<1> &base_quadrature) template <> QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, - const unsigned int n_copies) : + const unsigned int n_copies) + : Quadrature<1> (uses_both_endpoints(base_quadrature) ? (base_quadrature.n_quadrature_points-1) * n_copies + 1 : base_quadrature.n_quadrature_points * n_copies) @@ -831,7 +849,8 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, // of lower dimensional iterated quadrature formulae template QIterated::QIterated (const Quadrature<1> &base_quadrature, - const unsigned int N) : + const unsigned int N) + : Quadrature (QIterated(base_quadrature, N), QIterated<1>(base_quadrature, N)) {} diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index edc0d64e64..86d92a06e2 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -30,7 +30,8 @@ number abs (const number a) template <> QGauss<1>::QGauss (const unsigned int n) - : Quadrature<1> (n) + : + Quadrature<1> (n) { const unsigned int m = (n+1)/2; long double z; @@ -71,7 +72,8 @@ QGauss<1>::QGauss (const unsigned int n) template <> -QGauss2<1>::QGauss2 () : +QGauss2<1>::QGauss2 () + : Quadrature<1> (2) { // points on [-1,1] @@ -93,8 +95,10 @@ QGauss2<1>::QGauss2 () : } + template <> -QGauss3<1>::QGauss3 () : +QGauss3<1>::QGauss3 () + : Quadrature<1> (3) { // points on [-1,1] @@ -122,8 +126,10 @@ QGauss3<1>::QGauss3 () : } + template <> -QGauss4<1>::QGauss4 () : +QGauss4<1>::QGauss4 () + : Quadrature<1> (4) { // points on [-1,1] @@ -156,7 +162,8 @@ QGauss4<1>::QGauss4 () : template <> -QGauss5<1>::QGauss5 () : +QGauss5<1>::QGauss5 () + : Quadrature<1> (5) { // points on [-1,1] @@ -192,8 +199,10 @@ QGauss5<1>::QGauss5 () : } + template <> -QGauss6<1>::QGauss6 () : +QGauss6<1>::QGauss6 () + : Quadrature<1> (6) { // points on [-1,1] @@ -233,8 +242,10 @@ QGauss6<1>::QGauss6 () : } + template <> -QGauss7<1>::QGauss7 () : +QGauss7<1>::QGauss7 () + : Quadrature<1> (7) { // points on [-1,1] @@ -280,7 +291,8 @@ QGauss7<1>::QGauss7 () : template <> -QMidpoint<1>::QMidpoint () : +QMidpoint<1>::QMidpoint () + : Quadrature<1>(1) { this->quadrature_points[0] = Point<1>(0.5); @@ -288,8 +300,10 @@ QMidpoint<1>::QMidpoint () : } + template <> -QTrapez<1>::QTrapez () : +QTrapez<1>::QTrapez () + : Quadrature<1> (2) { static const double xpts[] = { 0.0, 1.0 }; @@ -303,8 +317,10 @@ QTrapez<1>::QTrapez () : } + template <> -QSimpson<1>::QSimpson () : +QSimpson<1>::QSimpson () + : Quadrature<1> (3) { static const double xpts[] = { 0.0, 0.5, 1.0 }; @@ -318,8 +334,10 @@ QSimpson<1>::QSimpson () : } + template <> -QMilne<1>::QMilne () : +QMilne<1>::QMilne () + : Quadrature<1> (5) { static const double xpts[] = { 0.0, .25, .5, .75, 1.0 }; @@ -333,8 +351,10 @@ QMilne<1>::QMilne () : } + template <> -QWeddle<1>::QWeddle () : +QWeddle<1>::QWeddle () + : Quadrature<1> (7) { static const double xpts[] = { 0.0, 1./6., 1./3., .5, 2./3., 5./6., 1.0 }; @@ -362,48 +382,89 @@ QGauss::QGauss (const unsigned int n) template -QGauss2::QGauss2 () : Quadrature (QGauss2(), QGauss2<1>()) {} +QGauss2::QGauss2 () + : + Quadrature (QGauss2(), QGauss2<1>()) +{} + + template -QGauss3::QGauss3 () : - Quadrature (QGauss3(), QGauss3<1>()){} +QGauss3::QGauss3 () + : + Quadrature (QGauss3(), QGauss3<1>()) +{} + + template -QGauss4::QGauss4 () : - Quadrature (QGauss4(), QGauss4<1>()){} +QGauss4::QGauss4 () + : + Quadrature (QGauss4(), QGauss4<1>()) +{} + + template -QGauss5::QGauss5 () : - Quadrature (QGauss5(), QGauss5<1>()){} +QGauss5::QGauss5 () + : + Quadrature (QGauss5(), QGauss5<1>()) +{} + + template -QGauss6::QGauss6 () : - Quadrature (QGauss6(), QGauss6<1>()){} +QGauss6::QGauss6 () + : + Quadrature (QGauss6(), QGauss6<1>()) +{} + + template -QGauss7::QGauss7 () : - Quadrature (QGauss7(), QGauss7<1>()){} +QGauss7::QGauss7 () + : + Quadrature (QGauss7(), QGauss7<1>()) +{} + template -QMidpoint::QMidpoint () : - Quadrature (QMidpoint(), QMidpoint<1>()){} +QMidpoint::QMidpoint () + : + Quadrature (QMidpoint(), QMidpoint<1>()) +{} + + template -QTrapez::QTrapez () : - Quadrature (QTrapez(), QTrapez<1>()){} +QTrapez::QTrapez () + : + Quadrature (QTrapez(), QTrapez<1>()) +{} + + template -QSimpson::QSimpson () : - Quadrature (QSimpson(), QSimpson<1>()){} +QSimpson::QSimpson () + : + Quadrature (QSimpson(), QSimpson<1>()) +{} + + template -QMilne::QMilne () : - Quadrature (QMilne(), QMilne<1>()){} +QMilne::QMilne () + : + Quadrature (QMilne(), QMilne<1>()) +{} + template -QWeddle::QWeddle () : - Quadrature (QWeddle(), QWeddle<1>()){} +QWeddle::QWeddle () + : + Quadrature (QWeddle(), QWeddle<1>()) +{} // explicit specialization diff --git a/deal.II/base/source/subscriptor.cc b/deal.II/base/source/subscriptor.cc index 5216286251..23c64e1240 100644 --- a/deal.II/base/source/subscriptor.cc +++ b/deal.II/base/source/subscriptor.cc @@ -84,13 +84,15 @@ ActiveObjectMonitor::deregister_object (const Subscriptor *p) -Subscriptor::Subscriptor () : +Subscriptor::Subscriptor () + : counter (0), object_info (0) {} -Subscriptor::Subscriptor (const Subscriptor &) : +Subscriptor::Subscriptor (const Subscriptor &) + : counter (0), object_info (0) {} @@ -134,14 +136,15 @@ void Subscriptor::subscribe () const } -void Subscriptor::unsubscribe () const { +void Subscriptor::unsubscribe () const +{ Assert (counter>0, ExcNotUsed()); Threads::ThreadMutex::ScopedLock lock (subscription_lock); --counter; } -unsigned int Subscriptor::n_subscriptions () const +unsigned int Subscriptor::n_subscriptions () const { return counter; } diff --git a/deal.II/base/source/table_handler.cc b/deal.II/base/source/table_handler.cc index fd13f4d6cb..fe02a13d88 100644 --- a/deal.II/base/source/table_handler.cc +++ b/deal.II/base/source/table_handler.cc @@ -37,13 +37,19 @@ TableEntryBase::~TableEntryBase () /*---------------------------------------------------------------------*/ template -TableEntry::TableEntry(const number value): - val(value) {} +TableEntry::TableEntry(const number value) + : + val(value) +{} + + template TableEntry::~TableEntry() {} + + template number TableEntry::value() const { @@ -51,12 +57,15 @@ number TableEntry::value() const } + template void TableEntry::write_tex (std::ostream &out) const { out << val; } + + template void TableEntry::write_text (std::ostream &out) const { @@ -66,7 +75,8 @@ void TableEntry::write_text (std::ostream &out) const /*---------------------------------------------------------------------*/ -TableHandler::Column::Column(const std::string &tex_caption): +TableHandler::Column::Column(const std::string &tex_caption) + : tex_caption(tex_caption), tex_format("c"), precision(4), @@ -75,7 +85,9 @@ TableHandler::Column::Column(const std::string &tex_caption): {} -TableHandler::Column::Column(): + +TableHandler::Column::Column() + : tex_caption(), tex_format("c"), precision(4), @@ -84,6 +96,7 @@ TableHandler::Column::Column(): {} + TableHandler::Column::~Column() { for (unsigned int i=0; i::const_iterator col_iter=columns.begin(); - unsigned int n=col_iter->second.entries.size(); + unsigned int n = col_iter->second.entries.size(); std::string first_name=col_iter->first; for (++col_iter; col_iter!=columns.end(); ++col_iter) diff --git a/deal.II/base/source/tensor.cc b/deal.II/base/source/tensor.cc index fb74015428..b27907abdd 100644 --- a/deal.II/base/source/tensor.cc +++ b/deal.II/base/source/tensor.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index e12ae0f97c..5c877df881 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -30,6 +30,7 @@ TensorFunction::TensorFunction (const double initial_time) {} + template TensorFunction::~TensorFunction () {} diff --git a/deal.II/base/source/thread_management.cc b/deal.II/base/source/thread_management.cc index 3702ea2e67..7708913b29 100644 --- a/deal.II/base/source/thread_management.cc +++ b/deal.II/base/source/thread_management.cc @@ -37,7 +37,7 @@ namespace Threads ThreadMutex n_existing_threads_mutex; - void register_thread () + void register_thread () { ThreadMutex::ScopedLock lock (n_existing_threads_mutex); ++n_existing_threads_counter; @@ -102,8 +102,7 @@ namespace Threads unsigned int n_existing_threads () { ThreadMutex::ScopedLock lock (internal::n_existing_threads_mutex); - const unsigned int n = internal::n_existing_threads_counter; - return n; + return internal::n_existing_threads_counter; } diff --git a/deal.II/base/source/timer.cc b/deal.II/base/source/timer.cc index cfb226921e..f30e469185 100644 --- a/deal.II/base/source/timer.cc +++ b/deal.II/base/source/timer.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -33,7 +33,8 @@ extern "C" { Timer::Timer() - : cumulative_time (0.) + : + cumulative_time (0.) { start(); } diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index ec11df6aa1..028897130a 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -84,7 +84,8 @@ class TriaAccessor TriaAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData * = 0) : + const AccessorData * = 0) + : present_level (level), present_index (index), tria (parent) {}; @@ -124,7 +125,7 @@ class TriaAccessor /** * Same as above. */ - TriaAccessor &operator = (const TriaAccessor &); + TriaAccessor & operator = (const TriaAccessor &); protected: @@ -296,8 +297,10 @@ class TriaObjectAccessor : public TriaAccessor TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : - TriaAccessor (parent, level, index, local_data) {}; + const AccessorData *local_data = 0) + : + TriaAccessor (parent, level, index, local_data) + {}; /** * Copy the data of a line. Only @@ -343,7 +346,8 @@ class TriaObjectAccessor : public TriaAccessor * * Implemented only for @p{celldim>1}. */ - TriaIterator > line (const unsigned int i) const; + TriaIterator > + line (const unsigned int i) const; /** * Line index of the @p{i}th @@ -361,7 +365,8 @@ class TriaObjectAccessor : public TriaAccessor * * Implemented only for @p{celldim>2}. */ - TriaIterator > quad (const unsigned int i) const; + TriaIterator > + quad (const unsigned int i) const; /** * Quad index of the @p{i}th @@ -583,12 +588,12 @@ class TriaObjectAccessor : public TriaAccessor * you are doing! This value is * reserved for another purpose * and algorithms may not work if - * boundary cells have have this + * boundary cells have this * boundary indicator or if * interior cells have boundary * indicators other than 255. */ - void set_boundary_indicator (unsigned char) const; + void set_boundary_indicator (const unsigned char) const; /** * Return whether this object is @@ -751,7 +756,8 @@ class TriaObjectAccessor<0, dim> : public TriaAccessor TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : + const AccessorData *local_data = 0) + : TriaAccessor (parent, level, index, local_data) { Assert (false, ExcInternalError()); @@ -785,8 +791,10 @@ class TriaObjectAccessor<1, dim> : public TriaAccessor TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : - TriaAccessor (parent, level, index, local_data) {}; + const AccessorData *local_data = 0) + : + TriaAccessor (parent, level, index, local_data) + {}; /** * Copy the data of the given @@ -1024,7 +1032,7 @@ class TriaObjectAccessor<1, dim> : public TriaAccessor * interior cells have boundary * indicators other than 255. */ - void set_boundary_indicator (unsigned char) const; + void set_boundary_indicator (const unsigned char) const; /** * Return whether this line is at @@ -1196,8 +1204,10 @@ class TriaObjectAccessor<2, dim> : public TriaAccessor TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : - TriaAccessor (parent, level, index, local_data) {}; + const AccessorData *local_data = 0) + : + TriaAccessor (parent, level, index, local_data) + {}; /** * Copy the data of the given quad. @@ -1456,12 +1466,12 @@ class TriaObjectAccessor<2, dim> : public TriaAccessor * doing, since this value is * reserved for another purpose * and algorithms may not work if - * boundary cells have have this + * boundary cells have this * boundary indicator or if * interior cells have boundary * indicators other than 255. */ - void set_boundary_indicator (unsigned char) const; + void set_boundary_indicator (const unsigned char) const; /** * Return whether this quad is at @@ -1660,8 +1670,10 @@ class TriaObjectAccessor<3, dim> : public TriaAccessor TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : - TriaAccessor (parent, level, index, local_data) {}; + const AccessorData *local_data = 0) + : + TriaAccessor (parent, level, index, local_data) + {}; /** * Copy the data of the given @@ -1938,12 +1950,12 @@ class TriaObjectAccessor<3, dim> : public TriaAccessor * doing, since this value is * reserved for another purpose * and algorithms may not work if - * boundary cells have have this + * boundary cells have this * boundary indicator or if * interior cells have boundary * indicators other than 255. */ - void set_boundary_indicator (unsigned char) const; + void set_boundary_indicator (const unsigned char) const; /** * Return whether this hex is at @@ -2128,8 +2140,10 @@ class CellAccessor : public TriaObjectAccessor CellAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, - const AccessorData *local_data = 0) : - TriaObjectAccessor (parent, level, index, local_data) {}; + const AccessorData *local_data = 0) + : + TriaObjectAccessor (parent, level, index, local_data) + {}; /** * Return a pointer to the diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index f960002868..c8762ebdc7 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -181,7 +181,7 @@ unsigned char TriaObjectAccessor<1, dim>::boundary_indicator () const template -void TriaObjectAccessor<1, dim>::set_boundary_indicator (unsigned char boundary_ind) const +void TriaObjectAccessor<1, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { Assert (dim>=2, typename TriaAccessor::ExcNotUsefulForThisDimension()); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); @@ -410,7 +410,7 @@ unsigned char TriaObjectAccessor<2, dim>::boundary_indicator () const template -void TriaObjectAccessor<2, dim>::set_boundary_indicator (unsigned char boundary_ind) const +void TriaObjectAccessor<2, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { Assert (dim>=3, typename TriaAccessor::ExcNotUsefulForThisDimension()); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); @@ -830,7 +830,7 @@ unsigned char TriaObjectAccessor<3, dim>::boundary_indicator () const template -void TriaObjectAccessor<3, dim>::set_boundary_indicator (unsigned char boundary_ind) const +void TriaObjectAccessor<3, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { Assert (dim<4, typename TriaAccessor::ExcNotUsefulForThisDimension()); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); diff --git a/deal.II/examples/step-14/Makefile b/deal.II/examples/step-14/Makefile index 186ce42a92..1e4f3f89a8 100644 --- a/deal.II/examples/step-14/Makefile +++ b/deal.II/examples/step-14/Makefile @@ -14,7 +14,7 @@ target = $(basename $(shell echo step-*.cc)) # run-time checking of parameters and internal states is performed, so # you should set this value to `on' while you develop your program, # and to `off' when running production computations. -debug-mode = on +debug-mode = off # As third field, we need to give the path to the top-level deal.II diff --git a/deal.II/lac/include/lac/block_indices.h b/deal.II/lac/include/lac/block_indices.h index c7018adb45..1f4c974352 100644 --- a/deal.II/lac/include/lac/block_indices.h +++ b/deal.II/lac/include/lac/block_indices.h @@ -206,7 +206,7 @@ BlockIndices::reinit (const std::vector &n) inline std::pair -BlockIndices::global_to_local (const unsigned int i) const +BlockIndices::global_to_local (const unsigned int i) const throw() { Assert (i class BlockDiagonalMatrix : public Subscriptor { -public: - /** - * Constructor for an @p{n_blocks} - * by @p{n_blocks} matrix with - * diagonal blocks @p{M}. - */ - BlockDiagonalMatrix (const MATRIX& M, - unsigned int n_blocks); - - /** - * Matrix-vector-multiplication. - */ - template - void vmult (BlockVector& dst, - const BlockVector& src) const; + public: + /** + * Constructor for an @p{n_blocks} + * by @p{n_blocks} matrix with + * diagonal blocks @p{M}. + */ + BlockDiagonalMatrix (const MATRIX &M, + const unsigned int n_blocks); + + /** + * Matrix-vector-multiplication. + */ + template + void vmult (BlockVector& dst, + const BlockVector& src) const; - /** - * Transposed matrix-vector-multiplication. - */ - template - void Tvmult (BlockVector& dst, - const BlockVector& src) const; -private: - /** - * Number of blocks. - */ - unsigned int num_blocks; - /** - * Diagonal entry. - */ - SmartPointer matrix; + /** + * Transposed matrix-vector-multiplication. + */ + template + void Tvmult (BlockVector& dst, + const BlockVector& src) const; + private: + /** + * Number of blocks. + */ + unsigned int num_blocks; + + /** + * Diagonal entry. + */ + SmartPointer matrix; }; @@ -73,9 +74,10 @@ private: template BlockDiagonalMatrix::BlockDiagonalMatrix (const MATRIX& M, - unsigned int num_blocks) - : num_blocks (num_blocks), - matrix(&M) + const unsigned int num_blocks) + : + num_blocks (num_blocks), + matrix(&M) {} @@ -83,7 +85,7 @@ template template void BlockDiagonalMatrix::vmult (BlockVector& dst, - const BlockVector& src) const + const BlockVector& src) const { Assert (dst.n_blocks()==num_blocks, ExcDimensionMismatch(dst.n_blocks(),num_blocks)); diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h index c3b329c849..d68db16ec2 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.h @@ -79,9 +79,9 @@ class BlockSparseMatrix : public Subscriptor * access, a const matrix * pointer is sufficient. */ - Accessor (const BlockSparseMatrix*, - unsigned int row, - unsigned short index); + Accessor (const BlockSparseMatrix *m, + const unsigned int row, + const unsigned short index); /** * Row number of the element @@ -744,17 +744,18 @@ class BlockSparseMatrix : public Subscriptor template inline -BlockSparseMatrix::Accessor::Accessor ( - const BlockSparseMatrix* matrix, - unsigned int r, - unsigned short i) - : matrix(matrix), - base_iterator(matrix->block(0,0).begin()), - block_row(0), - row_start(0), - block_col(0), - col_start(0), - a_index(0) +BlockSparseMatrix::Accessor:: +Accessor (const BlockSparseMatrix *matrix, + const unsigned int r, + const unsigned short i) + : + matrix(matrix), + base_iterator(matrix->block(0,0).begin()), + block_row(0), + row_start(0), + block_col(0), + col_start(0), + a_index(0) { Assert (i==0, ExcNotImplemented()); @@ -816,11 +817,12 @@ BlockSparseMatrix::Accessor::value () const template inline -BlockSparseMatrix::const_iterator::const_iterator( - const BlockSparseMatrix* m, - unsigned int r, - unsigned short i) - : BlockSparseMatrix::Accessor(m, r, i) +BlockSparseMatrix::const_iterator:: +const_iterator(const BlockSparseMatrix* m, + unsigned int r, + unsigned short i) + : + BlockSparseMatrix::Accessor(m, r, i) {} @@ -919,7 +921,8 @@ BlockSparseMatrix::const_iterator::operator-> () const template inline bool -BlockSparseMatrix::const_iterator::operator == (const const_iterator& i) const +BlockSparseMatrix::const_iterator:: +operator == (const const_iterator& i) const { if (this->matrix != i->matrix) return false; @@ -936,7 +939,8 @@ BlockSparseMatrix::const_iterator::operator == (const const_iterator& i) template inline bool -BlockSparseMatrix::const_iterator::operator != (const const_iterator& i) const +BlockSparseMatrix::const_iterator:: +operator != (const const_iterator& i) const { return !(*this == i); } @@ -946,7 +950,8 @@ BlockSparseMatrix::const_iterator::operator != (const const_iterator& i) template inline bool -BlockSparseMatrix::const_iterator::operator < (const const_iterator& i) const +BlockSparseMatrix::const_iterator:: +operator < (const const_iterator& i) const { if (this->block_rowblock_row) return true; @@ -1357,9 +1362,9 @@ template template void BlockSparseMatrix:: -precondition_Jacobi (BlockVector &dst, +precondition_Jacobi (BlockVector &dst, const BlockVector &src, - const number omega) const + const number omega) const { Assert (rows == columns, ExcMatrixNotBlockSquare()); Assert (dst.n_blocks() == rows, @@ -1374,6 +1379,7 @@ precondition_Jacobi (BlockVector &dst, } + template inline typename BlockSparseMatrix::const_iterator @@ -1382,6 +1388,8 @@ BlockSparseMatrix::begin () const return const_iterator(this, 0, 0); } + + template inline typename BlockSparseMatrix::const_iterator @@ -1390,6 +1398,8 @@ BlockSparseMatrix::end () const return const_iterator(this, m(), 0); } + + template inline typename BlockSparseMatrix::const_iterator @@ -1399,6 +1409,8 @@ BlockSparseMatrix::begin (unsigned int r) const return const_iterator(this, r, 0); } + + template inline typename BlockSparseMatrix::const_iterator diff --git a/deal.II/lac/include/lac/block_sparse_matrix_ez.h b/deal.II/lac/include/lac/block_sparse_matrix_ez.h index a3241e71b6..2cff410b17 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/block_sparse_matrix_ez.h @@ -127,7 +127,7 @@ class BlockSparseMatrixEZ : public Subscriptor */ const SparseMatrixEZ& block (const unsigned int row, - const unsigned int column) const; + const unsigned int column) const; /** * Return the number of blocks in a @@ -431,11 +431,9 @@ BlockSparseMatrixEZ::vmult (BlockVector &dst, dst = 0.; for (unsigned int row=0; row::vmult (BlockVector &dst, template template void -BlockSparseMatrixEZ::vmult_add ( - BlockVector &dst, - const BlockVector &src) const +BlockSparseMatrixEZ:: +vmult_add (BlockVector &dst, + const BlockVector &src) const { Assert (dst.n_blocks() == n_block_rows(), ExcDimensionMismatch(dst.n_blocks(), n_block_rows())); @@ -453,11 +451,9 @@ BlockSparseMatrixEZ::vmult_add ( ExcDimensionMismatch(src.n_blocks(), n_block_cols())); for (unsigned int row=0; row::vmult_add ( template template void -BlockSparseMatrixEZ::Tvmult ( - BlockVector &dst, - const BlockVector& src) const +BlockSparseMatrixEZ:: +Tvmult (BlockVector &dst, + const BlockVector &src) const { Assert (dst.n_blocks() == n_block_cols(), ExcDimensionMismatch(dst.n_blocks(), n_block_cols())); @@ -478,11 +474,9 @@ BlockSparseMatrixEZ::Tvmult ( dst = 0.; for (unsigned int row=0; row::Tvmult ( template template void -BlockSparseMatrixEZ::Tvmult_add ( - BlockVector &dst, - const BlockVector &src) const +BlockSparseMatrixEZ:: +Tvmult_add (BlockVector &dst, + const BlockVector &src) const { Assert (dst.n_blocks() == n_block_cols(), ExcDimensionMismatch(dst.n_blocks(), n_block_cols())); @@ -512,7 +506,7 @@ template template inline void -BlockSparseMatrixEZ::print_statistics(STREAM& out, bool full) +BlockSparseMatrixEZ::print_statistics (STREAM& out, bool full) { unsigned int used_total = 0; unsigned int allocated_total = 0; diff --git a/deal.II/lac/include/lac/block_sparsity_pattern.h b/deal.II/lac/include/lac/block_sparsity_pattern.h index d741be8839..527de59e91 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -505,7 +505,7 @@ template inline SparsityPatternBase & BlockSparsityPatternBase::block (const unsigned int row, - const unsigned int column) + const unsigned int column) { Assert (row inline const SparsityPatternBase & BlockSparsityPatternBase::block (const unsigned int row, - const unsigned int column) const + const unsigned int column) const { Assert (row::NumberType> #else - random_access_iterator::NumberType,int> + random_access_iterator::NumberType,int> #endif { private: @@ -592,6 +592,8 @@ namespace internal } // namespace BlockVectorIterators } // namespace internal + + /** * A vector composed of several blocks each representing a vector of * its own. @@ -1306,7 +1308,7 @@ Number& BlockVector::operator() (const unsigned int i) template inline BlockVector & -BlockVector::operator *= (const Number factor) +BlockVector::operator *= (const Number factor) { scale (factor); return *this; @@ -1317,7 +1319,7 @@ BlockVector::operator *= (const Number factor) template inline BlockVector & -BlockVector::operator /= (const Number factor) +BlockVector::operator /= (const Number factor) { scale (1./factor); return *this; @@ -1551,7 +1553,8 @@ namespace internal template inline bool - Iterator::operator == (const Iterator &i) const + Iterator:: + operator == (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1563,7 +1566,8 @@ namespace internal template inline bool - Iterator::operator == (const InverseConstnessIterator &i) const + Iterator:: + operator == (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1575,7 +1579,8 @@ namespace internal template inline bool - Iterator::operator != (const Iterator &i) const + Iterator:: + operator != (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1587,7 +1592,8 @@ namespace internal template inline bool - Iterator::operator != (const InverseConstnessIterator &i) const + Iterator:: + operator != (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1599,7 +1605,8 @@ namespace internal template inline bool - Iterator::operator < (const Iterator &i) const + Iterator:: + operator < (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1611,7 +1618,8 @@ namespace internal template inline bool - Iterator::operator < (const InverseConstnessIterator &i) const + Iterator:: + operator < (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1623,7 +1631,8 @@ namespace internal template inline bool - Iterator::operator <= (const Iterator &i) const + Iterator:: + operator <= (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1635,7 +1644,8 @@ namespace internal template inline bool - Iterator::operator <= (const InverseConstnessIterator &i) const + Iterator:: + operator <= (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1647,7 +1657,8 @@ namespace internal template inline bool - Iterator::operator > (const Iterator &i) const + Iterator:: + operator > (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1659,7 +1670,8 @@ namespace internal template inline bool - Iterator::operator > (const InverseConstnessIterator &i) const + Iterator:: + operator > (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1671,7 +1683,8 @@ namespace internal template inline bool - Iterator::operator >= (const Iterator &i) const + Iterator:: + operator >= (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1683,7 +1696,8 @@ namespace internal template inline bool - Iterator::operator >= (const InverseConstnessIterator &i) const + Iterator:: + operator >= (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1695,7 +1709,8 @@ namespace internal template inline typename Iterator::difference_type - Iterator::operator - (const Iterator &i) const + Iterator:: + operator - (const Iterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1708,7 +1723,8 @@ namespace internal template inline typename Iterator::difference_type - Iterator::operator - (const InverseConstnessIterator &i) const + Iterator:: + operator - (const InverseConstnessIterator &i) const { Assert (parent == i.parent, ExcPointerToDifferentVectors()); @@ -1721,7 +1737,8 @@ namespace internal template inline Iterator - Iterator::operator + (const difference_type &d) const + Iterator:: + operator + (const difference_type &d) const { // if the index pointed to is // still within the block we @@ -1745,7 +1762,8 @@ namespace internal template inline Iterator - Iterator::operator - (const difference_type &d) const + Iterator:: + operator - (const difference_type &d) const { // if the index pointed to is // still within the block we @@ -1769,7 +1787,8 @@ namespace internal template inline Iterator & - Iterator::operator += (const difference_type &d) + Iterator:: + operator += (const difference_type &d) { // if the index pointed to is // still within the block we @@ -1796,7 +1815,8 @@ namespace internal template inline Iterator & - Iterator::operator -= (const difference_type &d) + Iterator:: + operator -= (const difference_type &d) { // if the index pointed to is // still within the block we diff --git a/deal.II/lac/include/lac/compressed_sparsity_pattern.h b/deal.II/lac/include/lac/compressed_sparsity_pattern.h index 433d5e6689..e83e986bbb 100644 --- a/deal.II/lac/include/lac/compressed_sparsity_pattern.h +++ b/deal.II/lac/include/lac/compressed_sparsity_pattern.h @@ -220,9 +220,10 @@ class CompressedSparsityPattern : public Subscriptor * Check if a value at a certain * position may be non-zero. */ - bool exists (const unsigned int i, const unsigned int j) const; + bool exists (const unsigned int i, + const unsigned int j) const; - /** + /** * Make the sparsity pattern * symmetric by adding the * sparsity pattern of the diff --git a/deal.II/lac/include/lac/eigen.h b/deal.II/lac/include/lac/eigen.h index 2fb54ab4ef..cb979f41ec 100644 --- a/deal.II/lac/include/lac/eigen.h +++ b/deal.II/lac/include/lac/eigen.h @@ -62,7 +62,8 @@ class EigenPower : private Solver /** * Constructor. Set the shift parameter. */ - AdditionalData (const double shift = 0.): + AdditionalData (const double shift = 0.) + : shift(shift) {} @@ -160,11 +161,12 @@ class EigenInverse : private Solver */ AdditionalData (double relaxation = 1., unsigned int start_adaption = 6, - bool use_residual = true): - relaxation(relaxation), - start_adaption(start_adaption), - use_residual(use_residual) - {} + bool use_residual = true) + : + relaxation(relaxation), + start_adaption(start_adaption), + use_residual(use_residual) + {} }; @@ -213,17 +215,20 @@ class EigenInverse : private Solver template EigenPower::EigenPower (SolverControl &cn, VectorMemory &mem, - const AdditionalData &data): + const AdditionalData &data) + : Solver(cn, mem), additional_data(data) {} + template EigenPower::~EigenPower () {} + template template void @@ -300,17 +305,20 @@ EigenPower::solve (double &value, template EigenInverse::EigenInverse (SolverControl &cn, VectorMemory &mem, - const AdditionalData &data): + const AdditionalData &data) + : Solver(cn, mem), additional_data(data) {} + template EigenInverse::~EigenInverse () {} + template template void diff --git a/deal.II/lac/include/lac/filtered_matrix.templates.h b/deal.II/lac/include/lac/filtered_matrix.templates.h index fc85475dc3..54318c691a 100644 --- a/deal.II/lac/include/lac/filtered_matrix.templates.h +++ b/deal.II/lac/include/lac/filtered_matrix.templates.h @@ -24,8 +24,7 @@ template -FilteredMatrix:: -FilteredMatrix () +FilteredMatrix::FilteredMatrix () {} @@ -75,7 +74,7 @@ set_referenced_matrix (const MATRIX &m) template void -FilteredMatrix::clear_constraints () +FilteredMatrix::clear_constraints () { // swap vectors to release memory std::vector empty; diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h index 9efe89c773..1c854d37e1 100644 --- a/deal.II/lac/include/lac/full_matrix.h +++ b/deal.II/lac/include/lac/full_matrix.h @@ -744,8 +744,6 @@ class FullMatrix : public Table<2,number> int, << "This function is not implemented for the given" << " matrix dimension " << arg1); - - private: }; @@ -787,9 +785,10 @@ FullMatrix::copy_from (const MATRIX& M) reinit (M.m(), M.n()); typename MATRIX::const_iterator entry; const typename MATRIX::const_iterator end = M.end(); - for (entry = M.begin();entry != end;++entry) + for (entry = M.begin(); entry != end; ++entry) el(entry->row(), entry->column()) = entry->value(); - } +} + /*---------------------------- fullmatrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 7d15b5c348..1df2423dc2 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -51,7 +51,8 @@ FullMatrix::FullMatrix (const unsigned int m, template -FullMatrix::FullMatrix (const FullMatrix &m) : +FullMatrix::FullMatrix (const FullMatrix &m) + : Table<2,number> (m) {} @@ -480,7 +481,7 @@ void FullMatrix::add_row (const unsigned int i, template void FullMatrix::add_col (const unsigned int i, const number s, - const unsigned int j) + const unsigned int j) { Assert (this->data() != 0, ExcEmptyMatrix()); @@ -491,8 +492,8 @@ void FullMatrix::add_col (const unsigned int i, const number s, template void FullMatrix::add_col (const unsigned int i, const number s, - const unsigned int j, const number t, - const unsigned int k) + const unsigned int j, const number t, + const unsigned int k) { Assert (this->data() != 0, ExcEmptyMatrix()); @@ -501,6 +502,7 @@ void FullMatrix::add_col (const unsigned int i, const number s, } + template void FullMatrix::swap_row (const unsigned int i, const unsigned int j) { @@ -1143,8 +1145,6 @@ FullMatrix::determinant () const Assert (this->n_cols() == this->n_rows(), ExcDimensionMismatch(this->n_cols(), this->n_rows())); - Assert ((this->n_cols()>=1) && (this->n_cols()<=3), - ExcNotImplemented(this->n_cols())); switch (this->n_cols()) { @@ -1160,6 +1160,8 @@ FullMatrix::determinant () const +this->el(2,0)*this->el(0,1)*this->el(1,2) -this->el(2,0)*this->el(0,2)*this->el(1,1)); default: + Assert (false, + ExcNotImplemented(this->n_cols())); return 0; }; } @@ -1178,6 +1180,7 @@ FullMatrix::norm2 () const } + template number FullMatrix::relative_symmetry_norm2 () const @@ -1198,6 +1201,7 @@ FullMatrix::relative_symmetry_norm2 () const } + template template void @@ -1435,7 +1439,7 @@ FullMatrix::print_formatted (std::ostream &out, template void -FullMatrix::gauss_jordan() +FullMatrix::gauss_jordan () { Assert (this->data() != 0, ExcEmptyMatrix()); Assert (this->n_cols() == this->n_rows(), ExcNotQuadratic()); @@ -1570,7 +1574,8 @@ FullMatrix::householder(Vector& src) template template double -FullMatrix::least_squares(Vector& dst, Vector& src) +FullMatrix::least_squares (Vector& dst, + Vector& src) { Assert (this->data() != 0, ExcEmptyMatrix()); diff --git a/deal.II/lac/include/lac/matrix_out.h b/deal.II/lac/include/lac/matrix_out.h index 13a4e4c9c8..c6e686b29c 100644 --- a/deal.II/lac/include/lac/matrix_out.h +++ b/deal.II/lac/include/lac/matrix_out.h @@ -94,9 +94,8 @@ class MatrixOut : public DataOutInterface<2,2> * modify the output of the * @ref{MatrixOut} class. */ - class Options + struct Options { - public: /** * If @p{true}, only show the * absolute values of the @@ -298,7 +297,7 @@ class MatrixOut : public DataOutInterface<2,2> static double get_gridpoint_value (const Matrix &matrix, const unsigned int i, const unsigned int j, - const Options &options); + const Options &options); }; diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index eae0912c06..24f4408e7d 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -1591,6 +1591,8 @@ SparseMatrix::begin (const unsigned int r) const return const_iterator(this, r, 0); } + + template inline typename SparseMatrix::const_iterator diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index 67c396cb43..ac672ea4bf 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -41,7 +41,8 @@ template -SparseMatrix::SparseMatrix () : +SparseMatrix::SparseMatrix () + : cols(0), val(0), max_len(0) @@ -50,7 +51,8 @@ SparseMatrix::SparseMatrix () : template -SparseMatrix::SparseMatrix (const SparseMatrix &m) : +SparseMatrix::SparseMatrix (const SparseMatrix &m) + : Subscriptor (m), cols(0), val(0), @@ -372,7 +374,8 @@ SparseMatrix::threaded_vmult (Vector &dst, template template void -SparseMatrix::Tvmult (Vector& dst, const Vector& src) const +SparseMatrix::Tvmult (Vector& dst, + const Vector& src) const { Assert (val != 0, ExcMatrixNotInitialized()); Assert (cols != 0, ExcMatrixNotInitialized()); @@ -395,7 +398,8 @@ SparseMatrix::Tvmult (Vector& dst, const Vector& template template void -SparseMatrix::vmult_add (Vector& dst, const Vector& src) const +SparseMatrix::vmult_add (Vector& dst, + const Vector& src) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -420,7 +424,8 @@ SparseMatrix::vmult_add (Vector& dst, const Vector template void -SparseMatrix::Tvmult_add (Vector& dst, const Vector& src) const +SparseMatrix::Tvmult_add (Vector& dst, + const Vector& src) const { Assert (val != 0, ExcMatrixNotInitialized()); Assert (cols != 0, ExcMatrixNotInitialized()); @@ -522,10 +527,11 @@ SparseMatrix::matrix_norm_square (const Vector& v) const template template void -SparseMatrix::threaded_matrix_norm_square (const Vector &v, - const unsigned int begin_row, - const unsigned int end_row, - somenumber *partial_sum) const +SparseMatrix:: +threaded_matrix_norm_square (const Vector &v, + const unsigned int begin_row, + const unsigned int end_row, + somenumber *partial_sum) const { // this function should not be called // when not in parallel mode. @@ -634,11 +640,12 @@ SparseMatrix::matrix_scalar_product (const Vector& u, template template void -SparseMatrix::threaded_matrix_scalar_product (const Vector &u, - const Vector &v, - const unsigned int begin_row, - const unsigned int end_row, - somenumber *partial_sum) const +SparseMatrix:: +threaded_matrix_scalar_product (const Vector &u, + const Vector &v, + const unsigned int begin_row, + const unsigned int end_row, + somenumber *partial_sum) const { // this function should not be called // when not in parallel mode. @@ -921,8 +928,9 @@ SparseMatrix::precondition_SSOR (Vector &dst, template template void -SparseMatrix::precondition_SOR (Vector& dst, const Vector& src, - const number om) const +SparseMatrix::precondition_SOR (Vector& dst, + const Vector& src, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -936,8 +944,9 @@ SparseMatrix::precondition_SOR (Vector& dst, const Vector template void -SparseMatrix::precondition_TSOR (Vector& dst, const Vector& src, - const number om) const +SparseMatrix::precondition_TSOR (Vector& dst, + const Vector& src, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -951,7 +960,8 @@ SparseMatrix::precondition_TSOR (Vector& dst, const Vector template void -SparseMatrix::SOR (Vector& dst, const number om) const +SparseMatrix::SOR (Vector& dst, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -976,7 +986,8 @@ SparseMatrix::SOR (Vector& dst, const number om) const template template void -SparseMatrix::TSOR (Vector& dst, const number om) const +SparseMatrix::TSOR (Vector& dst, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -999,11 +1010,10 @@ SparseMatrix::TSOR (Vector& dst, const number om) const template template void -SparseMatrix::PSOR ( - Vector& dst, - const std::vector& permutation, - const std::vector& inverse_permutation, - const number om) const +SparseMatrix::PSOR (Vector& dst, + const std::vector& permutation, + const std::vector& inverse_permutation, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -1039,11 +1049,10 @@ SparseMatrix::PSOR ( template template void -SparseMatrix::TPSOR ( - Vector& dst, - const std::vector& permutation, - const std::vector& inverse_permutation, - const number om) const +SparseMatrix::TPSOR (Vector& dst, + const std::vector& permutation, + const std::vector& inverse_permutation, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -1071,12 +1080,13 @@ SparseMatrix::TPSOR ( } + template template void SparseMatrix::SOR_step (Vector &v, - const Vector &b, - const number om) const + const Vector &b, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -1095,12 +1105,14 @@ SparseMatrix::SOR_step (Vector &v, } } + + template template void SparseMatrix::TSOR_step (Vector &v, - const Vector &b, - const number om) const + const Vector &b, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); @@ -1119,22 +1131,26 @@ SparseMatrix::TSOR_step (Vector &v, } } + + template template void SparseMatrix::SSOR_step (Vector &v, - const Vector &b, - const number om) const + const Vector &b, + const number om) const { SOR_step(v,b,om); TSOR_step(v,b,om); } + template template void -SparseMatrix::SSOR (Vector& dst, const number om) const +SparseMatrix::SSOR (Vector& dst, + const number om) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h index 057e390dd7..ba8b2e1420 100644 --- a/deal.II/lac/include/lac/vector.h +++ b/deal.II/lac/include/lac/vector.h @@ -103,8 +103,9 @@ class Vector // Vector (const Vector &v); /** - * Constructor. Set dimension to @p{n} and - * initialize all elements with zero. + * Constructor. Set dimension to + * @p{n} and initialize all + * elements with zero. */ explicit Vector (const unsigned int n); @@ -456,12 +457,13 @@ class Vector * the cellwise ratio of true to estimated * error. * - * This vector is appropriately scaled to - * hold the result. + * This vector is appropriately + * scaled to hold the result. * - * If any of the @p{b[i]} is zero, the result - * is undefined. No attempt is made to - * catch such situations. + * If any of the @p{b[i]} is + * zero, the result is + * undefined. No attempt is made + * to catch such situations. */ void ratio (const Vector &a, const Vector &b); @@ -585,7 +587,8 @@ class Vector template inline -Vector::Vector () : +Vector::Vector () + : dim(0), maxdim(0), val(0) @@ -612,7 +615,8 @@ Vector::Vector (const InputIterator first, const InputIterator last) template inline -Vector::Vector (const unsigned int n) : +Vector::Vector (const unsigned int n) + : dim(0), maxdim(0), val(0) @@ -713,7 +717,7 @@ Vector::end () template inline typename Vector::const_iterator -Vector::end () const +Vector::end () const { return &val[dim]; } @@ -742,7 +746,7 @@ Number& Vector::operator() (const unsigned int i) template inline -Vector & Vector::operator *= (const Number factor) +Vector & Vector::operator *= (const Number factor) { scale (factor); return *this; @@ -752,7 +756,7 @@ Vector & Vector::operator *= (const Number factor) template inline -Vector & Vector::operator /= (const Number factor) +Vector & Vector::operator /= (const Number factor) { scale (1./factor); return *this; diff --git a/deal.II/lac/include/lac/vector.templates.h b/deal.II/lac/include/lac/vector.templates.h index e2af40dc79..3ee37bacb5 100644 --- a/deal.II/lac/include/lac/vector.templates.h +++ b/deal.II/lac/include/lac/vector.templates.h @@ -39,7 +39,8 @@ static inline Number sqr (const Number x) template -Vector::Vector (const Vector& v) : +Vector::Vector (const Vector& v) + : dim(v.size()), maxdim(v.size()), val(0) @@ -271,7 +272,8 @@ Number Vector::lp_norm (const Number p) const template -Number Vector::linfty_norm () const { +Number Vector::linfty_norm () const +{ Assert (dim!=0, ExcEmptyVector()); Number max0=0., @@ -391,7 +393,8 @@ void Vector::sadd (const Number x, const Vector& v) template -void Vector::sadd (const Number x, const Number a, const Vector& v) +void Vector::sadd (const Number x, const Number a, + const Vector& v) { Assert (dim!=0, ExcEmptyVector()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); @@ -405,7 +408,8 @@ void Vector::sadd (const Number x, const Number a, const Vector& template void Vector::sadd (const Number x, const Number a, - const Vector& v, const Number b, const Vector& w) + const Vector& v, const Number b, + const Vector& w) { Assert (dim!=0, ExcEmptyVector()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); @@ -422,7 +426,8 @@ void Vector::sadd (const Number x, const Number a, template void Vector::sadd (const Number x, const Number a, const Vector& v, const Number b, - const Vector& w, const Number c, const Vector& y) + const Vector& w, const Number c, + const Vector& y) { Assert (dim!=0, ExcEmptyVector()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); diff --git a/deal.II/lac/source/compressed_sparsity_pattern.cc b/deal.II/lac/source/compressed_sparsity_pattern.cc index 0497fc8f19..8536379115 100644 --- a/deal.II/lac/source/compressed_sparsity_pattern.cc +++ b/deal.II/lac/source/compressed_sparsity_pattern.cc @@ -21,14 +21,17 @@ #include #include -CompressedSparsityPattern::CompressedSparsityPattern () : +CompressedSparsityPattern::CompressedSparsityPattern () + : rows(0), cols(0) {} -CompressedSparsityPattern::CompressedSparsityPattern (const CompressedSparsityPattern &s) : +CompressedSparsityPattern:: +CompressedSparsityPattern (const CompressedSparsityPattern &s) + : Subscriptor(), rows(0), cols(0) @@ -41,8 +44,9 @@ CompressedSparsityPattern::CompressedSparsityPattern (const CompressedSparsityPa CompressedSparsityPattern::CompressedSparsityPattern (const unsigned int m, const unsigned int n) - : rows(0), - cols(0) + : + rows(0), + cols(0) { reinit (m,n); } @@ -50,8 +54,9 @@ CompressedSparsityPattern::CompressedSparsityPattern (const unsigned int m, CompressedSparsityPattern::CompressedSparsityPattern (const unsigned int n) - : rows(0), - cols(0) + : + rows(0), + cols(0) { reinit (n,n); } @@ -100,7 +105,7 @@ CompressedSparsityPattern::empty () const unsigned int -CompressedSparsityPattern::max_entries_per_row () const +CompressedSparsityPattern::max_entries_per_row () const { unsigned int m = 0; for (unsigned int i=1; i::vmult ( - Vector &, - const Vector &) const; -template void SparseMatrix::Tvmult ( - Vector &, - const Vector &) const; -template void SparseMatrix::vmult_add ( - Vector &, - const Vector &) const; -template void SparseMatrix::Tvmult_add ( - Vector &, - const Vector &) const; +template void SparseMatrix:: +vmult (Vector &, + const Vector &) const; +template void SparseMatrix:: +Tvmult (Vector &, + const Vector &) const; +template void SparseMatrix:: +vmult_add (Vector &, + const Vector &) const; +template void SparseMatrix:: +Tvmult_add (Vector &, + const Vector &) const; template TYPEVEC -SparseMatrix::matrix_norm_square ( - const Vector &) const; +SparseMatrix:: +matrix_norm_square (const Vector &) const; template TYPEVEC -SparseMatrix::matrix_scalar_product ( - const Vector &, - const Vector &) const; +SparseMatrix:: +matrix_scalar_product (const Vector &, + const Vector &) const; -template TYPEVEC SparseMatrix::residual ( - Vector &, - const Vector &, - const Vector &) const; +template TYPEVEC SparseMatrix:: +residual (Vector &, + const Vector &, + const Vector &) const; -template void SparseMatrix::precondition_SSOR ( - Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix:: +precondition_SSOR (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::precondition_SOR ( - Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix:: +precondition_SOR (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::precondition_TSOR ( - Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix:: +precondition_TSOR (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::precondition_Jacobi ( - Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix:: +precondition_Jacobi (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::SOR ( - Vector &, - const TYPEMAT) const; -template void SparseMatrix::TSOR ( - Vector &, - const TYPEMAT) const; -template void SparseMatrix::SSOR ( - Vector &, - const TYPEMAT) const; -template void SparseMatrix::PSOR ( - Vector &, - const std::vector&, - const std::vector&, - const TYPEMAT) const; -template void SparseMatrix::TPSOR ( - Vector &, - const std::vector&, - const std::vector&, - const TYPEMAT) const; -template void SparseMatrix::SOR_step ( - Vector &, - const Vector &, - const TYPEMAT) const; -template void SparseMatrix::TSOR_step ( - Vector &, - const Vector &, - const TYPEMAT) const; -template void SparseMatrix::SSOR_step ( - Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix:: +SOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix:: +TSOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix:: +SSOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix:: +PSOR (Vector &, + const std::vector&, + const std::vector&, + const TYPEMAT) const; +template void SparseMatrix:: +TPSOR (Vector &, + const std::vector&, + const std::vector&, + const TYPEMAT) const; +template void SparseMatrix:: +SOR_step (Vector &, + const Vector &, + const TYPEMAT) const; +template void SparseMatrix:: +TSOR_step (Vector &, + const Vector &, + const TYPEMAT) const; +template void SparseMatrix:: +SSOR_step (Vector &, + const Vector &, + const TYPEMAT) const;