From: bangerth Date: Mon, 23 Oct 2006 02:46:34 +0000 (+0000) Subject: Move everything into a namespace. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ceb0a1ab6d669ccd0405d385783e8008afdd2b8;p=dealii-svn.git Move everything into a namespace. git-svn-id: https://svn.dealii.org/trunk@14038 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 f138c124aa..66c8d93edf 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, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * This class automatically computes the gradient of a function by @@ -254,5 +255,6 @@ class AutoDerivativeFunction : public Function }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/conditional_ostream.h b/deal.II/base/include/base/conditional_ostream.h index f149a21cb8..398e79c3ac 100644 --- a/deal.II/base/include/base/conditional_ostream.h +++ b/deal.II/base/include/base/conditional_ostream.h @@ -13,7 +13,7 @@ #ifndef __deal2__conditional_ostream_h #define __deal2__conditional_ostream_h - +#include #ifdef HAVE_STD_OSTREAM_HEADER # include @@ -21,6 +21,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + /** * A class that allows printing to an output stream, e.g. @p std::cout, @@ -185,4 +187,6 @@ ConditionalOStream::operator<< (std::ostream& (*p) (std::ostream&)) const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 0f7d6ba18d..0486308b91 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -30,6 +30,14 @@ // environment, contact the authors of the library. +/** + * Two macro names that we put at the top and bottom of all deal.II files + * and that will be expanded to "namespace dealii {" and "}". + */ +#define DEAL_II_NAMESPACE_OPEN namespace dealii { +#define DEAL_II_NAMESPACE_CLOSE } + + /* Defined if the prototype of abort() has a no-throw exception specification. */ diff --git a/deal.II/base/include/base/convergence_table.h b/deal.II/base/include/base/convergence_table.h index 596e89e157..35202a88e6 100644 --- a/deal.II/base/include/base/convergence_table.h +++ b/deal.II/base/include/base/convergence_table.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * The ConvergenceTable class is an application to the TableHandler @@ -221,4 +223,6 @@ class ConvergenceTable: public TableHandler }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index 385eb01f6e..ad9d9c75d1 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -37,6 +37,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + class ParameterHandler; @@ -2899,7 +2901,7 @@ class DataOutReader : public DataOutInterface * the last time a stream was * given to the read() function. */ - virtual const std::vector > & + virtual const std::vector > & get_patches () const; /** @@ -2916,7 +2918,7 @@ class DataOutReader : public DataOutInterface virtual std::vector get_dataset_names () const; private: - std::vector > patches; + std::vector > patches; std::vector dataset_names; }; @@ -3001,5 +3003,6 @@ DataOutBase::VtkStream::operator<< (const T& t) return stream; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index 9bb42f7cae..e51ec73673 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -30,6 +30,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + /** * This class is the base class for all exception classes. Do not use @@ -429,7 +431,7 @@ namespace deal_II_exceptions * @ingroup Exceptions */ #define DeclException0(Exception0) \ -class Exception0 : public ExceptionBase {} +class Exception0 : public dealii::ExceptionBase {} @@ -438,7 +440,7 @@ class Exception0 : public ExceptionBase {} * one additional parameter. */ #define DeclException1(Exception1, type1, outsequence) \ -class Exception1 : public ExceptionBase { \ +class Exception1 : public dealii::ExceptionBase { \ public: \ Exception1 (const type1 a1) : arg1 (a1) {}; \ virtual ~Exception1 () throw () {}; \ @@ -457,7 +459,7 @@ class Exception1 : public ExceptionBase { \ * @ingroup Exceptions */ #define DeclException2(Exception2, type1, type2, outsequence) \ -class Exception2 : public ExceptionBase { \ +class Exception2 : public dealii::ExceptionBase { \ public: \ Exception2 (const type1 a1, const type2 a2) : \ arg1 (a1), arg2(a2) {}; \ @@ -478,7 +480,7 @@ class Exception2 : public ExceptionBase { \ * @ingroup Exceptions */ #define DeclException3(Exception3, type1, type2, type3, outsequence) \ -class Exception3 : public ExceptionBase { \ +class Exception3 : public dealii::ExceptionBase { \ public: \ Exception3 (const type1 a1, const type2 a2, const type3 a3) : \ arg1 (a1), arg2(a2), arg3(a3) {}; \ @@ -500,7 +502,7 @@ class Exception3 : public ExceptionBase { \ * @ingroup Exceptions */ #define DeclException4(Exception4, type1, type2, type3, type4, outsequence) \ -class Exception4 : public ExceptionBase { \ +class Exception4 : public dealii::ExceptionBase { \ public: \ Exception4 (const type1 a1, const type2 a2, \ const type3 a3, const type4 a4) : \ @@ -524,7 +526,7 @@ class Exception4 : public ExceptionBase { \ * @ingroup Exceptions */ #define DeclException5(Exception5, type1, type2, type3, type4, type5, outsequence) \ -class Exception5 : public ExceptionBase { \ +class Exception5 : public dealii::ExceptionBase { \ public: \ Exception5 (const type1 a1, const type2 a2, const type3 a3, \ const type4 a4, const type5 a5) : \ @@ -946,4 +948,6 @@ namespace StandardExceptions using namespace StandardExceptions; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index bde5744378..85fe6e212a 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Point; template class Tensor; template class Tensor<1,dim>; @@ -688,5 +689,6 @@ class ComponentSelectFunction : public ConstantFunction }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/function_derivative.h b/deal.II/base/include/base/function_derivative.h index ef1a240dcf..feab8e9133 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) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * Derivative of a function object. The value access functions of @@ -165,4 +167,6 @@ class FunctionDerivative : public Function std::vector > incr; }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index 7cf503e98d..790e5018f1 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Namespace implementing some concrete classes derived from the @@ -1056,5 +1057,6 @@ namespace Functions const unsigned int component = 0) const; }; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/function_parser.h b/deal.II/base/include/base/function_parser.h index caf8cda593..80f5d073e4 100644 --- a/deal.II/base/include/base/function_parser.h +++ b/deal.II/base/include/base/function_parser.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -26,6 +26,8 @@ namespace fparser class FunctionParser; } +DEAL_II_NAMESPACE_OPEN + template class Point; template class Tensor; @@ -456,6 +458,7 @@ class FunctionParser : public Function unsigned int n_vars; }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/function_time.h b/deal.II/base/include/base/function_time.h index aa9066aa80..382d4baba1 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) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Support for time dependent functions. * The library was also designed for time dependent problems. For this @@ -111,5 +112,6 @@ FunctionTime::get_time () const } #endif +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/geometry_info.h b/deal.II/base/include/base/geometry_info.h index e166a10e03..cb5c81aed5 100644 --- a/deal.II/base/include/base/geometry_info.h +++ b/deal.II/base/include/base/geometry_info.h @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class GeometryInfo; @@ -1224,5 +1225,6 @@ GeometryInfo<3>::is_inside_unit_cell (const Point<3> &p, } #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/job_identifier.h b/deal.II/base/include/base/job_identifier.h index 00b8fa89db..abb7fb3761 100644 --- a/deal.II/base/include/base/job_identifier.h +++ b/deal.II/base/include/base/job_identifier.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Identification of a program run. JobIdentifier determines the * start time of a program run and stores it as a program @@ -76,5 +77,6 @@ class JobIdentifier * Global object to identify the presently running program. */ extern JobIdentifier dealjobid; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 38cbe9ede0..b9d8b3a075 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN // we only need output streams, but older compilers did not provide // them in a separate include file #ifdef HAVE_STD_OSTREAM_HEADER @@ -506,5 +507,6 @@ LogStream::print (const T &t) */ extern LogStream deallog; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index 21e09cda8c..4c27e57a64 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** @@ -619,5 +620,6 @@ namespace MemoryConsumption } } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/multithread_info.h b/deal.II/base/include/base/multithread_info.h index d61cbe562b..f6873ed2a1 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, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * This class provides information about the system which may be of @@ -127,6 +128,7 @@ extern MultithreadInfo multithread_info; //--------------------------------------------------------------------------- +DEAL_II_NAMESPACE_CLOSE // end of #ifndef __deal2__multithread_info_h #endif //--------------------------------------------------------------------------- diff --git a/deal.II/base/include/base/numbers.h b/deal.II/base/include/base/numbers.h index 303db38858..a06ca477e7 100644 --- a/deal.II/base/include/base/numbers.h +++ b/deal.II/base/include/base/numbers.h @@ -13,6 +13,8 @@ #ifndef __deal2__numbers_h #define __deal2__numbers_h +DEAL_II_NAMESPACE_OPEN + /** * Namespace for the declaration of universal constants. Since the * availability in math.h is not always guaranteed, we put @@ -107,4 +109,6 @@ namespace deal_II_numbers { bool is_finite (const double x); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index dc5494632d..c27a4eb20f 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN //TODO: Allow long input lines to be broken by appending a backslash character //TODO: Provide an "include" command for parameter files @@ -998,7 +999,8 @@ namespace Patterns * @code * #include * #include "../include/parameter_handler.h" - * + * + DEAL_II_NAMESPACE_OPEN * * class LinEq { * public: @@ -2185,5 +2187,6 @@ class MultipleParameterLoop : public ParameterHandler }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/path_search.h b/deal.II/base/include/base/path_search.h index 9993ada43b..0b0e7b6e71 100644 --- a/deal.II/base/include/base/path_search.h +++ b/deal.II/base/include/base/path_search.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * Support for searching files in a list of paths and with a list of * suffixes. @@ -42,6 +44,7 @@ * @code * #include * + DEAL_II_NAMESPACE_OPEN * PathSearch search("MESH"); * std::string full_name = search.find("grid"); * std::ifstream in(full_name.c_str()); @@ -323,6 +326,7 @@ PathSearch::show(STREAM& out) const out << std::endl; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/point.h b/deal.II/base/include/base/point.h index b55398be71..8d6de51cab 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, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * The Point class provides for a point or vector in a space with @@ -427,5 +428,6 @@ std::ostream & operator << (std::ostream &out, const Point<1> &p) } #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomial.h b/deal.II/base/include/base/polynomial.h index f8c9c722e7..ce83e871c8 100644 --- a/deal.II/base/include/base/polynomial.h +++ b/deal.II/base/include/base/polynomial.h @@ -21,6 +21,7 @@ #include +DEAL_II_NAMESPACE_OPEN template class Point; /** @@ -562,5 +563,6 @@ namespace Polynomials return coefficients.size() - 1; } } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomial_space.h b/deal.II/base/include/base/polynomial_space.h index ce65921f4c..26413fad3c 100644 --- a/deal.II/base/include/base/polynomial_space.h +++ b/deal.II/base/include/base/polynomial_space.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * Representation of the space of polynomials of degree at most n in @@ -327,5 +328,6 @@ PolynomialSpace::output_indices(STREAM &out) const } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomials_abf.h b/deal.II/base/include/base/polynomials_abf.h index 91944c0082..0abd61ca1f 100644 --- a/deal.II/base/include/base/polynomials_abf.h +++ b/deal.II/base/include/base/polynomials_abf.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * @addtogroup Polynomials * @{ @@ -175,5 +176,6 @@ PolynomialsABF::degree() const { return my_degree; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomials_bdm.h b/deal.II/base/include/base/polynomials_bdm.h index 866a43d595..e808736c25 100644 --- a/deal.II/base/include/base/polynomials_bdm.h +++ b/deal.II/base/include/base/polynomials_bdm.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * @addtogroup Polynomials @@ -177,5 +178,6 @@ PolynomialsBDM::degree() const { return polynomial_space.degree(); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomials_p.h b/deal.II/base/include/base/polynomials_p.h index fb487a21e3..afb17d7965 100644 --- a/deal.II/base/include/base/polynomials_p.h +++ b/deal.II/base/include/base/polynomials_p.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * @addtogroup Polynomials * @{ @@ -110,5 +111,6 @@ PolynomialsP::directional_degrees(unsigned int n, this->compute_index(n,degrees); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/polynomials_raviart_thomas.h b/deal.II/base/include/base/polynomials_raviart_thomas.h index 51a1863bfd..af5c8b5554 100644 --- a/deal.II/base/include/base/polynomials_raviart_thomas.h +++ b/deal.II/base/include/base/polynomials_raviart_thomas.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * @addtogroup Polynomials * @{ @@ -172,5 +173,6 @@ PolynomialsRaviartThomas::degree() const { return my_degree; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/qprojector.h b/deal.II/base/include/base/qprojector.h index fc50a6ea8c..700d692adb 100644 --- a/deal.II/base/include/base/qprojector.h +++ b/deal.II/base/include/base/qprojector.h @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup Quadrature */ /*@{*/ @@ -445,5 +446,6 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/quadrature.h b/deal.II/base/include/base/quadrature.h index f11238ea49..551fa4eeb7 100644 --- a/deal.II/base/include/base/quadrature.h +++ b/deal.II/base/include/base/quadrature.h @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup Quadrature */ /*@{*/ @@ -370,5 +371,6 @@ template <> const std::vector & Quadrature<0>::get_weights () const; #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/quadrature_lib.h b/deal.II/base/include/base/quadrature_lib.h index 291ef1e330..6aa72a8e12 100644 --- a/deal.II/base/include/base/quadrature_lib.h +++ b/deal.II/base/include/base/quadrature_lib.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup Quadrature */ /*@{*/ @@ -261,5 +262,6 @@ template <> QSimpson<1>::QSimpson (); template <> QMilne<1>::QMilne (); template <> QWeddle<1>::QWeddle (); +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/quadrature_selector.h b/deal.II/base/include/base/quadrature_selector.h index f914512ccb..d5eb9d41e5 100644 --- a/deal.II/base/include/base/quadrature_selector.h +++ b/deal.II/base/include/base/quadrature_selector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * This class implements the quadrature rule passed to its constructor @@ -102,5 +103,6 @@ class QuadratureSelector : public Quadrature create_quadrature (const std::string &s, const unsigned int order); }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/smartpointer.h b/deal.II/base/include/base/smartpointer.h index 71bbc69a95..9ee58bc564 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, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Smart pointers avoid destruction of an object in use. They can be used just @@ -396,5 +397,6 @@ void swap (T *&t1, SmartPointer &t2) t2.swap (t1); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/subscriptor.h b/deal.II/base/include/base/subscriptor.h index f46634e90d..f102a8a2bf 100644 --- a/deal.II/base/include/base/subscriptor.h +++ b/deal.II/base/include/base/subscriptor.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Handling of subscriptions. @@ -240,5 +241,6 @@ Subscriptor::unsubscribe(const char*) const {} #endif +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/symmetric_tensor.h b/deal.II/base/include/base/symmetric_tensor.h index 96627af725..3ac46b78c5 100644 --- a/deal.II/base/include/base/symmetric_tensor.h +++ b/deal.II/base/include/base/symmetric_tensor.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class SymmetricTensor; @@ -2665,5 +2666,6 @@ double_contract (SymmetricTensor<2,3> &tmp, } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/table.h b/deal.II/base/include/base/table.h index 98db82c754..e298915434 100644 --- a/deal.II/base/include/base/table.h +++ b/deal.II/base/include/base/table.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN // forward declaration template class TableBase; @@ -3141,5 +3142,6 @@ Table<7,T>::operator () (const TableIndices<7> &indices) #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/table_handler.h b/deal.II/base/include/base/table_handler.h index df31b05732..c6257bc573 100644 --- a/deal.II/base/include/base/table_handler.h +++ b/deal.II/base/include/base/table_handler.h @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN // we only need output streams, but older compilers did not provide // them in a separate include file #ifdef HAVE_STD_OSTREAM_HEADER @@ -546,5 +547,6 @@ class TableHandler }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/table_indices.h b/deal.II/base/include/base/table_indices.h index 87d6135d09..08ea523d21 100644 --- a/deal.II/base/include/base/table_indices.h +++ b/deal.II/base/include/base/table_indices.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** @@ -633,5 +634,6 @@ TableIndices<7>::TableIndices (const unsigned int index1, +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/template_constraints.h b/deal.II/base/include/base/template_constraints.h index 0b285a6ed0..ea0ecff42e 100644 --- a/deal.II/base/include/base/template_constraints.h +++ b/deal.II/base/include/base/template_constraints.h @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN template struct constraint_and_return_value; @@ -232,5 +233,6 @@ PointerComparison::equal (const T *p1, const T *p2) +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/tensor.h b/deal.II/base/include/base/tensor.h index f10be25e6f..a1b8ed62c7 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Tensor; template class Tensor<1,dim>; @@ -1599,5 +1600,6 @@ operator / (const Tensor &t, return tt; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h index 800e41e79f..33bad87192 100644 --- a/deal.II/base/include/base/tensor_base.h +++ b/deal.II/base/include/base/tensor_base.h @@ -26,6 +26,7 @@ #include +DEAL_II_NAMESPACE_OPEN // we only need output streams, but older compilers did not provide // them in a separate include file #ifdef HAVE_STD_OSTREAM_HEADER @@ -830,6 +831,7 @@ operator / (const Tensor<1,dim> &t, tt[d] = t[d] / factor; return tt; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index 38643ad180..59a523bb08 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * This class is a model for a tensor valued function. The interface @@ -172,5 +173,6 @@ class TensorFunction : public FunctionTime, }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/tensor_product_polynomials.h b/deal.II/base/include/base/tensor_product_polynomials.h index 90138a3d47..7191d2a611 100644 --- a/deal.II/base/include/base/tensor_product_polynomials.h +++ b/deal.II/base/include/base/tensor_product_polynomials.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * @addtogroup Polynomials @@ -562,5 +563,6 @@ AnisotropicPolynomials<3>::compute_index(const unsigned int n, unsigned int (&index)[3]) const; #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 86a2fe998c..5a477a454b 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -26,6 +26,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN #if DEAL_II_USE_MT == 1 # if defined(DEAL_II_USE_MT_POSIX) # include @@ -6691,6 +6692,7 @@ namespace Threads //--------------------------------------------------------------------------- +DEAL_II_NAMESPACE_CLOSE // end of #ifndef __deal2__thread_management_h #endif //--------------------------------------------------------------------------- diff --git a/deal.II/base/include/base/timer.h b/deal.II/base/include/base/timer.h index 36adfd7cb3..c904cf1676 100644 --- a/deal.II/base/include/base/timer.h +++ b/deal.II/base/include/base/timer.h @@ -15,6 +15,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * This is a very simple class which provides information about the time @@ -141,5 +142,6 @@ class Timer bool running; }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/utilities.h b/deal.II/base/include/base/utilities.h index f32f9cb710..5882c54fbe 100644 --- a/deal.II/base/include/base/utilities.h +++ b/deal.II/base/include/base/utilities.h @@ -21,10 +21,14 @@ #ifdef DEAL_II_USE_PETSC #include + #else typedef int MPI_Comm; #endif +DEAL_II_NAMESPACE_OPEN + + /** * A namespace for utility functions that are not particularly specific to * finite element computing or numerical programs, but nevertheless are needed @@ -204,6 +208,7 @@ namespace Utilities } } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/include/base/vector_slice.h b/deal.II/base/include/base/vector_slice.h index 74498e9264..83dba1f36d 100644 --- a/deal.II/base/include/base/vector_slice.h +++ b/deal.II/base/include/base/vector_slice.h @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Filter a range out of any object having a random access operator[] * (unsigned int) and a function size() const. @@ -247,5 +248,6 @@ VectorSlice::end() return v.begin()+start+length; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/base/source/auto_derivative_function.cc b/deal.II/base/source/auto_derivative_function.cc index 5767079553..d57e77593c 100644 --- a/deal.II/base/source/auto_derivative_function.cc +++ b/deal.II/base/source/auto_derivative_function.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include +DEAL_II_NAMESPACE_OPEN template AutoDerivativeFunction:: @@ -338,3 +339,5 @@ AutoDerivativeFunction::get_formula_of_order(const unsigned int ord) template class AutoDerivativeFunction<1>; template class AutoDerivativeFunction<2>; template class AutoDerivativeFunction<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/conditional_ostream.cc b/deal.II/base/source/conditional_ostream.cc index 5d68dc43a4..3168ecb7da 100644 --- a/deal.II/base/source/conditional_ostream.cc +++ b/deal.II/base/source/conditional_ostream.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,6 +13,7 @@ #include +DEAL_II_NAMESPACE_OPEN ConditionalOStream::ConditionalOStream(std::ostream &stream, const bool active) @@ -32,3 +33,5 @@ bool ConditionalOStream::is_active() const { return active_flag; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/config.cc b/deal.II/base/source/config.cc index cfce328699..09f070f0d3 100644 --- a/deal.II/base/source/config.cc +++ b/deal.II/base/source/config.cc @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace deal_II_numbers { @@ -29,7 +30,10 @@ namespace deal_II_numbers // comparisons will be false return ((x >= -std::numeric_limits::max()) && +DEAL_II_NAMESPACE_CLOSE (x <= std::numeric_limits::max())); #endif } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/convergence_table.cc b/deal.II/base/source/convergence_table.cc index efc80a1f8a..a24719a81d 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) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN ConvergenceTable::ConvergenceTable() {} @@ -183,3 +184,5 @@ ConvergenceTable::evaluate_all_convergence_rates(const RateMode rate_mode) if (!col_iter->second.flag) evaluate_convergence_rates(col_iter->first, rate_mode); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 95c44c8862..ea05cf6a6f 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -43,6 +43,8 @@ #include +DEAL_II_NAMESPACE_OPEN + //TODO: Is it reasonable to have undocumented exceptions? DeclException2 (ExcUnexpectedInput, @@ -3892,7 +3894,7 @@ DataOutReader::read (std::istream &in) // first empty previous content { - std::vector > + std::vector > tmp; tmp.swap (patches); } @@ -3909,7 +3911,7 @@ DataOutReader::read (std::istream &in) { std::pair dimension_info - = ::DataOutBase::determine_intermediate_format_dimensions (in); + = dealii::DataOutBase::determine_intermediate_format_dimensions (in); AssertThrow ((dimension_info.first == dim) && (dimension_info.second == spacedim), ExcIncompatibleDimensions (dimension_info.first, dim, @@ -3962,7 +3964,7 @@ void DataOutReader:: merge (const DataOutReader &source) { - typedef typename ::DataOutBase::Patch Patch; + typedef typename dealii::DataOutBase::Patch Patch; const std::vector source_patches = source.get_patches (); Assert (patches.size () != 0, ExcNoPatches ()); @@ -4002,7 +4004,7 @@ merge (const DataOutReader &source) template -const std::vector > & +const std::vector > & DataOutReader::get_patches () const { return patches; @@ -4131,3 +4133,5 @@ INSTANTIATE(2,3); INSTANTIATE(3,4); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/exceptions.cc b/deal.II/base/source/exceptions.cc index 073281bf0c..8d29eadf8f 100644 --- a/deal.II/base/source/exceptions.cc +++ b/deal.II/base/source/exceptions.cc @@ -27,6 +27,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + namespace deal_II_exceptions { @@ -441,6 +443,9 @@ namespace deal_II_exceptions } +DEAL_II_NAMESPACE_CLOSE + + // from the aclocal file: // Newer versions of gcc have a very nice feature: you can set // a verbose terminate handler, that not only aborts a program diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index ae2a58fbf3..d91b179eb1 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template const unsigned int Function::dimension; @@ -497,3 +499,5 @@ template class Function<3>; template class ZeroFunction<3>; template class ConstantFunction<3>; template class ComponentSelectFunction<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/function_derivative.cc b/deal.II/base/source/function_derivative.cc index c71474854b..3959e0c85f 100644 --- a/deal.II/base/source/function_derivative.cc +++ b/deal.II/base/source/function_derivative.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template FunctionDerivative::FunctionDerivative (const Function &f, const Point &dir, @@ -206,3 +208,5 @@ FunctionDerivative::memory_consumption () const template class FunctionDerivative<1>; template class FunctionDerivative<2>; template class FunctionDerivative<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index a628f3d61d..e7aad17438 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -19,6 +19,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // in strict ANSI C mode, the following constants are not defined by // default, so we do it ourselves @@ -1532,3 +1534,5 @@ namespace Functions template class SlitSingularityFunction<2>; template class SlitSingularityFunction<3>; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/function_lib_cutoff.cc b/deal.II/base/source/function_lib_cutoff.cc index 1d0f5919d4..06fa53fd18 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) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,7 @@ #include +DEAL_II_NAMESPACE_OPEN namespace Functions @@ -324,3 +325,5 @@ namespace Functions template class CutOffFunctionCinfty <2>; template class CutOffFunctionCinfty <3>; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/function_parser.cc b/deal.II/base/source/function_parser.cc index 6729b9bcec..a98a7a4e11 100644 --- a/deal.II/base/source/function_parser.cc +++ b/deal.II/base/source/function_parser.cc @@ -28,6 +28,8 @@ namespace fparser #endif +DEAL_II_NAMESPACE_OPEN + template @@ -252,3 +254,5 @@ void FunctionParser::vector_value ( template class FunctionParser<1>; template class FunctionParser<2>; template class FunctionParser<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/function_time.cc b/deal.II/base/source/function_time.cc index 85963e0140..ffaf5753ad 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) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + FunctionTime::FunctionTime(const double initial_time) : @@ -40,3 +42,5 @@ FunctionTime::advance_time (const double delta_t) { set_time (time+delta_t); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/geometry_info.cc b/deal.II/base/source/geometry_info.cc index 85bbcd2258..0869f80b70 100644 --- a/deal.II/base/source/geometry_info.cc +++ b/deal.II/base/source/geometry_info.cc @@ -14,6 +14,7 @@ #include +DEAL_II_NAMESPACE_OPEN template const unsigned int GeometryInfo::children_per_cell; @@ -462,3 +463,5 @@ template class GeometryInfo<1>; template class GeometryInfo<2>; template class GeometryInfo<3>; template class GeometryInfo<4>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/job_identifier.cc b/deal.II/base/source/job_identifier.cc index aa47f969b1..61741c0551 100644 --- a/deal.II/base/source/job_identifier.cc +++ b/deal.II/base/source/job_identifier.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,9 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + + JobIdentifier dealjobid; @@ -45,3 +48,5 @@ JobIdentifier::operator ()() const { return id; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/log.cc b/deal.II/base/source/log.cc index 73b1b629f5..50df78c862 100644 --- a/deal.II/base/source/log.cc +++ b/deal.II/base/source/log.cc @@ -36,6 +36,8 @@ extern "C" { } #endif +DEAL_II_NAMESPACE_OPEN + LogStream deallog; @@ -265,3 +267,5 @@ LogStream::memory_consumption () const return mem; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/memory_consumption.cc b/deal.II/base/source/memory_consumption.cc index 85f36ab02a..27afd9ae73 100644 --- a/deal.II/base/source/memory_consumption.cc +++ b/deal.II/base/source/memory_consumption.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + namespace MemoryConsumption { @@ -27,3 +29,5 @@ namespace MemoryConsumption } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/multithread_info.cc b/deal.II/base/source/multithread_info.cc index 3011c01906..a4f5c608bb 100644 --- a/deal.II/base/source/multithread_info.cc +++ b/deal.II/base/source/multithread_info.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -32,6 +32,10 @@ # include #endif + +DEAL_II_NAMESPACE_OPEN + + #if DEAL_II_USE_MT == 1 /* Detecting how many processors a given machine has is something that @@ -164,3 +168,5 @@ MultithreadInfo::memory_consumption () // definition of the variable which is declared `extern' in the .h file MultithreadInfo multithread_info; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 2863452985..1e23e898c6 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -28,6 +28,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + //TODO[WB]: various functions here could be simplified by using namespace Utilities @@ -1816,3 +1818,5 @@ MultipleParameterLoop::Entry::memory_consumption () const MemoryConsumption::memory_consumption (different_values) + sizeof (type)); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/path_search.cc b/deal.II/base/source/path_search.cc index f83f102f83..5ba5cb88a4 100644 --- a/deal.II/base/source/path_search.cc +++ b/deal.II/base/source/path_search.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + std::map > PathSearch::path_lists; std::map > PathSearch::suffix_lists; std::string PathSearch::empty(""); @@ -208,3 +211,5 @@ PathSearch::add_suffix (const std::string& suffix, } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomial.cc b/deal.II/base/source/polynomial.cc index 2c98b7ebdb..7dca20bafd 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -19,6 +19,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // have a lock that guarantees that at most one thread is changing and @@ -1052,3 +1054,5 @@ namespace Polynomials template class Monomial; template class Monomial; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomial_space.cc b/deal.II/base/source/polynomial_space.cc index 56c45ff064..8015badbc2 100644 --- a/deal.II/base/source/polynomial_space.cc +++ b/deal.II/base/source/polynomial_space.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -315,3 +316,5 @@ PolynomialSpace::compute (const Point &p, template class PolynomialSpace<1>; template class PolynomialSpace<2>; template class PolynomialSpace<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomials_abf.cc b/deal.II/base/source/polynomials_abf.cc index fc13c0c1ae..5bc0a39f58 100644 --- a/deal.II/base/source/polynomials_abf.cc +++ b/deal.II/base/source/polynomials_abf.cc @@ -17,6 +17,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template PolynomialsABF::PolynomialsABF (const unsigned int k) @@ -115,3 +117,5 @@ template class PolynomialsABF<1>; template class PolynomialsABF<2>; template class PolynomialsABF<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomials_bdm.cc b/deal.II/base/source/polynomials_bdm.cc index a9ed0a1e5d..a382a7cf53 100644 --- a/deal.II/base/source/polynomials_bdm.cc +++ b/deal.II/base/source/polynomials_bdm.cc @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template PolynomialsBDM::PolynomialsBDM (const unsigned int k) @@ -206,3 +208,5 @@ template class PolynomialsBDM<1>; template class PolynomialsBDM<2>; template class PolynomialsBDM<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomials_p.cc b/deal.II/base/source/polynomials_p.cc index 29a020312c..c082c0cd4d 100644 --- a/deal.II/base/source/polynomials_p.cc +++ b/deal.II/base/source/polynomials_p.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,6 +13,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template PolynomialsP::PolynomialsP (const unsigned int p) @@ -99,3 +101,5 @@ void PolynomialsP<3>::create_polynomial_ordering( template class PolynomialsP<1>; template class PolynomialsP<2>; template class PolynomialsP<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/polynomials_raviart_thomas.cc b/deal.II/base/source/polynomials_raviart_thomas.cc index c9753fe13c..44bb808b1a 100644 --- a/deal.II/base/source/polynomials_raviart_thomas.cc +++ b/deal.II/base/source/polynomials_raviart_thomas.cc @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template PolynomialsRaviartThomas::PolynomialsRaviartThomas (const unsigned int k) @@ -113,3 +115,5 @@ template class PolynomialsRaviartThomas<1>; template class PolynomialsRaviartThomas<2>; template class PolynomialsRaviartThomas<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 499f67cac9..282ddd9bce 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace { @@ -1302,3 +1304,5 @@ template class QIterated<3>; template class QProjector<1>; template class QProjector<2>; template class QProjector<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index 0eaff84c08..223765e532 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -19,6 +19,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + // please note: for a given dimension, we need the quadrature formulae // for all lower dimensions as well. That is why in this file the check @@ -586,3 +588,5 @@ template class QTrapez<3>; template class QSimpson<3>; template class QMilne<3>; template class QWeddle<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/quadrature_selector.cc b/deal.II/base/source/quadrature_selector.cc index b4bae3d780..0be5da66d4 100644 --- a/deal.II/base/source/quadrature_selector.cc +++ b/deal.II/base/source/quadrature_selector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2005 by the deal.II authors +// Copyright (C) 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template Quadrature @@ -81,3 +83,5 @@ QuadratureSelector::get_quadrature_names() template class QuadratureSelector<1>; template class QuadratureSelector<2>; template class QuadratureSelector<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/subscriptor.cc b/deal.II/base/source/subscriptor.cc index 37969bb997..e0d43da96b 100644 --- a/deal.II/base/source/subscriptor.cc +++ b/deal.II/base/source/subscriptor.cc @@ -20,6 +20,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + namespace { // create a lock that might be used to control subscription to and @@ -189,3 +192,5 @@ void Subscriptor::list_subscribers () const deallog << "No subscriber listing with multithreading" << std::endl; #endif } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/symmetric_tensor.cc b/deal.II/base/source/symmetric_tensor.cc index 47a686a485..87af6de0cb 100644 --- a/deal.II/base/source/symmetric_tensor.cc +++ b/deal.II/base/source/symmetric_tensor.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template <> SymmetricTensor<4,3> @@ -121,3 +123,5 @@ invert (const SymmetricTensor<4,3> &t) return tmp; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/table_handler.cc b/deal.II/base/source/table_handler.cc index 95029b66b3..2547c3c106 100644 --- a/deal.II/base/source/table_handler.cc +++ b/deal.II/base/source/table_handler.cc @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + TableEntryBase::TableEntryBase () @@ -527,3 +529,5 @@ void TableHandler::add_value (const std::string &, template void TableHandler::add_value (const std::string &, const std::string); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/tensor.cc b/deal.II/base/source/tensor.cc index b4f8f691ad..1c1c25b272 100644 --- a/deal.II/base/source/tensor.cc +++ b/deal.II/base/source/tensor.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // storage for static variables template @@ -87,3 +89,5 @@ template class Tensor<3, 3>; template class Tensor<4, 1>; template class Tensor<4, 2>; template class Tensor<4, 3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index afb6351958..57aa700ec5 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + ////////////////////////////////////////////////////////////////////// // TensorFunction @@ -92,3 +94,5 @@ template class TensorFunction<1,3>; template class TensorFunction<2,3>; template class TensorFunction<3,3>; template class TensorFunction<4,3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/tensor_product_polynomials.cc b/deal.II/base/source/tensor_product_polynomials.cc index eee3ffd7d3..4fee35a7b5 100644 --- a/deal.II/base/source/tensor_product_polynomials.cc +++ b/deal.II/base/source/tensor_product_polynomials.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /* ------------------- TensorProductPolynomials -------------- */ @@ -545,3 +547,5 @@ template class TensorProductPolynomials<3>; template class AnisotropicPolynomials<1>; template class AnisotropicPolynomials<2>; template class AnisotropicPolynomials<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/thread_management.cc b/deal.II/base/source/thread_management.cc index 735dbd3654..c7b2402cbf 100644 --- a/deal.II/base/source/thread_management.cc +++ b/deal.II/base/source/thread_management.cc @@ -25,6 +25,8 @@ #endif #include +DEAL_II_NAMESPACE_OPEN + namespace Threads { @@ -407,3 +409,5 @@ namespace Threads #endif // (DEAL_II_USE_MT == 1) && defined(DEAL_II_USE_MT_POSIX) } // end namespace Thread + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/timer.cc b/deal.II/base/source/timer.cc index 2464f4a527..9f5208ea5a 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, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -29,6 +29,7 @@ extern "C" { } #endif +DEAL_II_NAMESPACE_OPEN @@ -102,3 +103,5 @@ void Timer::reset () cumulative_time = 0.; running = false; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/base/source/utilities.cc b/deal.II/base/source/utilities.cc index 6f467c250c..291caf2982 100644 --- a/deal.II/base/source/utilities.cc +++ b/deal.II/base/source/utilities.cc @@ -32,6 +32,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + namespace Utilities { @@ -450,3 +452,5 @@ namespace Utilities } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/configure b/deal.II/configure index 82b3612a3a..349be331fe 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 13905 . +# From configure.in Revision: 13973 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # diff --git a/deal.II/configure.in b/deal.II/configure.in index 1ee4c2c5ce..f2310818ee 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -605,6 +605,14 @@ AH_TOP( // In case of problems in autodetection of features of your build // environment, contact the authors of the library. + +/** + * Two macro names that we put at the top and bottom of all deal.II files + * and that will be expanded to "namespace dealii {" and "}". + */ +#define DEAL_II_NAMESPACE_OPEN namespace dealii { +#define DEAL_II_NAMESPACE_CLOSE } + ]) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index 1e547a2776..71255235b6 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -18,8 +18,10 @@ #include #include #include + #include +DEAL_II_NAMESPACE_OPEN template class FullMatrix; template class SparseMatrix; @@ -1468,6 +1470,7 @@ void DoFCellAccessor >::update_cell_dof_indices_cache () const; +DEAL_II_NAMESPACE_CLOSE // include more templates #include "dof_accessor.templates.h" diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index feb66d3a35..4a732ec914 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -23,6 +23,7 @@ #include +DEAL_II_NAMESPACE_OPEN @@ -274,7 +275,7 @@ DoFAccessor::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<1> & -DoFAccessor<1,::DoFHandler<1> >::get_fe (const unsigned int fe_index) const +DoFAccessor<1,dealii::DoFHandler<1> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -286,7 +287,7 @@ DoFAccessor<1,::DoFHandler<1> >::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<2> & -DoFAccessor<1,::DoFHandler<2> >::get_fe (const unsigned int fe_index) const +DoFAccessor<1,dealii::DoFHandler<2> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -298,7 +299,7 @@ DoFAccessor<1,::DoFHandler<2> >::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<3> & -DoFAccessor<1,::DoFHandler<3> >::get_fe (const unsigned int fe_index) const +DoFAccessor<1,dealii::DoFHandler<3> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -310,7 +311,7 @@ DoFAccessor<1,::DoFHandler<3> >::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<2> & -DoFAccessor<2,::DoFHandler<2> >::get_fe (const unsigned int fe_index) const +DoFAccessor<2,dealii::DoFHandler<2> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -322,7 +323,7 @@ DoFAccessor<2,::DoFHandler<2> >::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<3> & -DoFAccessor<2,::DoFHandler<3> >::get_fe (const unsigned int fe_index) const +DoFAccessor<2,dealii::DoFHandler<3> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -334,7 +335,7 @@ DoFAccessor<2,::DoFHandler<3> >::get_fe (const unsigned int fe_index) const template <> inline const FiniteElement<3> & -DoFAccessor<3,::DoFHandler<3> >::get_fe (const unsigned int fe_index) const +DoFAccessor<3,dealii::DoFHandler<3> >::get_fe (const unsigned int fe_index) const { Assert (fe_index_is_active (fe_index) == true, ExcMessage ("This function can only be called for active fe indices")); @@ -1037,5 +1038,6 @@ distribute_local_to_global (const FullMatrix &local_source, } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/dofs/dof_constraints.h b/deal.II/deal.II/include/dofs/dof_constraints.h index 611a97af02..6b3fdcc7cb 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class FullMatrix; class SparsityPattern; @@ -1126,5 +1128,6 @@ ConstraintMatrix::is_constrained (const unsigned int index) const (constraint_line_exists[index] == true)); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/dofs/dof_constraints.templates.h b/deal.II/deal.II/include/dofs/dof_constraints.templates.h index 1d609e892d..b415292cca 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.templates.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -911,4 +912,6 @@ ConstraintMatrix::distribute (VectorType &vec) const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/dof_faces.h b/deal.II/deal.II/include/dofs/dof_faces.h index d1e0a40442..839c7828d1 100644 --- a/deal.II/deal.II/include/dofs/dof_faces.h +++ b/deal.II/deal.II/include/dofs/dof_faces.h @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class DoFHandler; template class MGDoFHandler; @@ -54,7 +55,7 @@ namespace internal * DoFAccessor::dof_index() functions or similar functions of derived classes that in turn * access the member variables using the DoFHandler::get_dof_index() and corresponding * setter functions. Knowledge of the actual data format is therefore encapsulated to the - * present hierarchy of classes as well as the ::DoFHandler class. + * present hierarchy of classes as well as the dealii::DoFHandler class. * * @ingroup dofs * @author Tobias Leicht, 2006 @@ -120,8 +121,8 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::DoFHandler; - template friend class ::MGDoFHandler; + template friend class dealii::DoFHandler; + template friend class dealii::MGDoFHandler; }; /** @@ -158,10 +159,13 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::DoFHandler; - template friend class ::MGDoFHandler; + template friend class dealii::DoFHandler; + template friend class dealii::MGDoFHandler; }; } } + +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index bbae41993c..55283f2cee 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -25,6 +25,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace DoFHandler @@ -131,7 +133,7 @@ class DoFHandler : public Subscriptor * Alias the @p FunctionMap type * declared elsewhere. */ - typedef typename ::FunctionMap::type FunctionMap; + typedef typename dealii::FunctionMap::type FunctionMap; /** * Make the dimension available @@ -1454,7 +1456,8 @@ DoFHandler::nth_active_fe_index (const unsigned int, #endif // DOXYGEN -/*---------------------------- dof_handler.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE +/*---------------------------- dof_handler.h ---------------------------*/ #endif /*---------------------------- dof_handler.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_iterator_selector.h b/deal.II/deal.II/include/dofs/dof_iterator_selector.h index 33321988a0..39145d92be 100644 --- a/deal.II/deal.II/include/dofs/dof_iterator_selector.h +++ b/deal.II/deal.II/include/dofs/dof_iterator_selector.h @@ -21,6 +21,8 @@ // 2. Can cell_iterator and quad_iterator in 2D be different (or hex // in 3D)? +DEAL_II_NAMESPACE_OPEN + template class DoFAccessor; template class DoFCellAccessor; template class DoFObjectAccessor; @@ -212,4 +214,6 @@ namespace internal } } +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__dof_iterator_selector_h diff --git a/deal.II/deal.II/include/dofs/dof_levels.h b/deal.II/deal.II/include/dofs/dof_levels.h index f0dc8ff392..a488f52fcd 100644 --- a/deal.II/deal.II/include/dofs/dof_levels.h +++ b/deal.II/deal.II/include/dofs/dof_levels.h @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class DoFHandler; template class MGDoFHandler; @@ -46,7 +48,7 @@ namespace internal * Note that vertices are separate from, and in fact have nothing to * do with cells. The indices of degrees of freedom located on * vertices therefore are not stored here, but rather in member - * variables of the ::DoFHandler class. + * variables of the dealii::DoFHandler class. * * The indices of degrees of freedom located on lower dimensional * objects, i.e. on lines for 2D and on quads and lines for 3D are @@ -71,7 +73,7 @@ namespace internal * DoFHandler::get_dof_index() and corresponding setter functions. * Knowledge of the actual data format is therefore * encapsulated to the present hierarchy of classes as well as the - * ::DoFHandler class. + * dealii::DoFHandler class. * * @ingroup dofs * @author Wolfgang Bangerth, 1998, 2006 @@ -150,8 +152,8 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::DoFHandler; - template friend class ::MGDoFHandler; + template friend class dealii::DoFHandler; + template friend class dealii::MGDoFHandler; }; @@ -187,8 +189,8 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::DoFHandler; - template friend class ::MGDoFHandler; + template friend class dealii::DoFHandler; + template friend class dealii::MGDoFHandler; }; @@ -225,11 +227,13 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::DoFHandler; - template friend class ::MGDoFHandler; + template friend class dealii::DoFHandler; + template friend class dealii::MGDoFHandler; }; } } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/dof_objects.h b/deal.II/deal.II/include/dofs/dof_objects.h index 7e1297fb4e..d9125523e8 100644 --- a/deal.II/deal.II/include/dofs/dof_objects.h +++ b/deal.II/deal.II/include/dofs/dof_objects.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class DoFHandler; namespace internal @@ -94,7 +96,7 @@ namespace internal */ template void - set_dof_index (const ::DoFHandler &dof_handler, + set_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -127,7 +129,7 @@ namespace internal */ template unsigned int - get_dof_index (const ::DoFHandler &dof_handler, + get_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index) const; @@ -142,7 +144,7 @@ namespace internal */ template unsigned int - n_active_fe_indices (const ::DoFHandler &dof_handler, + n_active_fe_indices (const dealii::DoFHandler &dof_handler, const unsigned int index) const; /** @@ -153,7 +155,7 @@ namespace internal */ template bool - fe_index_is_active (const ::DoFHandler &dof_handler, + fe_index_is_active (const dealii::DoFHandler &dof_handler, const unsigned int index, const unsigned int fe_index) const; @@ -182,7 +184,7 @@ namespace internal template inline unsigned int - DoFObjects::n_active_fe_indices (const ::DoFHandler &, + DoFObjects::n_active_fe_indices (const dealii::DoFHandler &, const unsigned) const { return 1; @@ -194,7 +196,7 @@ namespace internal template inline bool - DoFObjects::fe_index_is_active (const ::DoFHandler &, + DoFObjects::fe_index_is_active (const dealii::DoFHandler &, const unsigned int, const unsigned int fe_index) const { @@ -211,12 +213,12 @@ namespace internal inline unsigned int DoFObjects:: - get_dof_index (const ::DoFHandler &dof_handler, + get_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index) const { - Assert (fe_index == ::DoFHandler::default_fe_index, + Assert (fe_index == dealii::DoFHandler::default_fe_index, ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); Assert (local_index(), ExcIndexRange (local_index, 0, dof_handler.get_fe().template n_dofs_per_object())); @@ -231,4 +233,7 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/dof_renumbering.h b/deal.II/deal.II/include/dofs/dof_renumbering.h index cbefc4e832..7aabd175af 100644 --- a/deal.II/deal.II/include/dofs/dof_renumbering.h +++ b/deal.II/deal.II/include/dofs/dof_renumbering.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * Implementation of a number of renumbering algorithms for the degrees of @@ -671,5 +672,6 @@ class DoFRenumbering DeclException0 (ExcNotDGFEM); }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 45a0f8386e..a1f3439ed1 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Table; class SparsityPattern; template class Vector; @@ -1892,5 +1894,6 @@ DoFTools::map_support_points_to_dofs ( } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/dofs/function_map.h b/deal.II/deal.II/include/dofs/function_map.h index c35b51a2e2..91bbfab6d5 100644 --- a/deal.II/deal.II/include/dofs/function_map.h +++ b/deal.II/deal.II/include/dofs/function_map.h @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Function; @@ -50,5 +52,6 @@ struct FunctionMap typedef std::map*> type; }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/dofs/hp_dof_faces.h b/deal.II/deal.II/include/dofs/hp_dof_faces.h index 1d3de9bf65..86868b83d7 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_faces.h +++ b/deal.II/deal.II/include/dofs/hp_dof_faces.h @@ -21,6 +21,7 @@ #include +DEAL_II_NAMESPACE_OPEN namespace hp { @@ -97,7 +98,7 @@ namespace internal */ unsigned int memory_consumption () const; - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; /** @@ -120,7 +121,7 @@ namespace internal */ unsigned int memory_consumption () const; - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; /** @@ -144,11 +145,13 @@ namespace internal */ unsigned int memory_consumption () const; - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; } // namespace hp } // namespace internal +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/hp_dof_handler.h b/deal.II/deal.II/include/dofs/hp_dof_handler.h index c49c8e165f..8c378a10fd 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_handler.h +++ b/deal.II/deal.II/include/dofs/hp_dof_handler.h @@ -27,6 +27,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -114,7 +115,7 @@ namespace hp * The default index of the * finite element to be used on * a given cell. For the usual, - * non-hp ::DoFHandler class + * non-hp dealii::DoFHandler class * that only supports the same * finite element to be used on * all cells, the index of the @@ -1269,17 +1270,17 @@ namespace hp /** * Make accessor objects friends. */ - template friend class ::DoFAccessor; + template friend class dealii::DoFAccessor; /** * Make accessor objects friends. */ - template friend class ::DoFObjectAccessor; + template friend class dealii::DoFObjectAccessor; /** * Make accessor objects friends. */ - template friend class ::DoFCellAccessor; + template friend class dealii::DoFCellAccessor; /** * Likewise for DoFLevel @@ -1450,7 +1451,7 @@ namespace hp const unsigned int fe_index, const unsigned int local_index) const { - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (finite_elements != 0, @@ -1503,7 +1504,7 @@ namespace hp const unsigned int local_index, const unsigned int global_index) { - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (finite_elements != 0, @@ -1649,7 +1650,7 @@ namespace hp fe_is_active_on_vertex (const unsigned int vertex_index, const unsigned int fe_index) const { - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (finite_elements != 0, @@ -1697,6 +1698,8 @@ namespace hp } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/hp_dof_levels.h b/deal.II/deal.II/include/dofs/hp_dof_levels.h index a0e0abee0d..47e9c32f25 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_levels.h +++ b/deal.II/deal.II/include/dofs/hp_dof_levels.h @@ -19,6 +19,7 @@ #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -179,7 +180,7 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; @@ -213,7 +214,7 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; @@ -248,11 +249,13 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; } // namespace hp } // namespace internal +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/dofs/hp_dof_objects.h b/deal.II/deal.II/include/dofs/hp_dof_objects.h index 62ac5fec42..970af61188 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_objects.h +++ b/deal.II/deal.II/include/dofs/hp_dof_objects.h @@ -19,6 +19,7 @@ #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -142,7 +143,7 @@ namespace internal */ template void - set_dof_index (const ::hp::DoFHandler &dof_handler, + set_dof_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -174,7 +175,7 @@ namespace internal */ template unsigned int - get_dof_index (const ::hp::DoFHandler &dof_handler, + get_dof_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -205,7 +206,7 @@ namespace internal */ template unsigned int - n_active_fe_indices (const ::hp::DoFHandler &dof_handler, + n_active_fe_indices (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index) const; /** @@ -215,7 +216,7 @@ namespace internal */ template unsigned int - nth_active_fe_index (const ::hp::DoFHandler &dof_handler, + nth_active_fe_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_level, const unsigned int obj_index, const unsigned int n) const; @@ -228,7 +229,7 @@ namespace internal */ template bool - fe_index_is_active (const ::hp::DoFHandler &dof_handler, + fe_index_is_active (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int obj_level) const; @@ -246,7 +247,7 @@ namespace internal * resize arrays as * necessary. */ - template friend class ::hp::DoFHandler; + template friend class dealii::hp::DoFHandler; }; @@ -257,13 +258,13 @@ namespace internal inline unsigned int DoFObjects:: - get_dof_index (const ::hp::DoFHandler &dof_handler, + get_dof_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const unsigned int obj_level) const { - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (&dof_handler != 0, @@ -338,14 +339,14 @@ namespace internal inline void DoFObjects:: - set_dof_index (const ::hp::DoFHandler &dof_handler, + set_dof_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const unsigned int global_index, const unsigned int obj_level) { - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (&dof_handler != 0, @@ -423,7 +424,7 @@ namespace internal inline unsigned int DoFObjects:: - n_active_fe_indices (const ::hp::DoFHandler &dof_handler, + n_active_fe_indices (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index) const { Assert (dim <= spacedim, ExcInternalError()); @@ -486,7 +487,7 @@ namespace internal inline unsigned int DoFObjects:: - nth_active_fe_index (const ::hp::DoFHandler &dof_handler, + nth_active_fe_index (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_level, const unsigned int obj_index, const unsigned int n) const @@ -566,7 +567,7 @@ namespace internal inline bool DoFObjects:: - fe_index_is_active (const ::hp::DoFHandler &dof_handler, + fe_index_is_active (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int obj_level) const @@ -578,7 +579,7 @@ namespace internal "this DoFHandler")); Assert (obj_index < dof_offsets.size(), ExcIndexRange (obj_index, 0, dof_offsets.size())); - Assert (fe_index != ::hp::DoFHandler::default_fe_index, + Assert (fe_index != dealii::hp::DoFHandler::default_fe_index, ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); Assert (fe_index < dof_handler.get_fe().size(), @@ -638,7 +639,6 @@ namespace internal } } -#endif - - +DEAL_II_NAMESPACE_CLOSE +#endif diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index aa3efe0c05..6b1eb6e037 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class FEValuesData; template class FEValuesBase; template class FEValues; @@ -2619,4 +2621,6 @@ FiniteElement::is_primitive () const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_abf.h b/deal.II/deal.II/include/fe/fe_abf.h index 862e99130d..ab716f7a5a 100644 --- a/deal.II/deal.II/include/fe/fe_abf.h +++ b/deal.II/deal.II/include/fe/fe_abf.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; @@ -387,4 +389,6 @@ std::vector FE_ABF<1>::get_dpo_vector (const unsigned int); #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index 4a40d6a788..6eebc85d31 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -28,6 +28,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class FESystem; @@ -832,5 +834,6 @@ face_to_equivalent_cell_index (const unsigned int index) const +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/fe/fe_collection.h b/deal.II/deal.II/include/fe/fe_collection.h index 2150e91391..4d5288fdd8 100644 --- a/deal.II/deal.II/include/fe/fe_collection.h +++ b/deal.II/deal.II/include/fe/fe_collection.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace hp { @@ -361,5 +362,6 @@ namespace hp } // namespace hp +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/fe/fe_dgp.h b/deal.II/deal.II/include/fe/fe_dgp.h index a8ee8f2c83..1279e405bf 100644 --- a/deal.II/deal.II/include/fe/fe_dgp.h +++ b/deal.II/deal.II/include/fe/fe_dgp.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; /*!@addtogroup fe */ @@ -373,4 +375,7 @@ const unsigned int FE_DGP<3>::Matrices::n_projection_matrices; #endif #endif // DOXYGEN + +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_dgp_monomial.h b/deal.II/deal.II/include/fe/fe_dgp_monomial.h index df79182e7e..f1741d86d0 100644 --- a/deal.II/deal.II/include/fe/fe_dgp_monomial.h +++ b/deal.II/deal.II/include/fe/fe_dgp_monomial.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; @@ -355,5 +357,6 @@ class FE_DGPMonomial : public FE_Poly,dim> /*@}*/ +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h index b1510bf9ba..1860978cbe 100644 --- a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h +++ b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class PolynomialSpace; template class MappingQ; @@ -650,4 +652,6 @@ const unsigned int FE_DGPNonparametric<3>::Matrices::n_projection_matrices; #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index b4498b4c33..6608df10c2 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; template class Quadrature; @@ -382,4 +384,6 @@ class FE_DGQ : public FE_Poly,dim> /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_nedelec.h b/deal.II/deal.II/include/fe/fe_nedelec.h index f0eec112e1..2b65530bf3 100644 --- a/deal.II/deal.II/include/fe/fe_nedelec.h +++ b/deal.II/deal.II/include/fe/fe_nedelec.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; @@ -715,4 +717,7 @@ const unsigned int FE_Nedelec<3>::Matrices::n_constraint_matrices; #endif #endif // DOXYGEN + +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_poly.h b/deal.II/deal.II/include/fe/fe_poly.h index 075e284855..dcaa39a3e7 100644 --- a/deal.II/deal.II/include/fe/fe_poly.h +++ b/deal.II/deal.II/include/fe/fe_poly.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup febase */ /*@{*/ @@ -392,4 +394,6 @@ class FE_Poly : public FiniteElement /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_poly.templates.h b/deal.II/deal.II/include/fe/fe_poly.templates.h index d2dcb41705..450e1715a1 100644 --- a/deal.II/deal.II/include/fe/fe_poly.templates.h +++ b/deal.II/deal.II/include/fe/fe_poly.templates.h @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template FE_Poly::FE_Poly (const POLY& poly_space, const FiniteElementData &fe_data, @@ -399,3 +401,4 @@ FE_Poly::element_multiplicity (const unsigned int index) const } +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/include/fe/fe_poly_tensor.h b/deal.II/deal.II/include/fe/fe_poly_tensor.h index 787ae1a976..9a55a55699 100644 --- a/deal.II/deal.II/include/fe/fe_poly_tensor.h +++ b/deal.II/deal.II/include/fe/fe_poly_tensor.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup febase */ /*@{*/ @@ -408,4 +410,6 @@ class FE_PolyTensor : public FiniteElement /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_q.h b/deal.II/deal.II/include/fe/fe_q.h index 257749bbe0..5babd3ffed 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup fe */ /*@{*/ @@ -569,4 +571,6 @@ template <> void FE_Q<3>::initialize_constraints (); +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_q_hierarchical.h b/deal.II/deal.II/include/fe/fe_q_hierarchical.h index af16fac6d1..1367ec6ecc 100644 --- a/deal.II/deal.II/include/fe/fe_q_hierarchical.h +++ b/deal.II/deal.II/include/fe/fe_q_hierarchical.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; @@ -455,4 +457,6 @@ template <> std::vector FE_Q_Hierarchical<1>::face_fe_q_hierarchical_to_hierarchic_numbering (const unsigned int); +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_raviart_thomas.h b/deal.II/deal.II/include/fe/fe_raviart_thomas.h index 71b3e9af17..336ada9d29 100644 --- a/deal.II/deal.II/include/fe/fe_raviart_thomas.h +++ b/deal.II/deal.II/include/fe/fe_raviart_thomas.h @@ -24,6 +24,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ; @@ -460,4 +462,6 @@ std::vector FE_RaviartThomas<1>::get_dpo_vector (const unsigned in #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_system.h b/deal.II/deal.II/include/fe/fe_system.h index 77673d4352..8968067916 100644 --- a/deal.II/deal.II/include/fe/fe_system.h +++ b/deal.II/deal.II/include/fe/fe_system.h @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * This class provides an interface to group several elements together @@ -1063,6 +1064,7 @@ class FESystem : public FiniteElement template <> void FESystem<1>::initialize_unit_face_support_points (); +DEAL_II_NAMESPACE_CLOSE /*---------------------------- fe_system.h ---------------------------*/ #endif diff --git a/deal.II/deal.II/include/fe/fe_tools.h b/deal.II/deal.II/include/fe/fe_tools.h index e8d54b79fe..ac7f35606a 100644 --- a/deal.II/deal.II/include/fe/fe_tools.h +++ b/deal.II/deal.II/include/fe/fe_tools.h @@ -20,9 +20,11 @@ #include #include - #include + +DEAL_II_NAMESPACE_OPEN + template class FullMatrix; template class Vector; template class Quadrature; @@ -1120,6 +1122,8 @@ FETools::FEFactory::get (const unsigned int degree) const /*@}*/ +DEAL_II_NAMESPACE_CLOSE + /*---------------------------- fe_tools.h ---------------------------*/ /* end of #ifndef __deal2__fe_tools_H */ #endif diff --git a/deal.II/deal.II/include/fe/fe_update_flags.h b/deal.II/deal.II/include/fe/fe_update_flags.h index a83e7634ea..df31c2bf09 100644 --- a/deal.II/deal.II/include/fe/fe_update_flags.h +++ b/deal.II/deal.II/include/fe/fe_update_flags.h @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup feaccess */ /*@{*/ @@ -285,4 +286,6 @@ operator &= (UpdateFlags &f1, UpdateFlags f2) /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 5941ecd692..26c74270cc 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -40,6 +40,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Quadrature; //TODO: Add access to mapping values to FEValuesBase @@ -2761,5 +2763,6 @@ FEFaceValuesBase::boundary_form (const unsigned int i) const #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/fe/hp_fe_values.h b/deal.II/deal.II/include/fe/hp_fe_values.h index cfdb197aa4..3b3727ccff 100644 --- a/deal.II/deal.II/include/fe/hp_fe_values.h +++ b/deal.II/deal.II/include/fe/hp_fe_values.h @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MappingQ1; template class FiniteElement; @@ -39,7 +41,7 @@ namespace internal * that is common to them. The main task of this class is to provide a * table where for every combination of finite element, mapping, and * quadrature object from their corresponding collection objects there - * is a matching ::FEValues, ::FEFaceValues, or ::FESubfaceValues + * is a matching dealii::FEValues, dealii::FEFaceValues, or dealii::FESubfaceValues * object. To make things more efficient, however, these FE*Values * objects are only created once requested (lazy allocation). * @@ -48,8 +50,8 @@ namespace internal * i.e. for usual @p hp::FEValues it is equal to the first one, while * for face integration it is one less. The third template parameter * indicates the type of underlying non-hp FE*Values base type, - * i.e. it could either be ::FEValues, ::FEFaceValues, or - * ::FESubfaceValues. + * i.e. it could either be dealii::FEValues, dealii::FEFaceValues, or + * dealii::FESubfaceValues. * * @ingroup hp * @@ -65,9 +67,9 @@ namespace internal * indicated by the parameters * to the constructor. */ - FEValuesBase (const ::hp::MappingCollection &mapping_collection, - const ::hp::FECollection &fe_collection, - const ::hp::QCollection &q_collection, + FEValuesBase (const dealii::hp::MappingCollection &mapping_collection, + const dealii::hp::FECollection &fe_collection, + const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); /** * Constructor. Set the fields @@ -78,8 +80,8 @@ namespace internal * object for the mapping * object. */ - FEValuesBase (const ::hp::FECollection &fe_collection, - const ::hp::QCollection &q_collection, + FEValuesBase (const dealii::hp::FECollection &fe_collection, + const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); /** @@ -123,14 +125,14 @@ namespace internal * collection of finite * elements to be used. */ - const SmartPointer > fe_collection; + const SmartPointer > fe_collection; /** * A pointer to the * collection of mappings to * be used. */ - const SmartPointer > mapping_collection; + const SmartPointer > mapping_collection; /** * Copy of the quadrature @@ -138,7 +140,7 @@ namespace internal * provided to the * constructor. */ - const ::hp::QCollection q_collection; + const dealii::hp::QCollection q_collection; private: /** @@ -196,7 +198,7 @@ namespace hp * @ingroup hp */ template - class FEValues : public internal::hp::FEValuesBase > + class FEValues : public internal::hp::FEValuesBase > { public: /** @@ -219,9 +221,9 @@ namespace hp * DoFHandler::get_fe() * function. */ - FEValues (const ::hp::MappingCollection &mapping_collection, - const ::hp::FECollection &fe_collection, - const ::hp::QCollection &q_collection, + FEValues (const dealii::hp::MappingCollection &mapping_collection, + const dealii::hp::FECollection &fe_collection, + const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); @@ -387,7 +389,7 @@ namespace hp * these last three arguments. */ void - reinit (const typename ::DoFHandler::cell_iterator &cell, + reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int q_index = deal_II_numbers::invalid_unsigned_int, const unsigned int mapping_index = deal_II_numbers::invalid_unsigned_int, const unsigned int fe_index = deal_II_numbers::invalid_unsigned_int); @@ -471,7 +473,7 @@ namespace hp * @ingroup hp */ template - class FEFaceValues : public internal::hp::FEValuesBase > + class FEFaceValues : public internal::hp::FEValuesBase > { public: /** @@ -662,7 +664,7 @@ namespace hp * these last three arguments. */ void - reinit (const typename ::DoFHandler::cell_iterator &cell, + reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int q_index = deal_II_numbers::invalid_unsigned_int, const unsigned int mapping_index = deal_II_numbers::invalid_unsigned_int, @@ -749,7 +751,7 @@ namespace hp * @ingroup hp */ template - class FESubfaceValues : public internal::hp::FEValuesBase > + class FESubfaceValues : public internal::hp::FEValuesBase > { public: /** @@ -920,7 +922,7 @@ namespace hp * these last three arguments. */ void - reinit (const typename ::DoFHandler::cell_iterator &cell, + reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const unsigned int q_index = deal_II_numbers::invalid_unsigned_int, @@ -1023,5 +1025,6 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/fe/mapping.h b/deal.II/deal.II/include/fe/mapping.h index bb0660c0e3..8f5016af4d 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -22,6 +22,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class Quadrature; template class FEValuesData; template class FEValues; @@ -541,4 +543,6 @@ Mapping::InternalDataBase::clear_first_cell () } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_c1.h b/deal.II/deal.II/include/fe/mapping_c1.h index f3c5c32ab5..e0cb99d4c6 100644 --- a/deal.II/deal.II/include/fe/mapping_c1.h +++ b/deal.II/deal.II/include/fe/mapping_c1.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mapping */ /*@{*/ @@ -135,4 +136,6 @@ template <> void MappingC1<2>::add_quad_support_points ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 967b58c862..bdc3ff0a54 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mapping */ /*@{*/ @@ -251,4 +252,6 @@ template <> void MappingCartesian<1>::fill_fe_subface_values ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_collection.h b/deal.II/deal.II/include/fe/mapping_collection.h index e1bc9eda17..63929c5e78 100644 --- a/deal.II/deal.II/include/fe/mapping_collection.h +++ b/deal.II/deal.II/include/fe/mapping_collection.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace hp { @@ -189,4 +190,6 @@ namespace hp } // namespace hp +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_q.h b/deal.II/deal.II/include/fe/mapping_q.h index a98a841d53..fe0eef6225 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class TensorProductPolynomials; @@ -560,4 +562,6 @@ template<> void MappingQ<3>::add_quad_support_points( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index 415e236fa4..69298495e7 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -23,6 +23,7 @@ #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mapping */ /*@{*/ @@ -743,4 +744,6 @@ template <> void MappingQ1<1>::fill_fe_subface_values ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h index 24e447d4ce..ab701da551 100644 --- a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mapping */ /*@{*/ @@ -168,4 +169,6 @@ class MappingQ1Eulerian : public MappingQ1 /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/fe/q_collection.h b/deal.II/deal.II/include/fe/q_collection.h index 0be7a119b5..7aeb9a0135 100644 --- a/deal.II/deal.II/include/fe/q_collection.h +++ b/deal.II/deal.II/include/fe/q_collection.h @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace hp { @@ -192,4 +193,6 @@ namespace hp } // namespace hp +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/filtered_iterator.h b/deal.II/deal.II/include/grid/filtered_iterator.h index 501b755e03..5c10346a90 100644 --- a/deal.II/deal.II/include/grid/filtered_iterator.h +++ b/deal.II/deal.II/include/grid/filtered_iterator.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + /** * In this namespace a number of classes is declared that may be used * as filters in the FilteredIterator class. The filters either @@ -1069,6 +1072,8 @@ namespace IteratorFilters } +DEAL_II_NAMESPACE_CLOSE + /*------------------------- filtered_iterator.h ------------------------*/ #endif /*------------------------- filtered_iterator.h ------------------------*/ diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h index dc94e1e717..e6697bf843 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Triangulation; template class Vector; @@ -707,4 +708,6 @@ class GridGenerator +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/grid_in.h b/deal.II/deal.II/include/grid/grid_in.h index 333ba455a3..bf60945689 100644 --- a/deal.II/deal.II/include/grid/grid_in.h +++ b/deal.II/deal.II/include/grid/grid_in.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Point; template class Triangulation; template class CellData; @@ -457,4 +459,6 @@ GridIn<3>::debug_output_grid (const std::vector > &cells, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/grid_out.h b/deal.II/deal.II/include/grid/grid_out.h index a4485ffbc9..c4ffd12356 100644 --- a/deal.II/deal.II/include/grid/grid_out.h +++ b/deal.II/deal.II/include/grid/grid_out.h @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + class ParameterHandler; template class Triangulation; template class Mapping; @@ -1310,4 +1312,6 @@ class GridOut +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/grid_refinement.h b/deal.II/deal.II/include/grid/grid_refinement.h index de5f6b280f..fd031eab82 100644 --- a/deal.II/deal.II/include/grid/grid_refinement.h +++ b/deal.II/deal.II/include/grid/grid_refinement.h @@ -19,6 +19,7 @@ #include +DEAL_II_NAMESPACE_OPEN // forward declarations template class Triangulation; @@ -285,5 +286,6 @@ class GridRefinement }; +DEAL_II_NAMESPACE_CLOSE #endif //__deal2__grid_refinement_h diff --git a/deal.II/deal.II/include/grid/grid_reordering.h b/deal.II/deal.II/include/grid/grid_reordering.h index 42fcb5a8e4..79407be889 100644 --- a/deal.II/deal.II/include/grid/grid_reordering.h +++ b/deal.II/deal.II/include/grid/grid_reordering.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,7 @@ #include +DEAL_II_NAMESPACE_OPEN @@ -686,5 +687,6 @@ class GridReordering }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/grid/grid_reordering_internal.h b/deal.II/deal.II/include/grid/grid_reordering_internal.h index 6c69b7b6b0..f1321e1548 100644 --- a/deal.II/deal.II/include/grid/grid_reordering_internal.h +++ b/deal.II/deal.II/include/grid/grid_reordering_internal.h @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal @@ -826,4 +827,6 @@ namespace internal } // namespace internal +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/grid_tools.h b/deal.II/deal.II/include/grid/grid_tools.h index 3ec7300797..44c785fdba 100644 --- a/deal.II/deal.II/include/grid/grid_tools.h +++ b/deal.II/deal.II/include/grid/grid_tools.h @@ -22,6 +22,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** @@ -614,6 +615,7 @@ void GridTools::transform (const Predicate &predicate, } +DEAL_II_NAMESPACE_CLOSE /*---------------------------- grid_tools.h ---------------------------*/ /* end of #ifndef __deal2__grid_tools_H */ diff --git a/deal.II/deal.II/include/grid/intergrid_map.h b/deal.II/deal.II/include/grid/intergrid_map.h index 62c754b9a4..9f3b80a518 100644 --- a/deal.II/deal.II/include/grid/intergrid_map.h +++ b/deal.II/deal.II/include/grid/intergrid_map.h @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * This class provides a map between two grids which are derived from @@ -226,4 +228,6 @@ class InterGridMap }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/magic_numbers.h b/deal.II/deal.II/include/grid/magic_numbers.h index d7daa1b39d..f497e23e41 100644 --- a/deal.II/deal.II/include/grid/magic_numbers.h +++ b/deal.II/deal.II/include/grid/magic_numbers.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,7 @@ #include +DEAL_II_NAMESPACE_OPEN // This is a list of magic numbers used throughout the library. // They are collected in one file to avoid double usage. @@ -36,4 +37,6 @@ const unsigned int mn_persistent_tria_flags_begin= 0xa200; const unsigned int mn_persistent_tria_flags_end = 0xa201; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/persistent_tria.h b/deal.II/deal.II/include/grid/persistent_tria.h index a56fd4bdb3..4bce1e0340 100644 --- a/deal.II/deal.II/include/grid/persistent_tria.h +++ b/deal.II/deal.II/include/grid/persistent_tria.h @@ -19,6 +19,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * This class handles the history of a triangulation and can rebuild it after @@ -299,4 +300,6 @@ class PersistentTriangulation : public Triangulation }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index f10f0335c2..7b0ed29f31 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -24,8 +24,13 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Boundary; template class StraightBoundary; + +template class TriaObjectAccessor; + namespace internal { namespace Triangulation @@ -3283,4 +3288,6 @@ template <> void Triangulation<2>::update_number_cache_hexes (); #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 4b9a4d829c..da1a4559ae 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -18,6 +18,13 @@ #include #include +namespace std +{ + template + struct pair; +} + +DEAL_II_NAMESPACE_OPEN template class Point; @@ -25,6 +32,8 @@ template class Triangulation; template class TriaRawIterator; template class TriaIterator; template class TriaActiveIterator; + + namespace internal { namespace Triangulation @@ -42,12 +51,6 @@ template class TriaObjectAccessor<2, dim>; template class TriaObjectAccessor<3, dim>; -namespace std -{ - template - struct pair; -} - // note: the file tria_accessor.templates.h is included at the end of // this file. this includes a lot of templates. originally, this was // only done in debug mode, but led to cyclic reduction problems and @@ -2949,10 +2952,11 @@ template <> double TriaObjectAccessor<2, 3>::measure () const; template <> double TriaObjectAccessor<3, 3>::measure () const; +#endif // DOXYGEN + +DEAL_II_NAMESPACE_CLOSE // include more templates in debug and optimized mode # include "tria_accessor.templates.h" -#endif // DOXYGEN - #endif diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index efadec64c4..a34928c5eb 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -25,6 +25,7 @@ #include +DEAL_II_NAMESPACE_OPEN /*------------------------ Functions: TriaAccessor ---------------------------*/ @@ -1178,5 +1179,6 @@ CellAccessor::active () const return !this->has_children(); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 7f51c9d91c..94af30b95a 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Triangulation; @@ -397,4 +398,6 @@ get_intermediate_points_on_quad (const Triangulation<3>::quad_iterator &quad, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_boundary_lib.h b/deal.II/deal.II/include/grid/tria_boundary_lib.h index e29b7a79ca..862e63dbcb 100644 --- a/deal.II/deal.II/include/grid/tria_boundary_lib.h +++ b/deal.II/deal.II/include/grid/tria_boundary_lib.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** * Boundary object for the hull of a cylinder. In three dimensions, @@ -558,4 +559,6 @@ get_normals_at_vertices (const Triangulation<1>::face_iterator &, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_faces.h b/deal.II/deal.II/include/grid/tria_faces.h index 2a0c8a56ba..a095481006 100644 --- a/deal.II/deal.II/include/grid/tria_faces.h +++ b/deal.II/deal.II/include/grid/tria_faces.h @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace Triangulation @@ -125,4 +127,7 @@ namespace internal }; } } + +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_hex.h b/deal.II/deal.II/include/grid/tria_hex.h index d96d63913b..d26e6903f9 100644 --- a/deal.II/deal.II/include/grid/tria_hex.h +++ b/deal.II/deal.II/include/grid/tria_hex.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace Triangulation @@ -150,4 +152,6 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 8c315f1693..2c8ab299eb 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -32,6 +32,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + template class Triangulation; // note: in non-debug mode, i.e. with optimizations, the file @@ -1171,6 +1173,8 @@ std::ostream & operator << (std::ostream &out, } +DEAL_II_NAMESPACE_CLOSE + // if in optimized mode: include more templates #ifndef DEBUG @@ -1179,6 +1183,5 @@ std::ostream & operator << (std::ostream &out, /*---------------------------- tria-iterator.h ---------------------------*/ - #endif /*---------------------------- tria-iterator.h ---------------------------*/ diff --git a/deal.II/deal.II/include/grid/tria_iterator.templates.h b/deal.II/deal.II/include/grid/tria_iterator.templates.h index 10a26299e2..449638e15e 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /* Note: This file only contains template definitions and will thus not produce an object file. It is rather thought to be included @@ -405,5 +407,6 @@ TriaActiveIterator TriaActiveIterator::operator -- ( return tmp; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/grid/tria_iterator_base.h b/deal.II/deal.II/include/grid/tria_iterator_base.h index 82f815a14f..0b47e36f83 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_base.h +++ b/deal.II/deal.II/include/grid/tria_iterator_base.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * Namespace in which an enumeration is declared that denotes the @@ -43,4 +44,6 @@ namespace IteratorState +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_iterator_selector.h b/deal.II/deal.II/include/grid/tria_iterator_selector.h index f3a26696b7..47fa4e30aa 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_selector.h +++ b/deal.II/deal.II/include/grid/tria_iterator_selector.h @@ -14,6 +14,8 @@ #define __deal2__tria_iterator_selector_h +DEAL_II_NAMESPACE_OPEN + template class CellAccessor; template class TriaAccessor; template class TriaObjectAccessor; @@ -25,7 +27,6 @@ template class TriaRawIterator; template class TriaIterator; template class TriaActiveIterator; - namespace internal { namespace Triangulation @@ -242,4 +243,6 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__tria_iterator_selector_h diff --git a/deal.II/deal.II/include/grid/tria_levels.h b/deal.II/deal.II/include/grid/tria_levels.h index 97482a6f68..df0154c0cc 100644 --- a/deal.II/deal.II/include/grid/tria_levels.h +++ b/deal.II/deal.II/include/grid/tria_levels.h @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace Triangulation @@ -294,4 +296,6 @@ namespace internal } } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_line.h b/deal.II/deal.II/include/grid/tria_line.h index 0b2bf11bfc..b528ed26c8 100644 --- a/deal.II/deal.II/include/grid/tria_line.h +++ b/deal.II/deal.II/include/grid/tria_line.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -125,4 +126,6 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_objects.h b/deal.II/deal.II/include/grid/tria_objects.h index 5e47374a61..f3065e9412 100644 --- a/deal.II/deal.II/include/grid/tria_objects.h +++ b/deal.II/deal.II/include/grid/tria_objects.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace Triangulation @@ -271,4 +273,6 @@ namespace internal } } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/grid/tria_quad.h b/deal.II/deal.II/include/grid/tria_quad.h index 887abf2a75..9dbf31bd83 100644 --- a/deal.II/deal.II/include/grid/tria_quad.h +++ b/deal.II/deal.II/include/grid/tria_quad.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -136,4 +137,6 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index 89ba51aae3..9bcd3fcfb3 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -23,6 +23,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mg */ /*@{*/ @@ -237,5 +238,6 @@ class MGSmootherBase : public Subscriptor /*@}*/ +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/multigrid/mg_block_smoother.h b/deal.II/deal.II/include/multigrid/mg_block_smoother.h index bb9178ccfc..f3a21e94fb 100644 --- a/deal.II/deal.II/include/multigrid/mg_block_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_block_smoother.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MGDoFHandler; @@ -333,4 +335,6 @@ MGSmootherBlock::smooth( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_coarse.h b/deal.II/deal.II/include/multigrid/mg_coarse.h index 3ea09baf49..bf0c217ec7 100644 --- a/deal.II/deal.II/include/multigrid/mg_coarse.h +++ b/deal.II/deal.II/include/multigrid/mg_coarse.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup mg */ /*@{*/ @@ -311,4 +313,6 @@ MGCoarseGridHouseholder::operator() ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index 5c6427ef11..a7cce9d46e 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MGDoFHandler; template class MGDoFObjectAccessor; @@ -641,5 +643,6 @@ MGDoFCellAccessor<2>::face (const unsigned int i) const; template<> MGDoFCellAccessor<3>::face_iterator MGDoFCellAccessor<3>::face (const unsigned int i) const; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 9ec4d78644..e6430092c8 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*!@addtogroup mg */ /*@{*/ @@ -1292,8 +1293,9 @@ template <> void MGDoFHandler<3>::renumber_dofs (const unsigned int level, const std::vector &new_numbers); +DEAL_II_NAMESPACE_CLOSE -/*---------------------------- mg_dof.h ---------------------------*/ +/*---------------------------- mg_dof.h ---------------------------*/ #endif /*---------------------------- mg_dof.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h index 1b789736a1..319edfa2fd 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h @@ -16,6 +16,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class MGDoFAccessor; template class MGDoFObjectAccessor; template class MGDoFObjectAccessor<0, dim>; @@ -203,5 +205,7 @@ namespace internal } +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- mg_dof_iterator_selector.h ---------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_level_object.h b/deal.II/deal.II/include/multigrid/mg_level_object.h index 18fe2696f8..6cf3501f72 100644 --- a/deal.II/deal.II/include/multigrid/mg_level_object.h +++ b/deal.II/deal.II/include/multigrid/mg_level_object.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,9 +16,11 @@ #include #include - #include +DEAL_II_NAMESPACE_OPEN + + /*!@addtogroup mg */ /*@{*/ @@ -217,5 +219,6 @@ MGLevelObject::memory_consumption () const return result; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/multigrid/mg_matrix.h b/deal.II/deal.II/include/multigrid/mg_matrix.h index 7033be1701..1949783deb 100644 --- a/deal.II/deal.II/include/multigrid/mg_matrix.h +++ b/deal.II/deal.II/include/multigrid/mg_matrix.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup mg */ /*@{*/ @@ -358,4 +360,6 @@ Tvmult_add (const unsigned int level, m[level].block(row, col).Tvmult_add(dst, src); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index 0af2635caa..3f4ee6d31b 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MGDoFHandler; @@ -586,4 +588,6 @@ memory_consumption () const #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_tools.h b/deal.II/deal.II/include/multigrid/mg_tools.h index ca4a0a29aa..fbf7c86ac3 100644 --- a/deal.II/deal.II/include/multigrid/mg_tools.h +++ b/deal.II/deal.II/include/multigrid/mg_tools.h @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class MGLevelObject; template class MGDoFHandler; template class Vector; @@ -343,4 +345,6 @@ class MGTools /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/mg_transfer.h b/deal.II/deal.II/include/multigrid/mg_transfer.h index 3be072a0f3..7efcd83005 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer.h @@ -35,6 +35,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + template class MGDoFHandler; /* @@ -691,5 +694,6 @@ MGTransferSelect::select(const unsigned int component, : mg_component; } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h index 07e5339c2b..92306c1cd2 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h @@ -25,6 +25,7 @@ #include +DEAL_II_NAMESPACE_OPEN /* --------------------- MGTransferPrebuilt -------------- */ @@ -681,5 +682,6 @@ MGTransferBlock::copy_from_mg_add ( } } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h index 6ddb8b2227..2641bcb6c8 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.h +++ b/deal.II/deal.II/include/multigrid/multigrid.h @@ -25,6 +25,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup mg */ /*@{*/ @@ -637,4 +639,6 @@ PreconditionMG::Tvmult_add ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 0db7beffdc..e53e8ccc0e 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -18,14 +18,7 @@ #include "iostream" -using namespace std; - - - - - - - +DEAL_II_NAMESPACE_OPEN template @@ -415,5 +408,6 @@ Multigrid::Tvmult_add(VECTOR&, const VECTOR&) const Assert(false, ExcNotImplemented()); } +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 378083901a..32857b8a0a 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN template class FEValuesBase; @@ -705,7 +706,7 @@ class DataOut_DoFData : public DataOutInterface * Abbreviate the somewhat lengthy * name for the Patch class. */ - typedef ::DataOutBase::Patch Patch; + typedef dealii::DataOutBase::Patch Patch; /** * Pointer to the dof handler object. @@ -1077,4 +1078,6 @@ merge_patches (const DataOut_DoFData &source, } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/data_out_faces.h b/deal.II/deal.II/include/numerics/data_out_faces.h index 4fc41b5358..ca124d9d93 100644 --- a/deal.II/deal.II/include/numerics/data_out_faces.h +++ b/deal.II/deal.II/include/numerics/data_out_faces.h @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** @@ -212,4 +213,6 @@ class DataOutFaces : public DataOut_DoFData #include +DEAL_II_NAMESPACE_OPEN /** @@ -201,4 +202,6 @@ class DataOutRotation : public DataOut_DoFData }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/data_out_stack.h b/deal.II/deal.II/include/numerics/data_out_stack.h index 3bfaa4e8bf..593d07e151 100644 --- a/deal.II/deal.II/include/numerics/data_out_stack.h +++ b/deal.II/deal.II/include/numerics/data_out_stack.h @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class DoFHandler; /** @@ -376,7 +378,7 @@ class DataOutStack : public DataOutInterface * List of patches of all past and * present parameter value data sets. */ - std::vector< ::DataOutBase::Patch > patches; + std::vector< dealii::DataOutBase::Patch > patches; /** * Structure holding data vectors @@ -422,7 +424,7 @@ class DataOutStack : public DataOutInterface * the base class DataOutBase) to * the actual output function. */ - virtual const std::vector< ::DataOutBase::Patch > & get_patches () const; + virtual const std::vector< dealii::DataOutBase::Patch > & get_patches () const; /** @@ -435,4 +437,6 @@ class DataOutStack : public DataOutInterface }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/derivative_approximation.h b/deal.II/deal.II/include/numerics/derivative_approximation.h index 62098de3d6..431afbd25f 100644 --- a/deal.II/deal.II/include/numerics/derivative_approximation.h +++ b/deal.II/deal.II/include/numerics/derivative_approximation.h @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class DoFHandler; namespace hp { @@ -709,4 +711,6 @@ double DerivativeApproximation::SecondDerivative<3>::derivative_norm (const Derivative &d); +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/dof_print_solver_step.h b/deal.II/deal.II/include/numerics/dof_print_solver_step.h index 0e08823211..83f5b4bd3b 100644 --- a/deal.II/deal.II/include/numerics/dof_print_solver_step.h +++ b/deal.II/deal.II/include/numerics/dof_print_solver_step.h @@ -23,6 +23,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** @@ -127,4 +128,6 @@ DoFPrintSolverStep::print_vectors (const unsigned int step, out.write (of); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index df175f1bce..2d17e5f29a 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class DoFHandler; template class Mapping; @@ -875,4 +877,6 @@ class KellyErrorEstimator<1> +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/histogram.h b/deal.II/deal.II/include/numerics/histogram.h index cf2c2cc3c2..c28b285f94 100644 --- a/deal.II/deal.II/include/numerics/histogram.h +++ b/deal.II/deal.II/include/numerics/histogram.h @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * This class provides some facilities to generate 2d and 3d histograms. @@ -261,4 +263,6 @@ class Histogram }; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index 0923ac3eb9..6688d1a102 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -18,8 +18,11 @@ #include #include #include + #include +DEAL_II_NAMESPACE_OPEN + // forward declarations template class Quadrature; @@ -906,4 +909,6 @@ class MatrixTools : public MatrixCreator +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/include/numerics/solution_transfer.h b/deal.II/deal.II/include/numerics/solution_transfer.h index b98dd1372a..951d9b65b9 100644 --- a/deal.II/deal.II/include/numerics/solution_transfer.h +++ b/deal.II/deal.II/include/numerics/solution_transfer.h @@ -25,6 +25,7 @@ #include +DEAL_II_NAMESPACE_OPEN /** * Transfers a discrete FE function (like a solution vector) by interpolation @@ -476,7 +477,9 @@ class SolutionTransfer }; -/*---------------------------- solutiontransfer.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE + +/*---------------------------- solutiontransfer.h ---------------------------*/ #endif /*---------------------------- solutiontransfer.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index cbaa190fe2..8b6bc59bc6 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // forward declarations class TimeStepBase; template class Vector; @@ -1974,8 +1976,8 @@ void TimeDependent::do_loop (InitFunctionObject init_function, }; } +DEAL_II_NAMESPACE_CLOSE /*---------------------------- time-dependent.h ---------------------------*/ - #endif /*---------------------------- time-dependent.h ---------------------------*/ diff --git a/deal.II/deal.II/include/numerics/vectors.h b/deal.II/deal.II/include/numerics/vectors.h index 705241e595..f823aa6f36 100644 --- a/deal.II/deal.II/include/numerics/vectors.h +++ b/deal.II/deal.II/include/numerics/vectors.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Point; template class Function; template class FunctionMap; @@ -1220,5 +1222,6 @@ class VectorTools }; +DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/include/numerics/vectors.templates.h b/deal.II/deal.II/include/numerics/vectors.templates.h index 473f24f7a1..9b9004629d 100644 --- a/deal.II/deal.II/include/numerics/vectors.templates.h +++ b/deal.II/deal.II/include/numerics/vectors.templates.h @@ -41,6 +41,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN //TODO[RH]: Use StaticQ1Mapping where appropriate @@ -308,7 +309,7 @@ namespace internal #if deal_II_dimension == 1 void - interpolate_zero_boundary_values (const ::DoFHandler<1> &dof_handler, + interpolate_zero_boundary_values (const dealii::DoFHandler<1> &dof_handler, std::map &boundary_values) { // we only need to find the @@ -317,7 +318,7 @@ namespace internal // dof indices. that's easy :-) for (unsigned direction=0; direction<2; ++direction) { - ::DoFHandler<1>::cell_iterator + dealii::DoFHandler<1>::cell_iterator cell = dof_handler.begin(0); while (!cell->at_boundary(direction)) cell = cell->neighbor(direction); @@ -331,7 +332,7 @@ namespace internal template void - interpolate_zero_boundary_values (const ::DoFHandler &dof_handler, + interpolate_zero_boundary_values (const dealii::DoFHandler &dof_handler, std::map &boundary_values) { const FiniteElement &fe = dof_handler.get_fe(); @@ -357,7 +358,7 @@ namespace internal // that is actually wholly on // the boundary, not only by // one line or one vertex - typename ::DoFHandler::active_face_iterator + typename dealii::DoFHandler::active_face_iterator face = dof_handler.begin_active_face(), endf = dof_handler.end_face(); std::vector face_dof_indices (fe.dofs_per_face); @@ -1426,13 +1427,13 @@ namespace internal template static void - do_integrate_difference (const ::hp::MappingCollection &mapping, + do_integrate_difference (const dealii::hp::MappingCollection &mapping, const DH &dof, const InVector &fe_function, const Function &exact_solution, OutVector &difference, - const ::hp::QCollection &q, - const ::VectorTools::NormType &norm, + const dealii::hp::QCollection &q, + const dealii::VectorTools::NormType &norm, const Function *weight, const double exponent_1) { @@ -1458,12 +1459,12 @@ namespace internal switch (norm) { - case ::VectorTools::L2_norm: - case ::VectorTools::H1_seminorm: - case ::VectorTools::H1_norm: + case dealii::VectorTools::L2_norm: + case dealii::VectorTools::H1_seminorm: + case dealii::VectorTools::H1_norm: exponent = 2.; break; - case ::VectorTools::L1_norm: + case dealii::VectorTools::L1_norm: exponent = 1.; break; default: @@ -1474,14 +1475,14 @@ namespace internal update_JxW_values); switch (norm) { - case ::VectorTools::H1_seminorm: - case ::VectorTools::W1p_seminorm: - case ::VectorTools::W1infty_seminorm: + case dealii::VectorTools::H1_seminorm: + case dealii::VectorTools::W1p_seminorm: + case dealii::VectorTools::W1infty_seminorm: update_flags |= UpdateFlags (update_gradients); break; - case ::VectorTools::H1_norm: - case ::VectorTools::W1p_norm: - case ::VectorTools::W1infty_norm: + case dealii::VectorTools::H1_norm: + case dealii::VectorTools::W1p_norm: + case dealii::VectorTools::W1infty_norm: update_flags |= UpdateFlags (update_gradients); // no break! default: @@ -1489,8 +1490,8 @@ namespace internal break; } - ::hp::FECollection fe_collection (dof.get_fe()); - ::hp::FEValues x_fe_values(mapping, fe_collection, q, update_flags); + dealii::hp::FECollection fe_collection (dof.get_fe()); + dealii::hp::FEValues x_fe_values(mapping, fe_collection, q, update_flags); const unsigned int max_n_q_points = q.max_n_quadrature_points (); @@ -1526,7 +1527,7 @@ namespace internal // initialize for this cell x_fe_values.reinit (cell); - const ::FEValues &fe_values = x_fe_values.get_present_fe_values (); + const dealii::FEValues &fe_values = x_fe_values.get_present_fe_values (); const unsigned int n_q_points = fe_values.n_quadrature_points; // resize all out scratch @@ -1628,7 +1629,7 @@ namespace internal switch (norm) { - case ::VectorTools::mean: + case dealii::VectorTools::mean: std::fill_n (psi_scalar.begin(), n_q_points, 0.0); // Compute values in // quadrature points @@ -1642,9 +1643,9 @@ namespace internal fe_values.get_JxW_values().begin(), 0.0); break; - case ::VectorTools::Lp_norm: - case ::VectorTools::L1_norm: - case ::VectorTools::W1p_norm: + case dealii::VectorTools::Lp_norm: + case dealii::VectorTools::L1_norm: + case dealii::VectorTools::W1p_norm: std::fill_n (psi_scalar.begin(), n_q_points, 0.0); // Compute values in // quadrature points @@ -1664,8 +1665,8 @@ namespace internal if (!(update_flags & update_gradients)) diff = std::pow(diff, 1./exponent); break; - case ::VectorTools::L2_norm: - case ::VectorTools::H1_norm: + case dealii::VectorTools::L2_norm: + case dealii::VectorTools::H1_norm: std::fill_n (psi_scalar.begin(), n_q_points, 0.0); // Compute values in // quadrature points @@ -1681,11 +1682,11 @@ namespace internal // Compute the root only, // if no derivative // values are added later - if (norm == ::VectorTools::L2_norm) + if (norm == dealii::VectorTools::L2_norm) diff=std::sqrt(diff); break; - case ::VectorTools::Linfty_norm: - case ::VectorTools::W1infty_norm: + case dealii::VectorTools::Linfty_norm: + case dealii::VectorTools::W1infty_norm: std::fill_n (psi_scalar.begin(), n_q_points, 0.0); for (unsigned int k=0; k &dof, template void -VectorTools::integrate_difference (const ::hp::MappingCollection &mapping, - const ::hp::DoFHandler &dof, +VectorTools::integrate_difference (const dealii::hp::MappingCollection &mapping, + const dealii::hp::DoFHandler &dof, const InVector &fe_function, const Function &exact_solution, OutVector &difference, - const ::hp::QCollection &q, + const dealii::hp::QCollection &q, const NormType &norm, const Function *weight, const double exponent) @@ -1836,11 +1837,11 @@ VectorTools::integrate_difference (const ::hp::MappingCollection &mappin template void -VectorTools::integrate_difference (const ::hp::DoFHandler &dof, +VectorTools::integrate_difference (const dealii::hp::DoFHandler &dof, const InVector &fe_function, const Function &exact_solution, OutVector &difference, - const ::hp::QCollection &q, + const dealii::hp::QCollection &q, const NormType &norm, const Function *weight, const double exponent) @@ -2066,4 +2067,6 @@ VectorTools::compute_mean_value (const DoFHandler &dof, return compute_mean_value(mapping, dof, quadrature, v, component); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index a042a436c1..b0f24874c5 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -29,6 +29,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*------------------------- Functions: DoFCellAccessor -----------------------*/ @@ -1071,3 +1073,4 @@ template class TriaRawIterator > >; template class TriaActiveIterator > >; +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 278ec77cf6..5fb4f60407 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -43,6 +43,8 @@ # include #endif +DEAL_II_NAMESPACE_OPEN + bool ConstraintMatrix::check_zero_weight (const std::pair &p) @@ -1474,3 +1476,5 @@ MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix); MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix); MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix); #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_faces.cc b/deal.II/deal.II/source/dofs/dof_faces.cc index cf2031c349..c8468a649c 100644 --- a/deal.II/deal.II/source/dofs/dof_faces.cc +++ b/deal.II/deal.II/source/dofs/dof_faces.cc @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { @@ -55,3 +57,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 05c93a1e3b..5c685424a4 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -27,6 +27,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + //TODO[WB]: do not use a plain pointer for faces, but rather an auto_ptr or some such thing @@ -47,7 +49,7 @@ namespace internal template const unsigned int * dummy () { - return &::DoFHandler::invalid_dof_index; + return &dealii::DoFHandler::invalid_dof_index; } template const unsigned int * dummy (); @@ -2443,3 +2445,5 @@ void DoFHandler::clear_space () /*-------------- Explicit Instantiations -------------------------------*/ template class DoFHandler; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc b/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc index 53a392dd30..1767ec8ba8 100644 --- a/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -31,3 +32,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_levels.cc b/deal.II/deal.II/source/dofs/dof_levels.cc index 9564d00d39..3e273ccd21 100644 --- a/deal.II/deal.II/source/dofs/dof_levels.cc +++ b/deal.II/deal.II/source/dofs/dof_levels.cc @@ -4,6 +4,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { @@ -46,3 +48,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_objects.cc b/deal.II/deal.II/source/dofs/dof_objects.cc index d513077c73..f9f189f9ae 100644 --- a/deal.II/deal.II/source/dofs/dof_objects.cc +++ b/deal.II/deal.II/source/dofs/dof_objects.cc @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace DoFHandler @@ -35,13 +37,13 @@ namespace internal template void DoFObjects:: - set_dof_index (const ::DoFHandler &dof_handler, + set_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const unsigned int global_index) { - Assert (fe_index == ::DoFHandler::default_fe_index, + Assert (fe_index == dealii::DoFHandler::default_fe_index, ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); Assert (local_index(), ExcIndexRange (local_index, 0, dof_handler.get_fe().template n_dofs_per_object())); @@ -61,7 +63,7 @@ namespace internal template unsigned int DoFObjects<1>:: - get_dof_index (const ::DoFHandler &dof_handler, + get_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index) const; @@ -69,7 +71,7 @@ namespace internal template void DoFObjects<1>:: - set_dof_index (const ::DoFHandler &dof_handler, + set_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -82,7 +84,7 @@ namespace internal template unsigned int DoFObjects<2>:: - get_dof_index (const ::DoFHandler &dof_handler, + get_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index) const; @@ -90,7 +92,7 @@ namespace internal template void DoFObjects<2>:: - set_dof_index (const ::DoFHandler &dof_handler, + set_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -105,7 +107,7 @@ namespace internal template unsigned int DoFObjects<3>:: - get_dof_index (const ::DoFHandler &dof_handler, + get_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index) const; @@ -113,7 +115,7 @@ namespace internal template void DoFObjects<3>:: - set_dof_index (const ::DoFHandler &dof_handler, + set_dof_index (const dealii::DoFHandler &dof_handler, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, @@ -123,3 +125,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index f20f06061d..3a514b3552 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -51,6 +51,8 @@ extern "C" long int lrand48 (void); #endif +DEAL_II_NAMESPACE_OPEN + // The following two classes are defined to be used in the compute_* @@ -1467,3 +1469,4 @@ void DoFRenumbering::cell_wise_dg const unsigned int, const std::vector::cell_iterator>&); +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 311a4db48f..5d447075bd 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -37,6 +37,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + //#define WOLFGANG @@ -1768,13 +1770,13 @@ namespace internal }; - template struct DoFHandlerSupportsDifferentP< ::DoFHandler > + template struct DoFHandlerSupportsDifferentP< dealii::DoFHandler > { static const bool value = false; }; - template struct DoFHandlerSupportsDifferentP< ::MGDoFHandler > + template struct DoFHandlerSupportsDifferentP< dealii::MGDoFHandler > { static const bool value = false; }; @@ -1791,7 +1793,7 @@ namespace internal */ template unsigned int - n_finite_elements (const ::hp::DoFHandler &dof_handler) + n_finite_elements (const dealii::hp::DoFHandler &dof_handler) { return dof_handler.get_fe().size(); } @@ -1949,7 +1951,7 @@ namespace internal #if deal_II_dimension == 1 static void - make_hp_hanging_node_constraints (const ::DoFHandler<1> &, + make_hp_hanging_node_constraints (const dealii::DoFHandler<1> &, ConstraintMatrix &) { // nothing to do for regular @@ -1960,9 +1962,9 @@ namespace internal static void - make_oldstyle_hanging_node_constraints (const ::DoFHandler<1> &, + make_oldstyle_hanging_node_constraints (const dealii::DoFHandler<1> &, ConstraintMatrix &, - ::internal::int2type<1>) + dealii::internal::int2type<1>) { // nothing to do for regular // dof handlers in 1d @@ -1971,7 +1973,7 @@ namespace internal static void - make_hp_hanging_node_constraints (const ::MGDoFHandler<1> &, + make_hp_hanging_node_constraints (const dealii::MGDoFHandler<1> &, ConstraintMatrix &) { // nothing to do for regular @@ -1982,9 +1984,9 @@ namespace internal static void - make_oldstyle_hanging_node_constraints (const ::MGDoFHandler<1> &, + make_oldstyle_hanging_node_constraints (const dealii::MGDoFHandler<1> &, ConstraintMatrix &, - ::internal::int2type<1>) + dealii::internal::int2type<1>) { // nothing to do for regular // dof handlers in 1d @@ -1993,7 +1995,7 @@ namespace internal static void - make_hp_hanging_node_constraints (const ::hp::DoFHandler<1> &/*dof_handler*/, + make_hp_hanging_node_constraints (const dealii::hp::DoFHandler<1> &/*dof_handler*/, ConstraintMatrix &/*constraints*/) { // we may have to compute @@ -2007,9 +2009,9 @@ namespace internal static void - make_oldstyle_hanging_node_constraints (const ::hp::DoFHandler<1> &/*dof_handler*/, + make_oldstyle_hanging_node_constraints (const dealii::hp::DoFHandler<1> &/*dof_handler*/, ConstraintMatrix &/*constraints*/, - ::internal::int2type<1>) + dealii::internal::int2type<1>) { // we may have to compute // constraints for @@ -2027,7 +2029,7 @@ namespace internal void make_oldstyle_hanging_node_constraints (const DH &dof_handler, ConstraintMatrix &constraints, - ::internal::int2type<2>) + dealii::internal::int2type<2>) { const unsigned int dim = 2; @@ -2173,7 +2175,7 @@ namespace internal void make_oldstyle_hanging_node_constraints (const DH &dof_handler, ConstraintMatrix &constraints, - ::internal::int2type<3>) + dealii::internal::int2type<3>) { const unsigned int dim = 3; @@ -3036,7 +3038,7 @@ DoFTools::make_hanging_node_constraints (const DH &dof_handler, internal::DoFTools:: make_oldstyle_hanging_node_constraints (dof_handler, constraints, - ::internal::int2type()); + dealii::internal::int2type()); } @@ -5548,3 +5550,5 @@ DoFTools::convert_couplings_to_blocks ( const hp::DoFHandler&, const Table<2, Coupling>&, std::vector >&); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/hp_dof_faces.cc b/deal.II/deal.II/source/dofs/hp_dof_faces.cc index d4aaf05d11..d21b41e7fb 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_faces.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_faces.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -54,3 +55,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/hp_dof_handler.cc b/deal.II/deal.II/source/dofs/hp_dof_handler.cc index 06d7393c8b..418b2fb6a2 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_handler.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_handler.cc @@ -29,6 +29,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -4391,3 +4392,5 @@ namespace hp /*-------------- Explicit Instantiations -------------------------------*/ template class DoFHandler; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc b/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc index 0033a41da5..b380a423cf 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -29,3 +30,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.cc b/deal.II/deal.II/source/dofs/hp_dof_levels.cc index 99e204e78c..93bb07d2d9 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_levels.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -58,3 +59,5 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/dofs/hp_dof_objects.cc b/deal.II/deal.II/source/dofs/hp_dof_objects.cc index f4fe776aaf..3fbbe635eb 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_objects.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_objects.cc @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN //TODO: Several of the functions in this file are identical. some template trickery should make it possible to merge them @@ -59,3 +60,5 @@ namespace internal #endif } } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 51a512399a..199a8b9ab3 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -27,6 +27,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*------------------------------- FiniteElement ----------------------*/ @@ -965,3 +966,5 @@ FiniteElement::base_element(const unsigned index) const /*------------------------------- Explicit Instantiations -------------*/ template class FiniteElement; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_abf.cc b/deal.II/deal.II/source/fe/fe_abf.cc index ea3a692917..b3df34b66d 100644 --- a/deal.II/deal.II/source/fe/fe_abf.cc +++ b/deal.II/deal.II/source/fe/fe_abf.cc @@ -31,7 +31,8 @@ #endif #include -using namespace std; + +DEAL_II_NAMESPACE_OPEN template @@ -766,3 +767,5 @@ FE_ABF::memory_consumption () const template class FE_ABF; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_collection.cc b/deal.II/deal.II/source/fe/fe_collection.cc index ef885c58d3..e0c758090f 100644 --- a/deal.II/deal.II/source/fe/fe_collection.cc +++ b/deal.II/deal.II/source/fe/fe_collection.cc @@ -14,6 +14,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace hp { @@ -89,3 +90,5 @@ namespace hp template class FECollection; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_data.cc b/deal.II/deal.II/source/fe/fe_data.cc index 00c9cba3b5..7f6c9e04da 100644 --- a/deal.II/deal.II/source/fe/fe_data.cc +++ b/deal.II/deal.II/source/fe/fe_data.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template FiniteElementData::FiniteElementData () @@ -141,3 +142,5 @@ face_to_cell_index (const unsigned int face_index, template class FiniteElementData<1>; template class FiniteElementData<2>; template class FiniteElementData<3>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc index 9f21d1801b..ffd381a2a4 100644 --- a/deal.II/deal.II/source/fe/fe_dgp.cc +++ b/deal.II/deal.II/source/fe/fe_dgp.cc @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN template FE_DGP::FE_DGP (const unsigned int degree) @@ -252,3 +253,5 @@ FE_DGP::memory_consumption () const template class FE_DGP; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc index fb42e547cb..3321f574df 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc @@ -16,6 +16,7 @@ #include +DEAL_II_NAMESPACE_OPEN // namespace for some functions that are used in this file. namespace @@ -462,3 +463,5 @@ FE_DGPMonomial::memory_consumption () const template class FE_DGPMonomial; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc index 402e9ca2a7..618aea00fd 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc @@ -22,6 +22,7 @@ #include +DEAL_II_NAMESPACE_OPEN template FE_DGPNonparametric::FE_DGPNonparametric (const unsigned int degree) @@ -591,3 +592,5 @@ FE_DGPNonparametric::get_degree () const template class FE_DGPNonparametric; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index ac8a77a31c..06a96b2e84 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN // namespace for some functions that are used in this file. they are @@ -59,7 +60,7 @@ namespace inline Point<1> generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<1> ) + const dealii::internal::int2type<1> ) { Assert (i generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<2> ) + const dealii::internal::int2type<2> ) { Assert (i generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<3> ) + const dealii::internal::int2type<3> ) { Assert (i &x_source_fe, // cell and evaluate the // shape functions there const Point p = generate_unit_point (j, this->dofs_per_cell, - ::internal::int2type()); + dealii::internal::int2type()); for (unsigned int i=0; idofs_per_cell; ++i) cell_interpolation(j,i) = this->poly_space.compute_value (i, p); @@ -650,3 +651,5 @@ FE_DGQ::memory_consumption () const template class FE_DGQ; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index 82121c041b..a571b499fd 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN //TODO: Remove doubled degrees @@ -1488,5 +1489,7 @@ FE_Nedelec::get_degree () const } - template class FE_Nedelec; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/fe/fe_nedelec_1d.cc b/deal.II/deal.II/source/fe/fe_nedelec_1d.cc index 831395c5d7..d03f549421 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_1d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_1d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,6 +21,7 @@ #include +DEAL_II_NAMESPACE_OPEN template <> const double * const @@ -44,6 +45,7 @@ template <> const double * const FE_Nedelec<1>::Matrices::constraint_matrices[] = {0}; +DEAL_II_NAMESPACE_CLOSE #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty diff --git a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc index 9eecf7abe5..2dbf6c59b7 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // Transfer matrices for finite elements: have one matrix for each of // the four child cells which tells us how the degrees of freedom on // the child cell are obtained from the degrees of freedom on the @@ -129,6 +131,7 @@ FE_Nedelec<2>::Matrices::n_constraint_matrices sizeof(FE_Nedelec<2>::Matrices::constraint_matrices[0]); +DEAL_II_NAMESPACE_CLOSE #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty diff --git a/deal.II/deal.II/source/fe/fe_nedelec_3d.cc b/deal.II/deal.II/source/fe/fe_nedelec_3d.cc index ee8d0f9f57..ba4326da90 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_3d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_3d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + // Transfer matrices for finite elements: have one matrix for each of // the four child cells which tells us how the degrees of freedom on // the child cell are obtained from the degrees of freedom on the @@ -231,6 +234,7 @@ FE_Nedelec<3>::Matrices::n_constraint_matrices sizeof(FE_Nedelec<3>::Matrices::constraint_matrices[0]); +DEAL_II_NAMESPACE_CLOSE #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty diff --git a/deal.II/deal.II/source/fe/fe_poly.cc b/deal.II/deal.II/source/fe/fe_poly.cc index 266c40c2bf..ee3e6496b2 100644 --- a/deal.II/deal.II/source/fe/fe_poly.cc +++ b/deal.II/deal.II/source/fe/fe_poly.cc @@ -19,6 +19,10 @@ #include +DEAL_II_NAMESPACE_OPEN + template class FE_Poly, deal_II_dimension>; template class FE_Poly, deal_II_dimension>; template class FE_Poly, deal_II_dimension>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_poly_tensor.cc b/deal.II/deal.II/source/fe/fe_poly_tensor.cc index a0eadc134e..6524780e86 100644 --- a/deal.II/deal.II/source/fe/fe_poly_tensor.cc +++ b/deal.II/deal.II/source/fe/fe_poly_tensor.cc @@ -21,6 +21,7 @@ #include +DEAL_II_NAMESPACE_OPEN namespace { @@ -932,3 +933,5 @@ FE_PolyTensor::update_each (const UpdateFlags flags) const template class FE_PolyTensor,deal_II_dimension>; template class FE_PolyTensor,deal_II_dimension>; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 1c565d2d1a..ceb3474d86 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -21,6 +21,7 @@ #include +DEAL_II_NAMESPACE_OPEN //TODO: we should have a copy constructor for this class. In hp methods, we often do things like // fe_collection.push_back(FE_Q(7)) @@ -119,7 +120,7 @@ namespace FE_Q_Helper Point<1> generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<1> ) + const dealii::internal::int2type<1> ) { Assert (i generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<2> ) + const dealii::internal::int2type<2> ) { Assert (i=4, ExcInternalError()); @@ -161,7 +162,7 @@ namespace FE_Q_Helper Point<3> generate_unit_point (const unsigned int i, const unsigned int N, - const ::internal::int2type<3> ) + const dealii::internal::int2type<3> ) { Assert (i=8, ExcInternalError()); @@ -288,7 +289,7 @@ get_interpolation_matrix (const FiniteElement &x_source_fe, // shape functions there const Point p = FE_Q_Helper::generate_unit_point (index_map[j], this->dofs_per_cell, - ::internal::int2type()); + dealii::internal::int2type()); for (unsigned int i=0; idofs_per_cell; ++i) cell_interpolation(j,i) = this->poly_space.compute_value (i, p); @@ -1214,7 +1215,7 @@ FE_Q::initialize_embedding () // functions there const Point p_subcell = FE_Q_Helper::generate_unit_point (index_map[j], this->dofs_per_cell, - ::internal::int2type()); + dealii::internal::int2type()); const Point p_cell = GeometryInfo::child_to_cell_coordinates (p_subcell, child); @@ -1379,7 +1380,7 @@ FE_Q::initialize_restriction () { const Point p_cell = FE_Q_Helper::generate_unit_point (i, this->dofs_per_cell, - ::internal::int2type()); + dealii::internal::int2type()); unsigned int mother_dof = 0; for (; mother_dofdofs_per_cell; ++mother_dof) { @@ -1605,3 +1606,5 @@ FE_Q::memory_consumption () const template class FE_Q; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc index 86d0830b1f..1732be6497 100644 --- a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc +++ b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace { @@ -991,3 +992,5 @@ FE_Q_Hierarchical::memory_consumption () const template class FE_Q_Hierarchical; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc index 7f0d221eac..da36be37bb 100644 --- a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc +++ b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc @@ -27,6 +27,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template FE_RaviartThomas::FE_RaviartThomas (const unsigned int deg) @@ -635,3 +636,5 @@ FE_RaviartThomas::memory_consumption () const template class FE_RaviartThomas; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc b/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc index c27861e074..2edc2b892a 100644 --- a/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc +++ b/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc @@ -25,6 +25,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + template FE_RaviartThomasNodal::FE_RaviartThomasNodal (const unsigned int deg) : @@ -353,3 +356,5 @@ FE_RaviartThomasNodal::initialize_support_points (const unsigned int deg) template class FE_RaviartThomasNodal; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 0f17d4981e..74db54ecd3 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -23,6 +23,7 @@ #include +DEAL_II_NAMESPACE_OPEN /* ----------------------- FESystem::InternalData ------------------- */ @@ -2948,3 +2949,5 @@ FESystem::memory_consumption () const // explicit instantiations template class FESystem; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_tools.all_dimensions.cc b/deal.II/deal.II/source/fe/fe_tools.all_dimensions.cc index c46d112199..2e3e461132 100644 --- a/deal.II/deal.II/source/fe/fe_tools.all_dimensions.cc +++ b/deal.II/deal.II/source/fe/fe_tools.all_dimensions.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -241,3 +242,5 @@ void FETools::lexicographic_to_hierarchic_numbering<3> (const FiniteElementData<3> &fe, std::vector &l2h); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index d423671632..1983c61874 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -44,6 +44,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + // This is the map used by FETools::get_fe_from_name and // FETools::add_fe_name. Since FEFactoryBase has a template parameter // dim, it could not be a member variable of FETools. On the other @@ -55,6 +58,7 @@ static std::map @@ -2051,3 +2055,5 @@ compute_interpolation_to_quadrature_points_matrix (const FiniteElement +DEAL_II_NAMESPACE_OPEN /* ---------------- FEValuesBase::CellIteratorBase --------- */ @@ -1807,6 +1808,7 @@ template class FEFaceValues; template class FESubfaceValues; #endif +DEAL_II_NAMESPACE_CLOSE //--------------------------------------------------------------------------- @@ -1838,3 +1840,4 @@ template class FESubfaceValues; #include "fe_values.instance.h" #undef IN #endif + diff --git a/deal.II/deal.II/source/fe/fe_values.instance.h b/deal.II/deal.II/source/fe/fe_values.instance.h index f02bebe622..1cc5a87cf6 100644 --- a/deal.II/deal.II/source/fe/fe_values.instance.h +++ b/deal.II/deal.II/source/fe/fe_values.instance.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,7 @@ // Definition of vector type macros is in fe_values.cc +DEAL_II_NAMESPACE_OPEN template void FEValuesBase::get_function_values @@ -77,3 +78,5 @@ void FEValuesBase::get_function_2nd_derivatives template void FEValuesBase::get_function_2nd_derivatives (const IN&, std::vector > > &, bool) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/hp_fe_values.cc b/deal.II/deal.II/source/fe/hp_fe_values.cc index 08a8d6bc0e..c80396fd44 100644 --- a/deal.II/deal.II/source/fe/hp_fe_values.cc +++ b/deal.II/deal.II/source/fe/hp_fe_values.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace internal { @@ -25,9 +26,9 @@ namespace internal template FEValuesBase:: - FEValuesBase (const ::hp::MappingCollection &mapping_collection, - const ::hp::FECollection &fe_collection, - const ::hp::QCollection &q_collection, + FEValuesBase (const dealii::hp::MappingCollection &mapping_collection, + const dealii::hp::FECollection &fe_collection, + const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags) : fe_collection (&fe_collection), @@ -45,12 +46,12 @@ namespace internal template FEValuesBase:: - FEValuesBase (const ::hp::FECollection &fe_collection, - const ::hp::QCollection &q_collection, + FEValuesBase (const dealii::hp::FECollection &fe_collection, + const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags) : fe_collection (&fe_collection), - mapping_collection (&::hp::StaticMappingQ1::mapping_collection), + mapping_collection (&dealii::hp::StaticMappingQ1::mapping_collection), q_collection (q_collection), fe_values_table (fe_collection.size(), 1, @@ -117,7 +118,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (mapping, + internal::hp::FEValuesBase > (mapping, fe_collection, q_collection, update_flags) @@ -129,7 +130,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (fe_collection, + internal::hp::FEValuesBase > (fe_collection, q_collection, update_flags) {} @@ -183,7 +184,7 @@ namespace hp template void - FEValues::reinit (const typename ::DoFHandler::cell_iterator &cell, + FEValues::reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int q_index, const unsigned int mapping_index, const unsigned int fe_index) @@ -309,7 +310,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (mapping, + internal::hp::FEValuesBase > (mapping, fe_collection, q_collection, update_flags) @@ -321,7 +322,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (fe_collection, + internal::hp::FEValuesBase > (fe_collection, q_collection, update_flags) {} @@ -376,7 +377,7 @@ namespace hp template void - FEFaceValues::reinit (const typename ::DoFHandler::cell_iterator &cell, + FEFaceValues::reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int q_index, const unsigned int mapping_index, @@ -505,7 +506,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (mapping, + internal::hp::FEValuesBase > (mapping, fe_collection, q_collection, update_flags) @@ -517,7 +518,7 @@ namespace hp const hp::QCollection &q_collection, const UpdateFlags update_flags) : - internal::hp::FEValuesBase > (fe_collection, + internal::hp::FEValuesBase > (fe_collection, q_collection, update_flags) {} @@ -573,7 +574,7 @@ namespace hp template void - FESubfaceValues::reinit (const typename ::DoFHandler::cell_iterator &cell, + FESubfaceValues::reinit (const typename dealii::DoFHandler::cell_iterator &cell, const unsigned int face_no, const unsigned int subface_no, const unsigned int q_index, @@ -703,12 +704,12 @@ namespace internal namespace hp { template class FEValuesBase >; + dealii::FEValues >; #if deal_II_dimension >= 2 template class FEValuesBase >; + dealii::FEFaceValues >; template class FEValuesBase >; + dealii::FESubfaceValues >; #endif } } @@ -721,3 +722,5 @@ namespace hp template class FESubfaceValues; #endif } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping.cc b/deal.II/deal.II/source/fe/mapping.cc index 9a8b8d4d11..aa7a4d8310 100644 --- a/deal.II/deal.II/source/fe/mapping.cc +++ b/deal.II/deal.II/source/fe/mapping.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template Mapping::~Mapping () @@ -52,3 +54,5 @@ Mapping::InternalDataBase::memory_consumption () const template class Mapping; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_c1.cc b/deal.II/deal.II/source/fe/mapping_c1.cc index d989af09ab..01397f323b 100644 --- a/deal.II/deal.II/source/fe/mapping_c1.cc +++ b/deal.II/deal.II/source/fe/mapping_c1.cc @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN @@ -253,3 +254,5 @@ MappingC1::clone () const // explicit instantiations template class MappingC1; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index 58a0d82229..0e8094359b 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -26,6 +26,7 @@ #include +DEAL_II_NAMESPACE_OPEN template @@ -623,3 +624,5 @@ MappingCartesian::clone () const // explicit instantiations template class MappingCartesian; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_collection.cc b/deal.II/deal.II/source/fe/mapping_collection.cc index 8f0a99dc27..377fa779e7 100644 --- a/deal.II/deal.II/source/fe/mapping_collection.cc +++ b/deal.II/deal.II/source/fe/mapping_collection.cc @@ -14,6 +14,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace hp { @@ -92,3 +94,5 @@ namespace hp template struct StaticMappingQ1; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 794c127720..42af4fedd7 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -27,6 +27,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template const bool MappingQ::use_mapping_q_on_all_cells; @@ -1359,3 +1361,5 @@ MappingQ::clone () const // explicit instantiation template class MappingQ; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index 83f6a877c1..e715a28f3a 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -26,6 +26,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN @@ -1091,3 +1092,4 @@ template struct StaticMappingQ1; +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc index 1fac0108ec..033a000930 100644 --- a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc +++ b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -118,3 +119,5 @@ template class MappingQ1Eulerian >; #ifdef DEAL_II_USE_PETSC template class MappingQ1Eulerian; #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/fe/q_collection.cc b/deal.II/deal.II/source/fe/q_collection.cc index a8066cc9e5..c39e9bb424 100644 --- a/deal.II/deal.II/source/fe/q_collection.cc +++ b/deal.II/deal.II/source/fe/q_collection.cc @@ -14,6 +14,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN namespace hp @@ -80,3 +81,4 @@ namespace hp } +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index 42dbef8297..9f34e64200 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -34,6 +34,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + template void @@ -1782,3 +1785,5 @@ template void GridGenerator:: laplace_transformation (Triangulation &, const std::map > &); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index ee28d683c7..d7d7edc346 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -26,6 +26,8 @@ #include #endif +DEAL_II_NAMESPACE_OPEN + template GridIn::GridIn () : @@ -1566,3 +1568,5 @@ std::string GridIn::get_format_names () //explicit instantiations template class GridIn; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc index 4b17b0cfc0..b79d3b930b 100644 --- a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc @@ -15,6 +15,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + namespace GridOutFlags { DX::DX (const bool write_cells, @@ -526,3 +529,5 @@ GridOut::memory_consumption () const sizeof(eps_flags_3) + sizeof(xfig_flags)); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 159c568117..e680ac11a9 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -28,6 +28,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #if deal_II_dimension == 1 @@ -1728,3 +1730,5 @@ template void GridOut::write template void GridOut::write (const Triangulation &, std::ostream &, const Mapping *) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index 8bde6b6362..d624f626e9 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace @@ -195,7 +197,7 @@ GridRefinement::refine_and_coarsen_fixed_number (Triangulation &tria, if (refine_cells || coarsen_cells) { - ::Vector tmp(criteria); + dealii::Vector tmp(criteria); if (refine_cells) { std::nth_element (tmp.begin(), tmp.begin()+refine_cells, @@ -234,7 +236,7 @@ GridRefinement::refine_and_coarsen_fixed_fraction (Triangulation &tria, // error, which is what we have to sum // up and compare with // @p{fraction_of_error*total_error}. - ::Vector tmp(criteria); + dealii::Vector tmp(criteria); const double total_error = tmp.l1_norm(); // sort the largest criteria to the @@ -242,13 +244,13 @@ GridRefinement::refine_and_coarsen_fixed_fraction (Triangulation &tria, std::sort (tmp.begin(), tmp.end(), std::greater()); // compute thresholds - typename ::Vector::const_iterator pp=tmp.begin(); + typename dealii::Vector::const_iterator pp=tmp.begin(); for (double sum=0; (sum::const_iterator qq=(tmp.end()-1); + typename dealii::Vector::const_iterator qq=(tmp.end()-1); for (double sum=0; (sum &, const PETScWrappers::Vector &); #endif + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index 0fcb4d0a9f..e1167574b7 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #if deal_II_dimension == 1 @@ -1496,3 +1498,5 @@ GridReordering<3>::invert_all_cells_of_negative_grid( #endif // deal_II_dimension == 3 +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index 2e65959efb..221dd51bc8 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -29,6 +29,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // This anonymous namespace contains utility functions to extract the // triangulation from any container such as DoFHandler, MGDoFHandler, @@ -1080,3 +1082,6 @@ GridTools::minimal_cell_diameter (const Triangulation &triang template double GridTools::maximal_cell_diameter (const Triangulation &triangulation); + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/intergrid_map.cc b/deal.II/deal.II/source/grid/intergrid_map.cc index 409e6a5563..0a77d6db36 100644 --- a/deal.II/deal.II/source/grid/intergrid_map.cc +++ b/deal.II/deal.II/source/grid/intergrid_map.cc @@ -25,6 +25,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + // helper function to aquire the number of levels within a grid template unsigned int @@ -228,3 +231,6 @@ template class InterGridMap >; template class InterGridMap >; template class InterGridMap >; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/persistent_tria.cc b/deal.II/deal.II/source/grid/persistent_tria.cc index cd3bd6ac69..38ddf1d56d 100644 --- a/deal.II/deal.II/source/grid/persistent_tria.cc +++ b/deal.II/deal.II/source/grid/persistent_tria.cc @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template const unsigned int @@ -236,3 +238,6 @@ PersistentTriangulation::memory_consumption () const // explicit instantiations template class PersistentTriangulation; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria.all_dimensions.cc b/deal.II/deal.II/source/grid/tria.all_dimensions.cc index 5abb299596..00cb017d0b 100644 --- a/deal.II/deal.II/source/grid/tria.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/tria.all_dimensions.cc @@ -30,6 +30,8 @@ #include +DEAL_II_NAMESPACE_OPEN + bool @@ -112,3 +114,6 @@ namespace internal } } } + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index e0b0d2c302..851ed5a2c7 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -29,6 +29,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // initialize the @p{straight_boundary} pointer of the triangulation // class. for the reasons why it is done like this, see the @@ -9250,3 +9252,6 @@ Triangulation::remove_refinement_listener (RefinementListener &listener) co // explicit instantiations template class Triangulation; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index 7c447b8560..812bfca840 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -24,6 +24,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template const unsigned int TriaAccessor::objectdim; @@ -2269,3 +2271,6 @@ template class TriaRawIterator >; template class TriaActiveIterator >; #endif + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index 78e5b89276..a4ce3d3890 100644 --- a/deal.II/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/deal.II/source/grid/tria_boundary.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /* -------------------------- Boundary --------------------- */ @@ -320,3 +322,6 @@ get_normals_at_vertices (const Triangulation<3>::face_iterator &face, // explicit instantiations template class Boundary; template class StraightBoundary; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc index f65247d4e7..fc58f0772a 100644 --- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc +++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template CylinderBoundary::CylinderBoundary (const double radius, @@ -812,3 +814,6 @@ template class CylinderBoundary; template class HalfHyperBallBoundary; template class HyperShellBoundary; template class HalfHyperShellBoundary; + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_faces.cc b/deal.II/deal.II/source/grid/tria_faces.cc index c9292bd062..f86469b224 100644 --- a/deal.II/deal.II/source/grid/tria_faces.cc +++ b/deal.II/deal.II/source/grid/tria_faces.cc @@ -14,6 +14,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { @@ -53,3 +55,6 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_levels.all_dimensions.cc b/deal.II/deal.II/source/grid/tria_levels.all_dimensions.cc index 9c0573d60b..45e6f2bf80 100644 --- a/deal.II/deal.II/source/grid/tria_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/tria_levels.all_dimensions.cc @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { namespace Triangulation @@ -101,3 +103,6 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_levels.cc b/deal.II/deal.II/source/grid/tria_levels.cc index 02943daa0d..81de320c5d 100644 --- a/deal.II/deal.II/source/grid/tria_levels.cc +++ b/deal.II/deal.II/source/grid/tria_levels.cc @@ -15,6 +15,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + namespace internal { namespace Triangulation @@ -55,3 +58,6 @@ namespace internal } } + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/grid/tria_objects.cc b/deal.II/deal.II/source/grid/tria_objects.cc index 29335a90d7..bed78dfc3a 100644 --- a/deal.II/deal.II/source/grid/tria_objects.cc +++ b/deal.II/deal.II/source/grid/tria_objects.cc @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace internal { @@ -334,3 +336,6 @@ namespace internal template class TriaObjects; } } + +DEAL_II_NAMESPACE_CLOSE + diff --git a/deal.II/deal.II/source/multigrid/mg_base.cc b/deal.II/deal.II/source/multigrid/mg_base.cc index 4823583dcf..8b011beb66 100644 --- a/deal.II/deal.II/source/multigrid/mg_base.cc +++ b/deal.II/deal.II/source/multigrid/mg_base.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template MGTransferBase::~MGTransferBase() @@ -58,3 +60,5 @@ template class MGCoarseGridBase >; template class MGCoarseGridBase >; template class MGCoarseGridBase >; template class MGCoarseGridBase >; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index 6500466da9..d281a0daec 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -24,6 +24,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + //TODO:[GK] Inline simple functions in 1d and 3d /* ------------------------ MGDoFAccessor --------------------------- */ @@ -743,3 +746,5 @@ template class TriaRawIterator <3,MGDoFCellAccessor<3> >; template class TriaIterator <3,MGDoFCellAccessor<3> >; template class TriaActiveIterator<3,MGDoFCellAccessor<3> >; #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc index d4c699166c..1b30ab5afe 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc @@ -26,9 +26,11 @@ #include #include - #include +DEAL_II_NAMESPACE_OPEN + + /* ------------------------ MGVertexDoFs ----------------------------------- */ @@ -2382,3 +2384,5 @@ void MGDoFHandler::clear_space () // explicit instantiations template class MGDoFHandler; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc index 40a5410af3..8e9faf5764 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc @@ -34,6 +34,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #if deal_II_dimension == 1 @@ -1341,6 +1343,7 @@ MGTools::reinit_vector (const MGDoFHandler &mg_dof, } +DEAL_II_NAMESPACE_CLOSE @@ -1365,6 +1368,8 @@ MGTools::reinit_vector (const MGDoFHandler &mg_dof, #undef PATTERN +DEAL_II_NAMESPACE_OPEN + template void MGTools::compute_row_length_vector( const MGDoFHandler&, unsigned int, @@ -1422,3 +1427,5 @@ template void MGTools::make_boundary_list( const FunctionMap::type&, std::vector >&, const std::vector&); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_smoother.cc b/deal.II/deal.II/source/multigrid/mg_smoother.cc index e916067704..94bc6f4acf 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -27,6 +27,8 @@ #include +DEAL_II_NAMESPACE_OPEN + ////////////////////////////////////////////////////////////////////// @@ -134,3 +136,4 @@ template MGSmootherContinuous >::MGSmootherContinuous ( const unsigned int); #endif +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_tools.all_dimensions.cc b/deal.II/deal.II/source/multigrid/mg_tools.all_dimensions.cc index d73e79f7f2..00aca6f0f6 100644 --- a/deal.II/deal.II/source/multigrid/mg_tools.all_dimensions.cc +++ b/deal.II/deal.II/source/multigrid/mg_tools.all_dimensions.cc @@ -24,6 +24,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template void @@ -439,3 +441,5 @@ template void MGTools::apply_boundary_values ( template void MGTools::apply_boundary_values ( const std::set&, BlockSparseMatrix&, const bool); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_tools.pattern.in.h b/deal.II/deal.II/source/multigrid/mg_tools.pattern.in.h index c3e08fe9ae..397d6c622b 100644 --- a/deal.II/deal.II/source/multigrid/mg_tools.pattern.in.h +++ b/deal.II/deal.II/source/multigrid/mg_tools.pattern.in.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,9 @@ // Call this file after defining PATTERN to the desired sparsity // pattern type. +DEAL_II_NAMESPACE_OPEN + + template void MGTools::make_sparsity_pattern ( @@ -54,3 +57,5 @@ MGTools::make_flux_sparsity_pattern_edge ( #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc index bf6101ae42..c3a782ca01 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc @@ -29,6 +29,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template @@ -529,3 +531,5 @@ MGTransferSelect::copy_from_mg_add ( const MGDoFHandler&, BlockVector&, const MGLevelObject >&) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc index 94fc01bbca..291d568301 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc @@ -26,6 +26,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + template template @@ -292,3 +295,5 @@ MGTransferPrebuilt >::copy_from_mg_add ( const MGDoFHandler&, BlockVector&, const MGLevelObject >&) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/multigrid.all_dimensions.cc b/deal.II/deal.II/source/multigrid/multigrid.all_dimensions.cc index 1772228711..7e0cbfbc3c 100644 --- a/deal.II/deal.II/source/multigrid/multigrid.all_dimensions.cc +++ b/deal.II/deal.II/source/multigrid/multigrid.all_dimensions.cc @@ -21,6 +21,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + // Warning: the following function is for debugging purposes only. It // will be compiled only, if the additional and undocumented compiler // flag MG_DEBUG is set. Furthermore, as soon as this function is @@ -301,3 +304,5 @@ void MGSmootherContinuous >::set_zero_interior_boundary ( template void MGSmootherContinuous >::set_zero_interior_boundary ( const unsigned int, BlockVector&) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 657904c237..a38984342d 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -32,6 +32,7 @@ #include +DEAL_II_NAMESPACE_OPEN template @@ -349,7 +350,7 @@ get_dataset_names () const template -const std::vector< ::DataOutBase::Patch > & +const std::vector< dealii::DataOutBase::Patch > & DataOut_DoFData::get_patches () const { return patches; @@ -406,7 +407,7 @@ void DataOut::build_some_patches (Data &data) const unsigned int n_q_points = patch_points.n_quadrature_points; - typename std::vector< ::DataOutBase::Patch >::iterator patch = this->patches.begin(); + typename std::vector< dealii::DataOutBase::Patch >::iterator patch = this->patches.begin(); cell_iterator cell=first_cell(); // get first cell in this thread @@ -529,7 +530,7 @@ void DataOut::build_some_patches (Data &data) || ((*data.cell_to_patch_index_map)[neighbor->level()][neighbor->index()] == - ::DataOutBase::Patch::no_neighbor)) + dealii::DataOutBase::Patch::no_neighbor)) continue; // now, there is a @@ -597,7 +598,7 @@ void DataOut::build_patches (const Mapping &mapping, // clear the patches array if (true) { - std::vector< ::DataOutBase::Patch > dummy; + std::vector< dealii::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -620,7 +621,7 @@ void DataOut::build_patches (const Mapping &mapping, static_cast(cell->index())); cell_to_patch_index_map[l].resize (max_index+1, - ::DataOutBase::Patch::no_neighbor); + dealii::DataOutBase::Patch::no_neighbor); }; unsigned int n_patches = 0; @@ -648,7 +649,7 @@ void DataOut::build_patches (const Mapping &mapping, // // then number the patches // consecutively - ::DataOutBase::Patch default_patch; + dealii::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points); this->patches.insert (this->patches.end(), n_patches, default_patch); @@ -764,3 +765,5 @@ INSTANTIATE_VECTORS(hp::DoFHandler,deal_II_dimension-1,deal_I #endif template class DataOut >; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/data_out_faces.cc b/deal.II/deal.II/source/numerics/data_out_faces.cc index 7db06d6390..2d84ea7f88 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -26,6 +26,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template @@ -61,7 +63,7 @@ void DataOutFaces::build_some_patches (Data &data) const unsigned int n_q_points = patch_points.n_quadrature_points; - typename std::vector< ::DataOutBase::Patch >::iterator patch = this->patches.begin(); + typename std::vector< dealii::DataOutBase::Patch >::iterator patch = this->patches.begin(); FaceDescriptor face=first_face(); // get first face in this thread @@ -182,7 +184,7 @@ void DataOutFaces::build_patches (const unsigned int nnnn_subdivisions, // clear the patches array if (true) { - std::vector< ::DataOutBase::Patch > dummy; + std::vector< dealii::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -216,7 +218,7 @@ void DataOutFaces::build_patches (const unsigned int nnnn_subdivisions, // values. note that the evaluation // points on the face have to be // repeated in angular direction - ::DataOutBase::Patch default_patch; + dealii::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points); this->patches.insert (this->patches.end(), n_patches, default_patch); @@ -317,3 +319,5 @@ DataOutFaces::next_face (const FaceDescriptor &old_face) template class DataOutFaces >; template class DataOutFaces >; #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index 8b375a3658..7d0b806c1b 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -28,6 +28,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + //TODO: Update documentation //TODO: Unify code for dimensions @@ -86,7 +89,7 @@ void DataOutRotation::build_some_patches (Data &data) unsigned int cell_number = 0; - typename std::vector< ::DataOutBase::Patch >::iterator + typename std::vector< dealii::DataOutBase::Patch >::iterator patch = this->patches.begin(); cell_iterator cell=first_cell(); @@ -355,7 +358,7 @@ void DataOutRotation::build_patches ( // clear the patches array if (true) { - std::vector< ::DataOutBase::Patch > dummy; + std::vector< dealii::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -395,7 +398,7 @@ void DataOutRotation::build_patches ( // values. note that the evaluation // points on the cell have to be // repeated in angular direction - ::DataOutBase::Patch default_patch; + dealii::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points * (n_subdivisions+1)); @@ -441,3 +444,5 @@ DataOutRotation::next_cell (const cell_iterator &cell) // explicit instantiations template class DataOutRotation >; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index 6767b332ea..9d400bc411 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -27,6 +27,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template unsigned int @@ -287,14 +289,14 @@ void DataOutStack::build_patches (const unsigned int nnnn_subdivisions) // patch with n_q_points (in the the plane // of the cells) times n_subdivisions+1 (in // the time direction) points - ::DataOutBase::Patch default_patch; + dealii::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points*(n_subdivisions+1)); patches.insert (patches.end(), n_patches, default_patch); // now loop over all cells and // actually create the patches - typename std::vector< ::DataOutBase::Patch >::iterator + typename std::vector< dealii::DataOutBase::Patch >::iterator patch = patches.begin() + (patches.size()-n_patches); unsigned int cell_number = 0; for (typename DH::active_cell_iterator cell=dof_handler->begin_active(); @@ -439,7 +441,7 @@ DataOutStack::memory_consumption () const template -const std::vector< ::DataOutBase::Patch > & +const std::vector< dealii::DataOutBase::Patch > & DataOutStack::get_patches () const { return patches; @@ -480,3 +482,5 @@ add_data_vector (const Vector &vec, template void DataOutStack >:: add_data_vector (const Vector &vec, const std::string &name); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc index 8bffc3207f..fd60e8db2d 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -33,6 +33,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template @@ -158,7 +160,8 @@ derivative_norm (const Derivative &d) // // if the d_11=a, d_22=b, // d_12=d_21=c - const double radicand = ::sqr(d[0][0] - d[1][1]) + 4*::sqr(d[0][1]); + const double radicand = dealii::sqr(d[0][0] - d[1][1]) + + 4*dealii::sqr(d[0][1]); const double eigenvalues[2] = { 0.5*(d[0][0] + d[1][1] + std::sqrt(radicand)), 0.5*(d[0][0] + d[1][1] - std::sqrt(radicand)) }; @@ -1073,3 +1076,5 @@ DerivativeApproximation::SecondDerivative::update_flags; template const UpdateFlags DerivativeApproximation::ThirdDerivative::update_flags; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index dae3f3143b..7c4d86ca39 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -37,6 +37,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + static @@ -1135,7 +1137,7 @@ integrate_over_regular_face (const DH &dof_handl for (unsigned int component=0; componentface(neighbor_neighbor)] = face_integral; @@ -1430,3 +1432,5 @@ INSTANTIATE(PETScWrappers::BlockVector,DoFHandler); INSTANTIATE(PETScWrappers::Vector,hp::DoFHandler); INSTANTIATE(PETScWrappers::BlockVector,hp::DoFHandler); #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc index 6b21b84311..b510fd8a23 100644 --- a/deal.II/deal.II/source/numerics/histogram.cc +++ b/deal.II/deal.II/source/numerics/histogram.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template inline @@ -339,3 +341,5 @@ template void Histogram::evaluate (const Vector &values, const unsigned int n_intervals, const IntervalSpacing interval_spacing); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc index 01d9af4f07..d335079911 100644 --- a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc +++ b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -28,6 +28,8 @@ #include +DEAL_II_NAMESPACE_OPEN + //TODO:[WB] I don't think that the optimized storage of diagonals is needed (GK) template @@ -824,3 +826,5 @@ MatrixTools::apply_boundary_values (const std::map & BlockVector &solution, BlockVector &right_hand_side, const bool preserve_symmetry); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 439f384a90..1a90e9627a 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -38,6 +38,7 @@ #include +DEAL_II_NAMESPACE_OPEN template inline @@ -1455,3 +1456,5 @@ void MatrixCreator::create_laplace_matrix const Function &rhs, Vector &rhs_vector, const Function * const coefficient); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index a426a20fc4..f11630816a 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN @@ -420,3 +421,5 @@ template class SolutionTransfer; template class SolutionTransfer; /*---------------------------- solution_transfer.cc ----------------------*/ + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index eaa2372dbd..edf06a5a5d 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -25,6 +25,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN TimeDependent::TimeSteppingData::TimeSteppingData (const unsigned int look_ahead, const unsigned int look_back) @@ -585,7 +586,7 @@ namespace { Assert(old_cell->n_children()==new_cell->n_children(), ExcNotImplemented()); for (unsigned int c=0; cn_children(); ++c) - ::mirror_refinement_flags (new_cell->child(c), old_cell->child(c)); + dealii::mirror_refinement_flags (new_cell->child(c), old_cell->child(c)); } } @@ -603,7 +604,7 @@ namespace Assert(cell2->n_children()==cell1->n_children(), ExcNotImplemented()); for (unsigned int c=0; cn_children(); ++c) - grids_changed |= ::adapt_grid_cells (cell1->child(c), + grids_changed |= dealii::adapt_grid_cells (cell1->child(c), cell2->child(c)); return grids_changed; }; @@ -711,7 +712,7 @@ namespace typename Triangulation::cell_iterator(tria1.end()) : tria1.begin(1)); for (; cell1!=endc; ++cell1, ++cell2) - grids_changed |= ::adapt_grid_cells (cell1, cell2); + grids_changed |= dealii::adapt_grid_cells (cell1, cell2); return grids_changed; } @@ -834,7 +835,7 @@ void TimeStepBase_Tria::refine_grid (const RefinementData refinement_data) // (there are more coming below then // also) if (refinement_flags.adapt_grids) - ::adapt_grids (*previous_tria, *tria); + dealii::adapt_grids (*previous_tria, *tria); // perform flagging of cells // needed to regularize the @@ -1091,14 +1092,14 @@ void TimeStepBase_Tria::refine_grid (const RefinementData refinement_data) // strange things may happen if (refinement_flags.mirror_flags_to_previous_grid) { - ::adapt_grids (*previous_tria, *tria); + dealii::adapt_grids (*previous_tria, *tria); typename Triangulation::cell_iterator old_cell, new_cell, endc; old_cell = previous_tria->begin(0); new_cell = tria->begin(0); endc = tria->end(0); for (; new_cell!=endc; ++new_cell, ++old_cell) - ::mirror_refinement_flags (new_cell, old_cell); + dealii::mirror_refinement_flags (new_cell, old_cell); }; tria->prepare_coarsening_and_refinement (); @@ -1109,7 +1110,7 @@ void TimeStepBase_Tria::refine_grid (const RefinementData refinement_data) // cells to avoid the previous grid // to have cells refined twice more // than the present one and vica versa. - ::adapt_grids (*previous_tria, *tria); + dealii::adapt_grids (*previous_tria, *tria); }; } @@ -1250,3 +1251,5 @@ namespace TimeStepBase_Tria_Flags template class RefinementFlags; template class RefinementData; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/vectors.all_dimensions.cc b/deal.II/deal.II/source/numerics/vectors.all_dimensions.cc index 49e87e6a89..7e8e7d5c66 100644 --- a/deal.II/deal.II/source/numerics/vectors.all_dimensions.cc +++ b/deal.II/deal.II/source/numerics/vectors.all_dimensions.cc @@ -15,6 +15,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN void @@ -42,3 +43,5 @@ VectorTools::subtract_mean_value(Vector &v, if (p_select[i]) v(i) -= s; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 676f7db24a..f096705170 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -35,6 +35,8 @@ #undef VEC +DEAL_II_NAMESPACE_OPEN + template void VectorTools::create_right_hand_side (const Mapping &, @@ -168,3 +170,5 @@ VectorTools::interpolate_boundary_values std::map &, const std::vector &); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/vectors.instance.h b/deal.II/deal.II/source/numerics/vectors.instance.h index 2ab7cd8a1c..93ac348901 100644 --- a/deal.II/deal.II/source/numerics/vectors.instance.h +++ b/deal.II/deal.II/source/numerics/vectors.instance.h @@ -15,6 +15,8 @@ // vectors.cc defines the vector type VEC +DEAL_II_NAMESPACE_OPEN + template void VectorTools::interpolate (const Mapping&, @@ -228,3 +230,5 @@ void VectorTools::project const bool, const Quadrature &, const bool); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/examples/doxygen/block_matrix_array.cc b/deal.II/examples/doxygen/block_matrix_array.cc index 4a0cec66d8..6b46bd49c5 100644 --- a/deal.II/examples/doxygen/block_matrix_array.cc +++ b/deal.II/examples/doxygen/block_matrix_array.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,8 @@ #include #include +using namespace dealii; + double Adata[] = { 4., .5, .1, 0., diff --git a/deal.II/examples/doxygen/compressed_block_sparsity_pattern.cc b/deal.II/examples/doxygen/compressed_block_sparsity_pattern.cc index 2f86cccabc..35aa5d49b5 100644 --- a/deal.II/examples/doxygen/compressed_block_sparsity_pattern.cc +++ b/deal.II/examples/doxygen/compressed_block_sparsity_pattern.cc @@ -27,6 +27,8 @@ #include +using namespace dealii; + int main() { Triangulation<2> tr; diff --git a/deal.II/examples/doxygen/product_matrix.cc b/deal.II/examples/doxygen/product_matrix.cc index 7e92d864bd..73e66960ab 100644 --- a/deal.II/examples/doxygen/product_matrix.cc +++ b/deal.II/examples/doxygen/product_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include #include +using namespace dealii; double Adata[] = { diff --git a/deal.II/examples/step-1/step-1.cc b/deal.II/examples/step-1/step-1.cc index 624bb7099f..58955c6932 100644 --- a/deal.II/examples/step-1/step-1.cc +++ b/deal.II/examples/step-1/step-1.cc @@ -38,6 +38,8 @@ // `sqrt' and `fabs' functions: #include +using namespace dealii; + // @sect3{Creating the first mesh} // In the following, first function, we diff --git a/deal.II/examples/step-10/step-10.cc b/deal.II/examples/step-10/step-10.cc index f0ce11e6c2..8ca3e40541 100644 --- a/deal.II/examples/step-10/step-10.cc +++ b/deal.II/examples/step-10/step-10.cc @@ -39,6 +39,8 @@ #include #include +using namespace dealii; + // Now, as we want to compute the // value of pi, we have to compare to // somewhat. These are the first few diff --git a/deal.II/examples/step-11/step-11.cc b/deal.II/examples/step-11/step-11.cc index c57edd2efe..f78682c656 100644 --- a/deal.II/examples/step-11/step-11.cc +++ b/deal.II/examples/step-11/step-11.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2001, 2002, 2003, 2004 by the deal.II authors */ +/* Copyright (C) 2001, 2002, 2003, 2004, 2006 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -55,6 +55,7 @@ #include #include +using namespace dealii; // Then we declare a class which // represents the solution of a diff --git a/deal.II/examples/step-12/step-12.cc b/deal.II/examples/step-12/step-12.cc index 4dc5df5ce5..186831141a 100644 --- a/deal.II/examples/step-12/step-12.cc +++ b/deal.II/examples/step-12/step-12.cc @@ -76,6 +76,7 @@ #include #include +using namespace dealii; // @sect3{Equation data} // diff --git a/deal.II/examples/step-13/step-13.cc b/deal.II/examples/step-13/step-13.cc index fc04eff772..16600d02bf 100644 --- a/deal.II/examples/step-13/step-13.cc +++ b/deal.II/examples/step-13/step-13.cc @@ -53,6 +53,7 @@ #include #include +using namespace dealii; // @sect3{Evaluation of the solution} diff --git a/deal.II/examples/step-14/step-14.cc b/deal.II/examples/step-14/step-14.cc index 855df1fadc..2914a770b1 100644 --- a/deal.II/examples/step-14/step-14.cc +++ b/deal.II/examples/step-14/step-14.cc @@ -47,6 +47,8 @@ #include #include +using namespace dealii; + // @sect3{Evaluating the solution} // As mentioned in the introduction, diff --git a/deal.II/examples/step-15/step-15.cc b/deal.II/examples/step-15/step-15.cc index 912a0d8bae..4e3665a607 100644 --- a/deal.II/examples/step-15/step-15.cc +++ b/deal.II/examples/step-15/step-15.cc @@ -50,6 +50,7 @@ #include #include +using namespace dealii; // The first thing we have here is a helper // function that computes an even power $|v|^n$ diff --git a/deal.II/examples/step-16/step-16.cc b/deal.II/examples/step-16/step-16.cc index 7f96f4f705..e456283152 100644 --- a/deal.II/examples/step-16/step-16.cc +++ b/deal.II/examples/step-16/step-16.cc @@ -60,6 +60,7 @@ #include #include +using namespace dealii; // This class is based on the same // class in step 5. Remark that we diff --git a/deal.II/examples/step-17/step-17.cc b/deal.II/examples/step-17/step-17.cc index 65969866ca..325a30a810 100644 --- a/deal.II/examples/step-17/step-17.cc +++ b/deal.II/examples/step-17/step-17.cc @@ -98,6 +98,7 @@ #include #include +using namespace dealii; // Now, here comes the declaration of the // main class and of various other things diff --git a/deal.II/examples/step-18/step-18.cc b/deal.II/examples/step-18/step-18.cc index 8302e1d6b7..4e3be0df92 100644 --- a/deal.II/examples/step-18/step-18.cc +++ b/deal.II/examples/step-18/step-18.cc @@ -67,6 +67,8 @@ #include #include +using namespace dealii; + // So much for the header files. As a // matter of good practice, I have // started to put everything that diff --git a/deal.II/examples/step-19/step-19.cc b/deal.II/examples/step-19/step-19.cc index 9b5d30a731..0acce6a807 100644 --- a/deal.II/examples/step-19/step-19.cc +++ b/deal.II/examples/step-19/step-19.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2005 by the deal.II authors */ +/* Copyright (C) 2005, 2006 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -27,6 +27,7 @@ #include #include +using namespace dealii; // Before we start with the actual program, // let us declare a few global variables that diff --git a/deal.II/examples/step-2/step-2.cc b/deal.II/examples/step-2/step-2.cc index 3e54ec731a..92609813be 100644 --- a/deal.II/examples/step-2/step-2.cc +++ b/deal.II/examples/step-2/step-2.cc @@ -59,6 +59,7 @@ // And this is again needed for C++ output: #include +using namespace dealii; // @sect3{Mesh generation} diff --git a/deal.II/examples/step-20/step-20.cc b/deal.II/examples/step-20/step-20.cc index b6f0137641..518f9c28f9 100644 --- a/deal.II/examples/step-20/step-20.cc +++ b/deal.II/examples/step-20/step-20.cc @@ -63,6 +63,7 @@ // offers such functionality: #include +using namespace dealii; // @sect3{The MixedLaplaceProblem class template} diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index 6c0ab4bcd1..6676b1c317 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -48,6 +48,7 @@ // offers such functionality: #include +using namespace dealii; // @sect3{The ``TwoPhaseFlowProblem'' class template} diff --git a/deal.II/examples/step-23/step-23.cc b/deal.II/examples/step-23/step-23.cc index 4e8e48d969..4bdf2cf410 100644 --- a/deal.II/examples/step-23/step-23.cc +++ b/deal.II/examples/step-23/step-23.cc @@ -110,6 +110,8 @@ // double digit time steps. #include +using namespace dealii; + // @sect3{The WaveEquation class} diff --git a/deal.II/examples/step-24/step-24.cc b/deal.II/examples/step-24/step-24.cc index 2ad21b7c8a..b7e378b4eb 100644 --- a/deal.II/examples/step-24/step-24.cc +++ b/deal.II/examples/step-24/step-24.cc @@ -53,6 +53,7 @@ // diameter. #include +using namespace dealii; // @sect3{The "forward problem" class template} diff --git a/deal.II/examples/step-25/step-25.cc b/deal.II/examples/step-25/step-25.cc index 29e7cd63b2..96b0b200a3 100644 --- a/deal.II/examples/step-25/step-25.cc +++ b/deal.II/examples/step-25/step-25.cc @@ -47,6 +47,8 @@ #include #include +using namespace dealii; + // The following global variable is used to determine whether the // problem being solved is one for which an exact solution is known, // e.g. we are using the exact solution as the initial condition. It diff --git a/deal.II/examples/step-26/step-26.cc b/deal.II/examples/step-26/step-26.cc index aa363f6256..173ca60a90 100644 --- a/deal.II/examples/step-26/step-26.cc +++ b/deal.II/examples/step-26/step-26.cc @@ -54,6 +54,7 @@ #include #include +using namespace dealii; class PointCloudSurface : public StraightBoundary<3> { diff --git a/deal.II/examples/step-3/step-3.cc b/deal.II/examples/step-3/step-3.cc index 821b0e044b..b5aa75dcf6 100644 --- a/deal.II/examples/step-3/step-3.cc +++ b/deal.II/examples/step-3/step-3.cc @@ -90,6 +90,7 @@ #include #include +using namespace dealii; // @sect3{The LaplaceProblem class} diff --git a/deal.II/examples/step-4/step-4.cc b/deal.II/examples/step-4/step-4.cc index d6ff4ec32a..2777783af5 100644 --- a/deal.II/examples/step-4/step-4.cc +++ b/deal.II/examples/step-4/step-4.cc @@ -49,6 +49,7 @@ // the main() function below for that): #include +using namespace dealii; // @sect3{The LaplaceProblem class template} diff --git a/deal.II/examples/step-5/step-5.cc b/deal.II/examples/step-5/step-5.cc index 0caaae616b..947834122c 100644 --- a/deal.II/examples/step-5/step-5.cc +++ b/deal.II/examples/step-5/step-5.cc @@ -55,6 +55,8 @@ // ostringstream: #include +using namespace dealii; + // @sect3{The LaplaceProblem class template} diff --git a/deal.II/examples/step-6/step-6.cc b/deal.II/examples/step-6/step-6.cc index 354055da98..53c91563c7 100644 --- a/deal.II/examples/step-6/step-6.cc +++ b/deal.II/examples/step-6/step-6.cc @@ -100,6 +100,7 @@ // problems. #include +using namespace dealii; // @sect3{The LaplaceProblem class template} diff --git a/deal.II/examples/step-7/step-7.cc b/deal.II/examples/step-7/step-7.cc index 6c8afa4768..814623d42c 100644 --- a/deal.II/examples/step-7/step-7.cc +++ b/deal.II/examples/step-7/step-7.cc @@ -81,6 +81,7 @@ #include #include +using namespace dealii; // @sect3{Equation data} diff --git a/deal.II/examples/step-8/step-8.cc b/deal.II/examples/step-8/step-8.cc index 6d14741c89..b37cc9b021 100644 --- a/deal.II/examples/step-8/step-8.cc +++ b/deal.II/examples/step-8/step-8.cc @@ -55,6 +55,7 @@ #include #include +using namespace dealii; // @sect3{The ElasticProblem class template} diff --git a/deal.II/examples/step-9/step-9.cc b/deal.II/examples/step-9/step-9.cc index 51e8b177e7..7e96c0b2e8 100644 --- a/deal.II/examples/step-9/step-9.cc +++ b/deal.II/examples/step-9/step-9.cc @@ -85,6 +85,8 @@ # define M_PI 3.14159265358979323846 #endif +using namespace dealii; + // @sect3{AdvectionProblem class declaration} // Following we declare the main diff --git a/deal.II/lac/include/lac/block_indices.h b/deal.II/lac/include/lac/block_indices.h index 6d0e9f6dee..ce7e6cdeb0 100644 --- a/deal.II/lac/include/lac/block_indices.h +++ b/deal.II/lac/include/lac/block_indices.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * Class that manages the conversion of global indices into a block @@ -333,4 +335,6 @@ void swap (BlockIndices &u, BlockIndices &v) +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_matrix.h b/deal.II/lac/include/lac/block_matrix.h index 125caf62cb..a8dfe75bd8 100644 --- a/deal.II/lac/include/lac/block_matrix.h +++ b/deal.II/lac/include/lac/block_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Matrix2 *@{ */ @@ -117,4 +119,6 @@ BlockDiagonalMatrix::Tvmult (BlockVector& dst, } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_matrix_array.h b/deal.II/lac/include/lac/block_matrix_array.h index 408eb8b520..b27977500f 100644 --- a/deal.II/lac/include/lac/block_matrix_array.h +++ b/deal.II/lac/include/lac/block_matrix_array.h @@ -26,6 +26,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class BlockVector; template class Vector; @@ -795,4 +796,6 @@ BlockTrianglePrecondition::enter_aux ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_matrix_base.h b/deal.II/lac/include/lac/block_matrix_base.h index 7a6348ea65..103eb2d213 100644 --- a/deal.II/lac/include/lac/block_matrix_base.h +++ b/deal.II/lac/include/lac/block_matrix_base.h @@ -23,6 +23,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Matrix1 @@ -2155,4 +2157,6 @@ BlockMatrixBase::collect_sizes () #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__block_matrix_base_h diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h index 5a0e31aaad..38fc98b9fb 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Matrix1 @@ -566,4 +567,6 @@ precondition_Jacobi (Vector &dst, } +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__block_sparse_matrix_h diff --git a/deal.II/lac/include/lac/block_sparse_matrix.templates.h b/deal.II/lac/include/lac/block_sparse_matrix.templates.h index 9865ed5fb4..9c0e277add 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -227,4 +228,6 @@ BlockSparseMatrix::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif // ifdef block_sparse_matrix_templates_h 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 4c5ed096d9..9e3d1c2999 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/block_sparse_matrix_ez.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class BlockVector; /*! @addtogroup Matrix1 @@ -595,4 +597,6 @@ BlockSparseMatrixEZ::print_statistics (STREAM& out, bool full) } +DEAL_II_NAMESPACE_CLOSE + #endif //__deal2__block_sparse_matrix_ez_h diff --git a/deal.II/lac/include/lac/block_sparse_matrix_ez.templates.h b/deal.II/lac/include/lac/block_sparse_matrix_ez.templates.h index a75e91f673..79cfcc043d 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix_ez.templates.h +++ b/deal.II/lac/include/lac/block_sparse_matrix_ez.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -218,4 +219,6 @@ BlockSparseMatrixEZ::collect_sizes () +DEAL_II_NAMESPACE_CLOSE + #endif // ifdef block_sparse_matrix_templates_h diff --git a/deal.II/lac/include/lac/block_sparsity_pattern.h b/deal.II/lac/include/lac/block_sparsity_pattern.h index 2c1dc8e913..dcb66eb511 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class BlockSparseMatrix; class BlockSparsityPattern; @@ -699,4 +701,6 @@ BlockSparsityPattern::reinit ( } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h index c90d7675ba..ff2faef5d0 100644 --- a/deal.II/lac/include/lac/block_vector.h +++ b/deal.II/lac/include/lac/block_vector.h @@ -23,6 +23,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Vectors @@ -511,4 +512,6 @@ void swap (BlockVector &u, u.swap (v); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_vector.templates.h b/deal.II/lac/include/lac/block_vector.templates.h index 30a17c6900..bfd7b18f9c 100644 --- a/deal.II/lac/include/lac/block_vector.templates.h +++ b/deal.II/lac/include/lac/block_vector.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template BlockVector::BlockVector (const unsigned int n_blocks, @@ -112,8 +113,8 @@ void BlockVector::swap (BlockVector &v) ExcDimensionMismatch(this->n_blocks(), v.n_blocks())); for (unsigned int i=0; in_blocks(); ++i) - ::swap (this->components[i], v.components[i]); - ::swap (this->block_indices, v.block_indices); + dealii::swap (this->components[i], v.components[i]); + dealii::swap (this->block_indices, v.block_indices); } @@ -166,4 +167,6 @@ BlockVector::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/block_vector_base.h b/deal.II/lac/include/lac/block_vector_base.h index b171024d60..a22727108d 100644 --- a/deal.II/lac/include/lac/block_vector_base.h +++ b/deal.II/lac/include/lac/block_vector_base.h @@ -24,6 +24,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Vectors @@ -2208,4 +2209,6 @@ BlockVectorBase::operator() (const unsigned int i) #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/compressed_sparsity_pattern.h b/deal.II/lac/include/lac/compressed_sparsity_pattern.h index 5b3a41221a..f6d79cb5d9 100644 --- a/deal.II/lac/include/lac/compressed_sparsity_pattern.h +++ b/deal.II/lac/include/lac/compressed_sparsity_pattern.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,11 +18,14 @@ #include #include -template class SparseMatrix; - #include #include +DEAL_II_NAMESPACE_OPEN + +template class SparseMatrix; + + /*! @addtogroup Matrix1 *@{ */ @@ -532,4 +535,6 @@ CompressedSparsityPattern::column_number (const unsigned int row, +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/eigen.h b/deal.II/lac/include/lac/eigen.h index de9c4591e7..817f83c232 100644 --- a/deal.II/lac/include/lac/eigen.h +++ b/deal.II/lac/include/lac/eigen.h @@ -26,6 +26,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + /*!@addtogroup Solvers */ /*@{*/ @@ -419,4 +422,6 @@ EigenInverse::solve (double &value, // otherwise exit as normal } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/exceptions.h b/deal.II/lac/include/lac/exceptions.h index d286ad19fe..f867200151 100644 --- a/deal.II/lac/include/lac/exceptions.h +++ b/deal.II/lac/include/lac/exceptions.h @@ -15,6 +15,8 @@ #include +DEAL_II_NAMESPACE_OPEN + namespace LACExceptions { /** @@ -57,4 +59,6 @@ namespace LACExceptions using namespace LACExceptions; +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/filtered_matrix.h b/deal.II/lac/include/lac/filtered_matrix.h index 52464ec186..399b20881c 100644 --- a/deal.II/lac/include/lac/filtered_matrix.h +++ b/deal.II/lac/include/lac/filtered_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Vector; @@ -610,5 +611,7 @@ unsigned int FilteredMatrix::n () const /*---------------------------- filtered_matrix.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- filtered_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/filtered_matrix.templates.h b/deal.II/lac/include/lac/filtered_matrix.templates.h index 2a3131f22e..6b9f20ebdc 100644 --- a/deal.II/lac/include/lac/filtered_matrix.templates.h +++ b/deal.II/lac/include/lac/filtered_matrix.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + template FilteredMatrix::FilteredMatrix () {} @@ -264,4 +267,6 @@ FilteredMatrix::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h index ba811f9015..9f331062e9 100644 --- a/deal.II/lac/include/lac/full_matrix.h +++ b/deal.II/lac/include/lac/full_matrix.h @@ -22,6 +22,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + // forward declarations template class Vector; @@ -1456,5 +1459,7 @@ FullMatrix::print (STREAM &s, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 89401b9064..18bb6af4d1 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -24,6 +24,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + template FullMatrix::FullMatrix (const unsigned int n) : @@ -2383,4 +2386,6 @@ FullMatrix::memory_consumption () const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/householder.h b/deal.II/lac/include/lac/householder.h index 1ca3bd3171..c3299e3d61 100644 --- a/deal.II/lac/include/lac/householder.h +++ b/deal.II/lac/include/lac/householder.h @@ -20,6 +20,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + // forward declarations template class Vector; @@ -182,5 +185,7 @@ Householder::least_squares (Vector& dst, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/identity_matrix.h b/deal.II/lac/include/lac/identity_matrix.h index e41cc413f6..6e427b61c4 100644 --- a/deal.II/lac/include/lac/identity_matrix.h +++ b/deal.II/lac/include/lac/identity_matrix.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Matrix1 *@{ @@ -272,5 +273,7 @@ IdentityMatrix::Tvmult_add (VECTOR1 &out, /**@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/lapack_full_matrix.h b/deal.II/lac/include/lac/lapack_full_matrix.h index 19826dad7e..0f238cef55 100644 --- a/deal.II/lac/include/lac/lapack_full_matrix.h +++ b/deal.II/lac/include/lac/lapack_full_matrix.h @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // forward declarations template class Vector; template class BlockVector; @@ -484,4 +486,6 @@ LAPACKFullMatrix::eigenvalue (const unsigned int i) const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/lapack_support.h b/deal.II/lac/include/lac/lapack_support.h index 967ac9e8b1..dcfab53d44 100644 --- a/deal.II/lac/include/lac/lapack_support.h +++ b/deal.II/lac/include/lac/lapack_support.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + namespace LAPACKSupport { @@ -128,4 +130,6 @@ namespace LAPACKSupport } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/lapack_templates.h b/deal.II/lac/include/lac/lapack_templates.h index 163ff77c31..b157ed51ba 100644 --- a/deal.II/lac/include/lac/lapack_templates.h +++ b/deal.II/lac/include/lac/lapack_templates.h @@ -5,7 +5,7 @@ // This file was automatically generated from blas.h.in // See blastemplates in the deal.II contrib directory // -// Copyright (C) 2005 by the deal authors +// Copyright (C) 2005, 2006 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -120,7 +120,7 @@ gemv (const char* trans, const int* m, const int* n, const double* alpha, const inline void gemv (const char*, const int*, const int*, const double*, const double*, const int*, const double*, const int*, const double*, double*, const int*) { - LAPACKSupport::ExcMissing("dgemv"); + dealii::LAPACKSupport::ExcMissing("dgemv"); } #endif @@ -135,7 +135,7 @@ gemv (const char* trans, const int* m, const int* n, const float* alpha, const f inline void gemv (const char*, const int*, const int*, const float*, const float*, const int*, const float*, const int*, const float*, float*, const int*) { - LAPACKSupport::ExcMissing("sgemv"); + dealii::LAPACKSupport::ExcMissing("sgemv"); } #endif @@ -150,7 +150,7 @@ getrf (const int* m, const int* n, double* A, const int* lda, int* ipiv, int* in inline void getrf (const int*, const int*, double*, const int*, int*, int*) { - LAPACKSupport::ExcMissing("dgetrf"); + dealii::LAPACKSupport::ExcMissing("dgetrf"); } #endif @@ -165,7 +165,7 @@ getrf (const int* m, const int* n, float* A, const int* lda, int* ipiv, int* inf inline void getrf (const int*, const int*, float*, const int*, int*, int*) { - LAPACKSupport::ExcMissing("sgetrf"); + dealii::LAPACKSupport::ExcMissing("sgetrf"); } #endif @@ -180,7 +180,7 @@ getrs (const char* trans, const int* n, const int* nrhs, const double* A, const inline void getrs (const char*, const int*, const int*, const double*, const int*, const int*, double*, const int*, int*) { - LAPACKSupport::ExcMissing("dgetrs"); + dealii::LAPACKSupport::ExcMissing("dgetrs"); } #endif @@ -195,7 +195,7 @@ getrs (const char* trans, const int* n, const int* nrhs, const float* A, const i inline void getrs (const char*, const int*, const int*, const float*, const int*, const int*, float*, const int*, int*) { - LAPACKSupport::ExcMissing("sgetrs"); + dealii::LAPACKSupport::ExcMissing("sgetrs"); } #endif @@ -210,7 +210,7 @@ geev (const char* jobvl, const char* jobvr, const int* n, double* A, const int* inline void geev (const char*, const char*, const int*, double*, const int*, double*, double*, double*, const int*, double*, const int*, double*, const int*, int*) { - LAPACKSupport::ExcMissing("dgeev"); + dealii::LAPACKSupport::ExcMissing("dgeev"); } #endif @@ -225,7 +225,7 @@ geev (const char* jobvl, const char* jobvr, const int* n, float* A, const int* l inline void geev (const char*, const char*, const int*, float*, const int*, float*, float*, float*, const int*, float*, const int*, float*, const int*, int*) { - LAPACKSupport::ExcMissing("sgeev"); + dealii::LAPACKSupport::ExcMissing("sgeev"); } #endif @@ -240,7 +240,7 @@ geevx (const char* balanc, const char* jobvl, const char* jobvr, const char* sen inline void geevx (const char*, const char*, const char*, const char*, const int*, double*, const int*, double*, double*, double*, const int*, double*, const int*, int*, int*, double*, double*, double*, double*, double*, const int*, int*, int*) { - LAPACKSupport::ExcMissing("dgeevx"); + dealii::LAPACKSupport::ExcMissing("dgeevx"); } #endif @@ -255,7 +255,7 @@ geevx (const char* balanc, const char* jobvl, const char* jobvr, const char* sen inline void geevx (const char*, const char*, const char*, const char*, const int*, float*, const int*, float*, float*, float*, const int*, float*, const int*, int*, int*, float*, float*, float*, float*, float*, const int*, int*, int*) { - LAPACKSupport::ExcMissing("sgeevx"); + dealii::LAPACKSupport::ExcMissing("sgeevx"); } #endif @@ -270,7 +270,7 @@ gesvd (int* jobu, int* jobvt, const int* n, const int* m, double* A, const int* inline void gesvd (int*, int*, const int*, const int*, double*, const int*, double*, double*, const int*, double*, const int*, double*, const int*, int*) { - LAPACKSupport::ExcMissing("dgesvd"); + dealii::LAPACKSupport::ExcMissing("dgesvd"); } #endif @@ -285,7 +285,7 @@ gesvd (int* jobu, int* jobvt, const int* n, const int* m, float* A, const int* l inline void gesvd (int*, int*, const int*, const int*, float*, const int*, float*, float*, const int*, float*, const int*, float*, const int*, int*) { - LAPACKSupport::ExcMissing("sgesvd"); + dealii::LAPACKSupport::ExcMissing("sgesvd"); } #endif @@ -300,7 +300,7 @@ stev (const char* jobz, const int* n, double* d, double* e, double* z, const int inline void stev (const char*, const int*, double*, double*, double*, const int*, double*, int*) { - LAPACKSupport::ExcMissing("dstev"); + dealii::LAPACKSupport::ExcMissing("dstev"); } #endif @@ -315,9 +315,8 @@ stev (const char* jobz, const int* n, float* d, float* e, float* z, const int* l inline void stev (const char*, const int*, float*, float*, float*, const int*, float*, int*) { - LAPACKSupport::ExcMissing("sstev"); + dealii::LAPACKSupport::ExcMissing("sstev"); } #endif - #endif diff --git a/deal.II/lac/include/lac/matrix_iterator.h b/deal.II/lac/include/lac/matrix_iterator.h index 88ee537a6d..273ef859ad 100644 --- a/deal.II/lac/include/lac/matrix_iterator.h +++ b/deal.II/lac/include/lac/matrix_iterator.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * STL conforming iterator for constant * and non-constant matrices. @@ -234,4 +236,6 @@ operator > (const MatrixIterator& other) const return (other < *this); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/matrix_lib.h b/deal.II/lac/include/lac/matrix_lib.h index 113fdbb487..3fb3f244c7 100644 --- a/deal.II/lac/include/lac/matrix_lib.h +++ b/deal.II/lac/include/lac/matrix_lib.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class BlockVector; template class SparseMatrix; @@ -615,4 +617,6 @@ InverseMatrixRichardson::initialize (const MATRIX& m, const PRECONDITION } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/matrix_lib.templates.h b/deal.II/lac/include/lac/matrix_lib.templates.h index bf3b1eb15c..5eecf2bdd4 100644 --- a/deal.II/lac/include/lac/matrix_lib.templates.h +++ b/deal.II/lac/include/lac/matrix_lib.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template void @@ -215,4 +216,6 @@ InverseMatrixRichardson::Tvmult_add(VECTOR& dst, const VECTOR& src) cons +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/matrix_out.h b/deal.II/lac/include/lac/matrix_out.h index cbe0392706..1b942e3dd0 100644 --- a/deal.II/lac/include/lac/matrix_out.h +++ b/deal.II/lac/include/lac/matrix_out.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * Output a matrix in graphical form using the generic format * independent output routines of the base class. The matrix is @@ -195,24 +197,20 @@ class MatrixOut : public DataOutInterface<2,2> /** * Abbreviate the somewhat - * lengthy name for the ::DataOutBase::Patch + * lengthy name for the dealii::DataOutBase::Patch * class. * - * Note that we have to indicate - * the global scope using the - * @p :: in front of - * DataOutBase, since - * otherwise the C++ rules - * specify that this here - * indicates the DataOutBase - * base class of this - * class. Since that is a private - * base class, we cannot access - * its members, and so access to - * the local Patch type would - * be forbidden. + * Note that we have to indicate the + * global scope in front of DataOutBase, + * since otherwise the C++ rules specify + * that this here indicates the + * DataOutBase base class of this + * class. Since that is a private base + * class, we cannot access its members, + * and so access to the local Patch type + * would be forbidden. */ - typedef ::DataOutBase::Patch<2,2> Patch; + typedef dealii::DataOutBase::Patch<2,2> Patch; /** * This is a list of patches that @@ -470,5 +468,7 @@ MatrixOut::build_patches (const Matrix &matrix, /*---------------------------- matrix_out.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- matrix_out.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_block_sparse_matrix.h b/deal.II/lac/include/lac/petsc_block_sparse_matrix.h index ac739a64d3..39ffdf70dc 100644 --- a/deal.II/lac/include/lac/petsc_block_sparse_matrix.h +++ b/deal.II/lac/include/lac/petsc_block_sparse_matrix.h @@ -26,6 +26,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers @@ -372,6 +374,7 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_USE_PETSC diff --git a/deal.II/lac/include/lac/petsc_block_vector.h b/deal.II/lac/include/lac/petsc_block_vector.h index d0f48088ec..f2ed580ecf 100644 --- a/deal.II/lac/include/lac/petsc_block_vector.h +++ b/deal.II/lac/include/lac/petsc_block_vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers @@ -479,6 +481,9 @@ namespace PETScWrappers } + +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC #endif diff --git a/deal.II/lac/include/lac/petsc_full_matrix.h b/deal.II/lac/include/lac/petsc_full_matrix.h index 112bd9f99d..900cfefc72 100644 --- a/deal.II/lac/include/lac/petsc_full_matrix.h +++ b/deal.II/lac/include/lac/petsc_full_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,10 +16,12 @@ #include #include +#include #ifdef DEAL_II_USE_PETSC -#include +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers @@ -62,6 +64,9 @@ namespace PETScWrappers /*@}*/ } + +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_full_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_matrix_base.h b/deal.II/lac/include/lac/petsc_matrix_base.h index eee788f65f..226871d1e3 100644 --- a/deal.II/lac/include/lac/petsc_matrix_base.h +++ b/deal.II/lac/include/lac/petsc_matrix_base.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,9 @@ #include #include +DEAL_II_NAMESPACE_OPEN + + namespace PETScWrappers { // forward declarations @@ -1058,6 +1061,9 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + + #endif // DEAL_II_USE_PETSC diff --git a/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h b/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h index e4fdd86e77..c7ab820662 100644 --- a/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h +++ b/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers @@ -364,6 +366,9 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + + #endif // DEAL_II_USE_PETSC #endif // __deal2__petsc_parallel_block_sparse_matrix_h diff --git a/deal.II/lac/include/lac/petsc_parallel_block_vector.h b/deal.II/lac/include/lac/petsc_parallel_block_vector.h index 49bae14f7a..8d752f320d 100644 --- a/deal.II/lac/include/lac/petsc_parallel_block_vector.h +++ b/deal.II/lac/include/lac/petsc_parallel_block_vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers { @@ -471,6 +473,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC #endif diff --git a/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h b/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h index b92229e9dd..af4d5afd54 100644 --- a/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h +++ b/deal.II/lac/include/lac/petsc_parallel_sparse_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,13 +17,15 @@ #include #include -#ifdef DEAL_II_USE_PETSC - #include #include #include +#ifdef DEAL_II_USE_PETSC + +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers @@ -433,6 +435,8 @@ namespace PETScWrappers } } +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_parallel_sparse_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_parallel_vector.h b/deal.II/lac/include/lac/petsc_parallel_vector.h index 6c686801fc..a009392780 100644 --- a/deal.II/lac/include/lac/petsc_parallel_vector.h +++ b/deal.II/lac/include/lac/petsc_parallel_vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,12 +16,14 @@ #include #include #include - #include +#include + #ifdef DEAL_II_USE_PETSC -#include +DEAL_II_NAMESPACE_OPEN + // forward declaration @@ -507,6 +509,8 @@ namespace PETScWrappers /**@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_parallel_vector.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_precondition.h b/deal.II/lac/include/lac/petsc_precondition.h index 5bcc399a95..417b957741 100644 --- a/deal.II/lac/include/lac/petsc_precondition.h +++ b/deal.II/lac/include/lac/petsc_precondition.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,10 +16,14 @@ #include #include + #ifdef DEAL_II_USE_PETSC #include +DEAL_II_NAMESPACE_OPEN + + namespace PETScWrappers { @@ -595,6 +599,9 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_precondition.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_solver.h b/deal.II/lac/include/lac/petsc_solver.h index cd57c4a64a..5725572346 100644 --- a/deal.II/lac/include/lac/petsc_solver.h +++ b/deal.II/lac/include/lac/petsc_solver.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,12 +16,15 @@ #include #include #include +#include + #ifdef DEAL_II_USE_PETSC -#include #include +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers { @@ -1091,6 +1094,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_solver.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_sparse_matrix.h b/deal.II/lac/include/lac/petsc_sparse_matrix.h index 4708f792af..1cc9f813dc 100644 --- a/deal.II/lac/include/lac/petsc_sparse_matrix.h +++ b/deal.II/lac/include/lac/petsc_sparse_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,14 +16,16 @@ #include #include - -#ifdef DEAL_II_USE_PETSC - #include #include #include +#ifdef DEAL_II_USE_PETSC + +DEAL_II_NAMESPACE_OPEN + + namespace PETScWrappers { /** @@ -316,6 +318,8 @@ namespace PETScWrappers }; } +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_sparse_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/petsc_vector.h b/deal.II/lac/include/lac/petsc_vector.h index 653b0e83f7..31215e4cbb 100644 --- a/deal.II/lac/include/lac/petsc_vector.h +++ b/deal.II/lac/include/lac/petsc_vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,13 +16,13 @@ #include #include #include - +#include +#include #include #ifdef DEAL_II_USE_PETSC -#include -#include +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers @@ -360,6 +360,7 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_USE_PETSC diff --git a/deal.II/lac/include/lac/petsc_vector_base.h b/deal.II/lac/include/lac/petsc_vector_base.h index 2d4997be1a..4f176e2dd4 100644 --- a/deal.II/lac/include/lac/petsc_vector_base.h +++ b/deal.II/lac/include/lac/petsc_vector_base.h @@ -18,13 +18,14 @@ #include #include +#include +#include + #ifdef DEAL_II_USE_PETSC #include -#include -#include - +DEAL_II_NAMESPACE_OPEN // forward declaration template class Vector; @@ -939,6 +940,8 @@ namespace PETScWrappers #endif // DOXYGEN } +DEAL_II_NAMESPACE_CLOSE + #endif // DEAL_II_USE_PETSC /*---------------------------- petsc_vector_base.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/pointer_matrix.h b/deal.II/lac/include/lac/pointer_matrix.h index 7f2ad988ac..b792ccb703 100644 --- a/deal.II/lac/include/lac/pointer_matrix.h +++ b/deal.II/lac/include/lac/pointer_matrix.h @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class VectorMemory; /*! @addtogroup Matrix2 @@ -915,4 +917,6 @@ PointerMatrixVector::get () const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/precondition.h b/deal.II/lac/include/lac/precondition.h index 832446b4b0..57227b9a59 100644 --- a/deal.II/lac/include/lac/precondition.h +++ b/deal.II/lac/include/lac/precondition.h @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class SparseMatrix; @@ -1077,4 +1079,6 @@ PreconditionedMatrix return dst.l2_norm (); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h index ea92018dee..99a777f2e7 100644 --- a/deal.II/lac/include/lac/precondition_block.h +++ b/deal.II/lac/include/lac/precondition_block.h @@ -21,6 +21,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class FullMatrix; template class Vector; @@ -1181,4 +1183,6 @@ PreconditionBlockJacobi::end ( return const_iterator(this, r+1); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/precondition_block.templates.h b/deal.II/lac/include/lac/precondition_block.templates.h index 5ddaadcdbd..c8808876d6 100644 --- a/deal.II/lac/include/lac/precondition_block.templates.h +++ b/deal.II/lac/include/lac/precondition_block.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template PreconditionBlock::PreconditionBlock (): @@ -858,4 +860,6 @@ void PreconditionBlockSSOR::Tvmult (Vector & PreconditionBlockSOR::vmult(dst, help); } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/precondition_selector.h b/deal.II/lac/include/lac/precondition_selector.h index 917868f719..bf48f39f11 100644 --- a/deal.II/lac/include/lac/precondition_selector.h +++ b/deal.II/lac/include/lac/precondition_selector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class SparseMatrix; @@ -223,4 +225,6 @@ std::string PreconditionSelector::get_precondition_names() } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/schur_matrix.h b/deal.II/lac/include/lac/schur_matrix.h index 455b8f1f2e..a0c9d52c78 100644 --- a/deal.II/lac/include/lac/schur_matrix.h +++ b/deal.II/lac/include/lac/schur_matrix.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Matrix2 @@ -352,4 +353,6 @@ void SchurMatrix } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/shifted_matrix.h b/deal.II/lac/include/lac/shifted_matrix.h index 035a385e5e..8f51b0947b 100644 --- a/deal.II/lac/include/lac/shifted_matrix.h +++ b/deal.II/lac/include/lac/shifted_matrix.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Matrix2 *@{ */ @@ -258,4 +260,6 @@ ShiftedMatrixGeneralized::residual (VECTOR& dst, } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver.h b/deal.II/lac/include/lac/solver.h index d3edc6dd13..513d379652 100644 --- a/deal.II/lac/include/lac/solver.h +++ b/deal.II/lac/include/lac/solver.h @@ -17,6 +17,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template class Vector; class SolverControl; @@ -242,4 +243,6 @@ Solver::control() const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_bicgstab.h b/deal.II/lac/include/lac/solver_bicgstab.h index 57d55593a3..a1b40372f9 100644 --- a/deal.II/lac/include/lac/solver_bicgstab.h +++ b/deal.II/lac/include/lac/solver_bicgstab.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -426,4 +428,6 @@ SolverBicgstab::solve(const MATRIX &A, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_cg.h b/deal.II/lac/include/lac/solver_cg.h index 9a759a85d5..092126246c 100644 --- a/deal.II/lac/include/lac/solver_cg.h +++ b/deal.II/lac/include/lac/solver_cg.h @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -456,4 +458,6 @@ SolverCG::solve (const MATRIX &A, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_control.h b/deal.II/lac/include/lac/solver_control.h index d38a6faefe..b3f270a291 100644 --- a/deal.II/lac/include/lac/solver_control.h +++ b/deal.II/lac/include/lac/solver_control.h @@ -19,6 +19,8 @@ #include +DEAL_II_NAMESPACE_OPEN + class ParameterHandler; /*!@addtogroup Solvers */ @@ -629,4 +631,6 @@ ReductionControl::set_reduction (const double t) #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_gmres.h b/deal.II/lac/include/lac/solver_gmres.h index add6d7c2bf..4711fdeb5a 100644 --- a/deal.II/lac/include/lac/solver_gmres.h +++ b/deal.II/lac/include/lac/solver_gmres.h @@ -26,6 +26,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -542,11 +544,12 @@ SolverGMRES::solve (const MATRIX &A, // some additional vectors, also used // in the orthogonalization - ::Vector gamma(n_tmp_vectors), - ci (n_tmp_vectors-1), - si (n_tmp_vectors-1), - h (n_tmp_vectors-1); - + dealii::Vector + gamma(n_tmp_vectors), + ci (n_tmp_vectors-1), + si (n_tmp_vectors-1), + h (n_tmp_vectors-1); + unsigned int dim = 0; @@ -574,7 +577,7 @@ SolverGMRES::solve (const MATRIX &A, // are used as stopping criterion VECTOR *r=0; VECTOR *x_=0; - ::Vector *gamma_=0; + dealii::Vector *gamma_=0; if (!use_default_residual) { r=this->memory.alloc(); @@ -582,7 +585,7 @@ SolverGMRES::solve (const MATRIX &A, r->reinit(x); x_->reinit(x); - gamma_=new ::Vector (gamma.size()); + gamma_ = new dealii::Vector (gamma.size()); } /////////////////////////////////// @@ -726,7 +729,7 @@ SolverGMRES::solve (const MATRIX &A, { deallog << "default_res=" << rho << std::endl; - ::Vector h_(dim); + dealii::Vector h_(dim); *x_=x; *gamma_=gamma; H1.reinit(dim+1,dim); @@ -951,4 +954,6 @@ SolverFGMRES::solve ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_minres.h b/deal.II/lac/include/lac/solver_minres.h index 47e3c34c56..24b9b316e0 100644 --- a/deal.II/lac/include/lac/solver_minres.h +++ b/deal.II/lac/include/lac/solver_minres.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -384,4 +386,6 @@ SolverMinRes::solve (const MATRIX &A, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_qmrs.h b/deal.II/lac/include/lac/solver_qmrs.h index ddcc3850b1..646ac72d62 100644 --- a/deal.II/lac/include/lac/solver_qmrs.h +++ b/deal.II/lac/include/lac/solver_qmrs.h @@ -22,6 +22,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -407,4 +409,6 @@ SolverQMRS::iterate(const MATRIX &A, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_richardson.h b/deal.II/lac/include/lac/solver_richardson.h index 79f397f4af..4c4fbf508d 100644 --- a/deal.II/lac/include/lac/solver_richardson.h +++ b/deal.II/lac/include/lac/solver_richardson.h @@ -20,6 +20,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -371,4 +373,6 @@ SolverRichardson::set_omega (const double om) #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/solver_selector.h b/deal.II/lac/include/lac/solver_selector.h index d919aee168..3079f17f18 100644 --- a/deal.II/lac/include/lac/solver_selector.h +++ b/deal.II/lac/include/lac/solver_selector.h @@ -27,6 +27,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*!@addtogroup Solvers */ /*@{*/ @@ -326,4 +328,6 @@ void SolverSelector::set_data( } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/sparse_decomposition.h b/deal.II/lac/include/lac/sparse_decomposition.h index 11a8f56571..230cc7a27d 100644 --- a/deal.II/lac/include/lac/sparse_decomposition.h +++ b/deal.II/lac/include/lac/sparse_decomposition.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -19,6 +19,8 @@ #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Preconditioners *@{ */ @@ -483,4 +485,6 @@ SparseLUDecomposition::AdditionalData::AdditionalData ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__sparse_decomposition_h diff --git a/deal.II/lac/include/lac/sparse_decomposition.templates.h b/deal.II/lac/include/lac/sparse_decomposition.templates.h index 1a9abf9690..403b599d1c 100644 --- a/deal.II/lac/include/lac/sparse_decomposition.templates.h +++ b/deal.II/lac/include/lac/sparse_decomposition.templates.h @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -9,10 +9,14 @@ // //--------------------------------------------------------------------------- +#ifndef __deal2__sparse_decomposition_templates_h +#define __deal2__sparse_decomposition_templates_h + #include #include #include +DEAL_II_NAMESPACE_OPEN template SparseLUDecomposition::SparseLUDecomposition() @@ -237,3 +241,6 @@ SparseLUDecomposition::memory_consumption () const } +DEAL_II_NAMESPACE_CLOSE + +#endif // __deal2__sparse_decomposition_templates_h diff --git a/deal.II/lac/include/lac/sparse_direct.h b/deal.II/lac/include/lac/sparse_direct.h index 70b136bdd1..ddac248a23 100644 --- a/deal.II/lac/include/lac/sparse_direct.h +++ b/deal.II/lac/include/lac/sparse_direct.h @@ -22,6 +22,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /** @@ -1229,4 +1230,6 @@ class SparseDirectUMFPACK : public Subscriptor +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/sparse_ilu.h b/deal.II/lac/include/lac/sparse_ilu.h index b9ce69c170..7ca3507b9d 100644 --- a/deal.II/lac/include/lac/sparse_ilu.h +++ b/deal.II/lac/include/lac/sparse_ilu.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Preconditioners *@{ */ @@ -207,4 +209,6 @@ SparseILU::apply_decomposition (Vector &dst, +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__sparse_ilu_h diff --git a/deal.II/lac/include/lac/sparse_ilu.templates.h b/deal.II/lac/include/lac/sparse_ilu.templates.h index 67e1cd3325..7cdba0d1d0 100644 --- a/deal.II/lac/include/lac/sparse_ilu.templates.h +++ b/deal.II/lac/include/lac/sparse_ilu.templates.h @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -20,6 +20,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template SparseILU::SparseILU () @@ -322,5 +323,7 @@ SparseILU::memory_consumption () const /*---------------------------- sparse_ilu.templates.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- sparse_ilu.templates.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index 3beeca1bc8..6e9ef35637 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class FullMatrix; @@ -2482,5 +2484,7 @@ SparseMatrix::end (const unsigned int r) /*---------------------------- sparse_matrix.h ---------------------------*/ +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- sparse_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index dfa36e6451..b4c174dd7f 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -41,6 +41,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -1440,4 +1441,6 @@ SparseMatrix::memory_consumption () const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.h b/deal.II/lac/include/lac/sparse_matrix_ez.h index b112250626..336b169b80 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.h @@ -21,6 +21,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class Vector; template class FullMatrix; @@ -1788,5 +1790,7 @@ SparseMatrixEZ::print_statistics(STREAM& out, bool full) } +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- sparse_matrix.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.templates.h b/deal.II/lac/include/lac/sparse_matrix_ez.templates.h index 2b0c6b086c..b65f226d35 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + //--------------------------------------------------------------------------- template @@ -529,4 +531,6 @@ SparseMatrixEZ::block_read (std::istream &in) CHECKFOR(in,']',c); } +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__sparse_matrix_ez_templates_h diff --git a/deal.II/lac/include/lac/sparse_mic.h b/deal.II/lac/include/lac/sparse_mic.h index 238059d02e..6bdad53371 100644 --- a/deal.II/lac/include/lac/sparse_mic.h +++ b/deal.II/lac/include/lac/sparse_mic.h @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -14,6 +14,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /*! @addtogroup Preconditioners *@{ @@ -174,4 +175,6 @@ class SparseMIC : public SparseLUDecomposition /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__ diff --git a/deal.II/lac/include/lac/sparse_mic.templates.h b/deal.II/lac/include/lac/sparse_mic.templates.h index 5f8f25e4f6..e6081ee045 100644 --- a/deal.II/lac/include/lac/sparse_mic.templates.h +++ b/deal.II/lac/include/lac/sparse_mic.templates.h @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -16,6 +16,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template SparseMIC::SparseMIC () @@ -251,4 +252,6 @@ SparseMIC::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__sparse_mic_templates_h diff --git a/deal.II/lac/include/lac/sparse_vanka.h b/deal.II/lac/include/lac/sparse_vanka.h index 541436c17c..6fcf976811 100644 --- a/deal.II/lac/include/lac/sparse_vanka.h +++ b/deal.II/lac/include/lac/sparse_vanka.h @@ -22,6 +22,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template class FullMatrix; template class SparseMatrix; template class Vector; @@ -579,4 +581,6 @@ class SparseBlockVanka : public SparseVanka }; /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/sparse_vanka.templates.h b/deal.II/lac/include/lac/sparse_vanka.templates.h index b4be72ef01..d784f2b119 100644 --- a/deal.II/lac/include/lac/sparse_vanka.templates.h +++ b/deal.II/lac/include/lac/sparse_vanka.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template SparseVanka::SparseVanka(const SparseMatrix &M, @@ -628,4 +629,6 @@ SparseBlockVanka::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/sparsity_pattern.h b/deal.II/lac/include/lac/sparsity_pattern.h index 573f12896a..48b6905bce 100644 --- a/deal.II/lac/include/lac/sparsity_pattern.h +++ b/deal.II/lac/include/lac/sparsity_pattern.h @@ -21,6 +21,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN class SparsityPattern; template class FullMatrix; @@ -2103,4 +2104,6 @@ SparsityPattern::copy_from (const unsigned int n_rows, #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/swappable_vector.h b/deal.II/lac/include/lac/swappable_vector.h index 7424c2ec3b..7bad3f84f1 100644 --- a/deal.II/lac/include/lac/swappable_vector.h +++ b/deal.II/lac/include/lac/swappable_vector.h @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*! @addtogroup Vectors *@{ */ @@ -305,5 +307,7 @@ class SwappableVector : public Vector /*@}*/ /*---------------------------- swappable_vector.h ---------------------------*/ /* end of #ifndef __deal2__swappable_vector_h */ +DEAL_II_NAMESPACE_CLOSE + #endif /*---------------------------- swappable_vector.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/swappable_vector.templates.h b/deal.II/lac/include/lac/swappable_vector.templates.h index dfb67c5195..fb5a85a076 100644 --- a/deal.II/lac/include/lac/swappable_vector.templates.h +++ b/deal.II/lac/include/lac/swappable_vector.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN template @@ -247,4 +248,6 @@ SwappableVector::memory_consumption () const +DEAL_II_NAMESPACE_CLOSE + #endif // __deal2__swappable_vector_templates_h diff --git a/deal.II/lac/include/lac/transpose_matrix.h b/deal.II/lac/include/lac/transpose_matrix.h index 28fa8e018b..2142d11c23 100644 --- a/deal.II/lac/include/lac/transpose_matrix.h +++ b/deal.II/lac/include/lac/transpose_matrix.h @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /** * The transpose of a given matrix. This auxiliary class swaps the @@ -225,4 +227,6 @@ TransposeMatrix::get () const +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/tridiagonal_matrix.h b/deal.II/lac/include/lac/tridiagonal_matrix.h index 135d48c97e..2f474746dd 100644 --- a/deal.II/lac/include/lac/tridiagonal_matrix.h +++ b/deal.II/lac/include/lac/tridiagonal_matrix.h @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // forward declarations template class Vector; @@ -466,5 +468,7 @@ TridiagonalMatrix::print ( #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h index 7ae62c74f8..61872652d5 100644 --- a/deal.II/lac/include/lac/vector.h +++ b/deal.II/lac/include/lac/vector.h @@ -20,6 +20,8 @@ #include +DEAL_II_NAMESPACE_OPEN + #ifdef DEAL_II_USE_PETSC namespace PETScWrappers @@ -1003,4 +1005,6 @@ void swap (Vector &u, Vector &v) /*@}*/ +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/vector.templates.h b/deal.II/lac/include/lac/vector.templates.h index 887c02bafb..28dfb16513 100644 --- a/deal.II/lac/include/lac/vector.templates.h +++ b/deal.II/lac/include/lac/vector.templates.h @@ -26,6 +26,7 @@ #include #include +DEAL_II_NAMESPACE_OPEN /* Note that in this file, we use std::fabs, std::sqrt, etc @@ -898,4 +899,6 @@ Vector::memory_consumption () const } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/include/lac/vector_memory.h b/deal.II/lac/include/lac/vector_memory.h index efdeddb6c8..801d8656b0 100644 --- a/deal.II/lac/include/lac/vector_memory.h +++ b/deal.II/lac/include/lac/vector_memory.h @@ -22,6 +22,9 @@ #include +DEAL_II_NAMESPACE_OPEN + + /*!@addtogroup VMemory */ /*@{*/ @@ -62,7 +65,7 @@ * * @author Guido Kanschat, 1998-2003 */ -template > +template > class VectorMemory : public Subscriptor { public: @@ -121,7 +124,7 @@ class VectorMemory : public Subscriptor * vectors as needed from the global heap, i.e. performs no * specially adapted actions for memory management. */ -template > +template > class PrimitiveVectorMemory : public VectorMemory { public: @@ -189,7 +192,7 @@ class PrimitiveVectorMemory : public VectorMemory * * @author Guido Kanschat, 1999 */ -template > +template > class GrowingVectorMemory : public VectorMemory { public: @@ -401,4 +404,6 @@ GrowingVectorMemory::memory_consumption () const #endif // DOXYGEN +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/source/block_matrix_array.cc b/deal.II/lac/source/block_matrix_array.cc index bc0870f62f..0ee615bcf9 100644 --- a/deal.II/lac/source/block_matrix_array.cc +++ b/deal.II/lac/source/block_matrix_array.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template BlockMatrixArray::Entry::Entry (const Entry& e) @@ -412,3 +414,5 @@ template class BlockMatrixArray; template class BlockMatrixArray; template class BlockTrianglePrecondition; template class BlockTrianglePrecondition; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/block_sparse_matrix.cc b/deal.II/lac/source/block_sparse_matrix.cc index acb63dd491..520aba1731 100644 --- a/deal.II/lac/source/block_sparse_matrix.cc +++ b/deal.II/lac/source/block_sparse_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,6 +13,10 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class BlockSparseMatrix; template class BlockSparseMatrix; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/block_sparse_matrix_ez.cc b/deal.II/lac/source/block_sparse_matrix_ez.cc index 9c0dd3c9a8..cc16e03ec9 100644 --- a/deal.II/lac/source/block_sparse_matrix_ez.cc +++ b/deal.II/lac/source/block_sparse_matrix_ez.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2005 by the deal.II authors +// Copyright (C) 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,10 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class BlockSparseMatrixEZ; template class BlockSparseMatrixEZ; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/block_sparsity_pattern.cc b/deal.II/lac/source/block_sparsity_pattern.cc index 1d0e76e8e4..0a43712a30 100644 --- a/deal.II/lac/source/block_sparsity_pattern.cc +++ b/deal.II/lac/source/block_sparsity_pattern.cc @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + template BlockSparsityPatternBase::BlockSparsityPatternBase () @@ -389,3 +391,5 @@ CompressedBlockSparsityPattern (const unsigned int n_rows, // to the top of this source file. The reason is a slightly buggy version // of the Apple gcc v.3.3. // For more information, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24331 + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/block_vector.cc b/deal.II/lac/source/block_vector.cc index 3e1022e07e..3abf02ad23 100644 --- a/deal.II/lac/source/block_vector.cc +++ b/deal.II/lac/source/block_vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,6 +13,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class BlockVector; template class BlockVector; @@ -32,3 +34,5 @@ template void BlockVector::reinit(const BlockVector&, template void BlockVector::reinit(const BlockVector&, const bool); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/compressed_sparsity_pattern.cc b/deal.II/lac/source/compressed_sparsity_pattern.cc index d29e837cd5..34a78c3e19 100644 --- a/deal.II/lac/source/compressed_sparsity_pattern.cc +++ b/deal.II/lac/source/compressed_sparsity_pattern.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + const unsigned int CompressedSparsityPattern::Line::cache_size; @@ -385,3 +387,5 @@ CompressedSparsityPattern::n_nonzero_elements () const return n; } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/filtered_matrix.cc b/deal.II/lac/source/filtered_matrix.cc index 83b039ab49..e97391c828 100644 --- a/deal.II/lac/source/filtered_matrix.cc +++ b/deal.II/lac/source/filtered_matrix.cc @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + #define FILT(MM,VV) \ template <> \ void FilteredMatrix::allocate_tmp_vector() \ @@ -45,3 +47,5 @@ FILT(SparseMatrix, Vector) BFILT(BlockSparseMatrix, BlockVector) template class FilteredMatrix,Vector >; template class FilteredMatrix,BlockVector >; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/full_matrix.double.cc b/deal.II/lac/source/full_matrix.double.cc index 0dd4504d8a..6a0ca614c1 100644 --- a/deal.II/lac/source/full_matrix.double.cc +++ b/deal.II/lac/source/full_matrix.double.cc @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #define TYPEMAT double template class FullMatrix; @@ -121,3 +123,5 @@ FullMatrix::residual(Vector&, const Vector&, const Vector&) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/full_matrix.float.cc b/deal.II/lac/source/full_matrix.float.cc index 4de71ff519..14754a8b08 100644 --- a/deal.II/lac/source/full_matrix.float.cc +++ b/deal.II/lac/source/full_matrix.float.cc @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #define TYPEMAT float template class FullMatrix; @@ -118,3 +120,5 @@ void FullMatrix::precondition_Jacobi ( template double FullMatrix::residual( Vector&, const Vector&, const Vector&) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/lapack_full_matrix.cc b/deal.II/lac/source/lapack_full_matrix.cc index 281b239adb..4a8a01ff1a 100644 --- a/deal.II/lac/source/lapack_full_matrix.cc +++ b/deal.II/lac/source/lapack_full_matrix.cc @@ -21,6 +21,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + using namespace LAPACKSupport; template @@ -465,3 +467,5 @@ LAPACKFullMatrix::operator = (const FullMatrix& M); template class PreconditionLU; template class PreconditionLU; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/matrix_lib.cc b/deal.II/lac/source/matrix_lib.cc index 57c1ebbaeb..6f8ce5ed4e 100644 --- a/deal.II/lac/source/matrix_lib.cc +++ b/deal.II/lac/source/matrix_lib.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + MeanValueFilter::MeanValueFilter(unsigned int component) : component(component) @@ -170,3 +172,5 @@ template class InverseMatrixRichardson >; template class InverseMatrixRichardson >; template class InverseMatrixRichardson >; template class InverseMatrixRichardson >; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/matrix_out.cc b/deal.II/lac/source/matrix_out.cc index 77631291e0..29fca6d19b 100644 --- a/deal.II/lac/source/matrix_out.cc +++ b/deal.II/lac/source/matrix_out.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + MatrixOut::Options::Options (const bool show_absolute_values, const unsigned int block_size, @@ -44,3 +46,5 @@ MatrixOut::get_dataset_names () const { return std::vector(1,name); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/petsc_block_sparse_matrix.cc b/deal.II/lac/source/petsc_block_sparse_matrix.cc index bc75c7156e..d20c90708e 100644 --- a/deal.II/lac/source/petsc_block_sparse_matrix.cc +++ b/deal.II/lac/source/petsc_block_sparse_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers { BlockSparseMatrix::BlockSparseMatrix () @@ -94,4 +96,6 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/source/petsc_full_matrix.cc b/deal.II/lac/source/petsc_full_matrix.cc index 8eb1545643..d62c06fe1c 100644 --- a/deal.II/lac/source/petsc_full_matrix.cc +++ b/deal.II/lac/source/petsc_full_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -40,6 +41,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_matrix_base.cc b/deal.II/lac/source/petsc_matrix_base.cc index 2a0af2d2a3..b478b1083d 100644 --- a/deal.II/lac/source/petsc_matrix_base.cc +++ b/deal.II/lac/source/petsc_matrix_base.cc @@ -20,6 +20,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -594,6 +595,8 @@ namespace PETScWrappers } } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc b/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc index 83dd5b0ef9..ec7cb38eae 100644 --- a/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc +++ b/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN + namespace PETScWrappers { namespace MPI @@ -107,4 +109,6 @@ namespace PETScWrappers +DEAL_II_NAMESPACE_CLOSE + #endif diff --git a/deal.II/lac/source/petsc_parallel_block_vector.cc b/deal.II/lac/source/petsc_parallel_block_vector.cc index 357f89e952..f1e25e0671 100644 --- a/deal.II/lac/source/petsc_parallel_block_vector.cc +++ b/deal.II/lac/source/petsc_parallel_block_vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -38,6 +39,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_parallel_sparse_matrix.cc b/deal.II/lac/source/petsc_parallel_sparse_matrix.cc index b18a77ced1..17bdd2dd89 100644 --- a/deal.II/lac/source/petsc_parallel_sparse_matrix.cc +++ b/deal.II/lac/source/petsc_parallel_sparse_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -448,6 +449,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_parallel_vector.cc b/deal.II/lac/source/petsc_parallel_vector.cc index c5336f23d3..4c49bc7970 100644 --- a/deal.II/lac/source/petsc_parallel_vector.cc +++ b/deal.II/lac/source/petsc_parallel_vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004 by the deal.II authors +// Copyright (C) 2004, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -166,6 +167,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_precondition.cc b/deal.II/lac/source/petsc_precondition.cc index 34d7c3a2b1..8ff083434c 100644 --- a/deal.II/lac/source/petsc_precondition.cc +++ b/deal.II/lac/source/petsc_precondition.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004 by the deal.II authors +// Copyright (C) 2004, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -322,6 +323,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_solver.cc b/deal.II/lac/source/petsc_solver.cc index cd8295b75b..be98e02095 100644 --- a/deal.II/lac/source/petsc_solver.cc +++ b/deal.II/lac/source/petsc_solver.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004 by the deal.II authors +// Copyright (C) 2004, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -26,6 +26,7 @@ #endif #include +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -669,6 +670,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_sparse_matrix.cc b/deal.II/lac/source/petsc_sparse_matrix.cc index 0dbe4e6b5d..5c5142dafc 100644 --- a/deal.II/lac/source/petsc_sparse_matrix.cc +++ b/deal.II/lac/source/petsc_sparse_matrix.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,6 +17,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -231,6 +232,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_vector.cc b/deal.II/lac/source/petsc_vector.cc index a61c1387df..b74db3a90c 100644 --- a/deal.II/lac/source/petsc_vector.cc +++ b/deal.II/lac/source/petsc_vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004 by the deal.II authors +// Copyright (C) 2004, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -108,6 +109,8 @@ namespace PETScWrappers } } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/petsc_vector_base.cc b/deal.II/lac/source/petsc_vector_base.cc index cc91844fb7..612d6ce198 100644 --- a/deal.II/lac/source/petsc_vector_base.cc +++ b/deal.II/lac/source/petsc_vector_base.cc @@ -20,6 +20,7 @@ #ifdef DEAL_II_USE_PETSC +DEAL_II_NAMESPACE_OPEN namespace PETScWrappers { @@ -877,6 +878,8 @@ namespace PETScWrappers } +DEAL_II_NAMESPACE_CLOSE + #else // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code diff --git a/deal.II/lac/source/precondition_block.cc b/deal.II/lac/source/precondition_block.cc index 4f3d183787..a5d8dd40af 100644 --- a/deal.II/lac/source/precondition_block.cc +++ b/deal.II/lac/source/precondition_block.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations for "float" PreconditionBlock template class PreconditionBlock, float>; @@ -197,3 +199,5 @@ template void PreconditionBlockSSOR, double>::Tvmult Vector &, const Vector &) const; template void PreconditionBlockSSOR, double>::Tvmult ( Vector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/precondition_block_ez.cc b/deal.II/lac/source/precondition_block_ez.cc index ccded7ddd6..c43cf8e1cd 100644 --- a/deal.II/lac/source/precondition_block_ez.cc +++ b/deal.II/lac/source/precondition_block_ez.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2005 by the deal.II authors +// Copyright (C) 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations for "float" PreconditionBlock template class PreconditionBlock, float>; @@ -197,3 +199,5 @@ template void PreconditionBlockSSOR, double>::Tvmult &, const Vector &) const; template void PreconditionBlockSSOR, double>::Tvmult ( Vector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/solver.cc b/deal.II/lac/source/solver.cc index 7159c8cece..28aa36305b 100644 --- a/deal.II/lac/source/solver.cc +++ b/deal.II/lac/source/solver.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + // a few instantiations of static members. Hope that we catch all that // are required @@ -36,3 +38,5 @@ template class Solver >; template class Solver; template class Solver; #endif + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/solver_control.cc b/deal.II/lac/source/solver_control.cc index 97e15e8816..9b873e632f 100644 --- a/deal.II/lac/source/solver_control.cc +++ b/deal.II/lac/source/solver_control.cc @@ -19,6 +19,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + /*----------------------- SolverControl ---------------------------------*/ @@ -316,3 +318,5 @@ ReductionControl::parse_parameters (ParameterHandler& param) SolverControl::parse_parameters (param); set_reduction (param.get_double("Reduction")); } + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_decomposition.cc b/deal.II/lac/source/sparse_decomposition.cc index f35a185582..1b35d84c54 100644 --- a/deal.II/lac/source/sparse_decomposition.cc +++ b/deal.II/lac/source/sparse_decomposition.cc @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -11,6 +11,8 @@ #include +DEAL_II_NAMESPACE_OPEN + template class SparseLUDecomposition; template void SparseLUDecomposition::initialize (const SparseMatrix &, @@ -38,3 +40,5 @@ template void SparseLUDecomposition::decompose (const SparseMatrix template void SparseLUDecomposition::copy_from (const SparseMatrix &); template void SparseLUDecomposition::copy_from (const SparseMatrix &); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_direct.cc b/deal.II/lac/source/sparse_direct.cc index 85f4bd5204..8f2bd38e3d 100644 --- a/deal.II/lac/source/sparse_direct.cc +++ b/deal.II/lac/source/sparse_direct.cc @@ -51,6 +51,8 @@ #endif #include +DEAL_II_NAMESPACE_OPEN + // if we know that at least one of the HSL functions are there, // include the respective include file. Otherwise save some CPU cycles @@ -1985,3 +1987,5 @@ InstantiateUMFPACK(SparseMatrix); InstantiateUMFPACK(SparseMatrix); InstantiateUMFPACK(BlockSparseMatrix); InstantiateUMFPACK(BlockSparseMatrix); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_ilu.cc b/deal.II/lac/source/sparse_ilu.cc index 24ecc3d86c..b980e8ad81 100644 --- a/deal.II/lac/source/sparse_ilu.cc +++ b/deal.II/lac/source/sparse_ilu.cc @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -11,6 +11,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class SparseILU; @@ -49,3 +51,5 @@ template void SparseILU::vmult (Vector &, const Vector &) const; template void SparseILU::Tvmult (Vector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_matrix.double.cc b/deal.II/lac/source/sparse_matrix.double.cc index d1130944f6..59ff434c74 100644 --- a/deal.II/lac/source/sparse_matrix.double.cc +++ b/deal.II/lac/source/sparse_matrix.double.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,7 +17,9 @@ #define TYPEMAT double +DEAL_II_NAMESPACE_OPEN template class SparseMatrix; +DEAL_II_NAMESPACE_CLOSE #define TYPE2 float #include "sparse_matrix_matrix.in.h" @@ -42,6 +44,8 @@ template class SparseMatrix; // #include +DEAL_II_NAMESPACE_OPEN + #undef TYPEMAT @@ -140,3 +144,5 @@ template void SparseMatrix:: vmult_add (BlockVector &, const Vector &) const; template void SparseMatrix:: Tvmult_add (BlockVector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_matrix.float.cc b/deal.II/lac/source/sparse_matrix.float.cc index a74b58d735..03b48165ae 100644 --- a/deal.II/lac/source/sparse_matrix.float.cc +++ b/deal.II/lac/source/sparse_matrix.float.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -17,7 +17,9 @@ #define TYPEMAT float +DEAL_II_NAMESPACE_OPEN template class SparseMatrix; +DEAL_II_NAMESPACE_CLOSE #define TYPE2 float #include "sparse_matrix_matrix.in.h" @@ -42,6 +44,8 @@ template class SparseMatrix; // #include +DEAL_II_NAMESPACE_OPEN + #undef TYPEMAT @@ -140,3 +144,5 @@ template void SparseMatrix:: vmult_add (BlockVector &, const Vector &) const; template void SparseMatrix:: Tvmult_add (BlockVector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_matrix_ez.double.cc b/deal.II/lac/source/sparse_matrix_ez.double.cc index 042cbcafe5..9be705996d 100644 --- a/deal.II/lac/source/sparse_matrix_ez.double.cc +++ b/deal.II/lac/source/sparse_matrix_ez.double.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2005 by the deal.II authors +// Copyright (C) 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,7 +18,10 @@ #define TYPEMAT double +DEAL_II_NAMESPACE_OPEN template class SparseMatrixEZ; +DEAL_II_NAMESPACE_CLOSE + #define TYPEVEC float #include "sparse_matrix_ez_vector.in.h" diff --git a/deal.II/lac/source/sparse_matrix_ez.float.cc b/deal.II/lac/source/sparse_matrix_ez.float.cc index 76b0fc52a5..636e7f2147 100644 --- a/deal.II/lac/source/sparse_matrix_ez.float.cc +++ b/deal.II/lac/source/sparse_matrix_ez.float.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2005 by the deal.II authors +// Copyright (C) 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,7 +18,9 @@ #define TYPEMAT float +DEAL_II_NAMESPACE_OPEN template class SparseMatrixEZ; +DEAL_II_NAMESPACE_CLOSE #define TYPEVEC float #include "sparse_matrix_ez_vector.in.h" diff --git a/deal.II/lac/source/sparse_matrix_ez_vector.in.h b/deal.II/lac/source/sparse_matrix_ez_vector.in.h index ca81e7ca86..067abbe80f 100644 --- a/deal.II/lac/source/sparse_matrix_ez_vector.in.h +++ b/deal.II/lac/source/sparse_matrix_ez_vector.in.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003 by the deal.II authors +// Copyright (C) 2002, 2003, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -18,6 +18,8 @@ // TYPEMAT and TYPEVEC are defined in sparse_matrix_ez?.cc +DEAL_II_NAMESPACE_OPEN + template void SparseMatrixEZ::vmult ( Vector &, const Vector &) const; @@ -62,3 +64,4 @@ template void SparseMatrixEZ::precondition_Jacobi ( const Vector &, const TYPEMAT) const; +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_matrix_matrix.in.h b/deal.II/lac/source/sparse_matrix_matrix.in.h index 4b2cdcc9c1..bb0a3cdc2c 100644 --- a/deal.II/lac/source/sparse_matrix_matrix.in.h +++ b/deal.II/lac/source/sparse_matrix_matrix.in.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ // TYPEMAT and TYPE2 are defined in sparsematrix?.cc +DEAL_II_NAMESPACE_OPEN + template SparseMatrix & SparseMatrix::copy_from (const SparseMatrix &); @@ -27,3 +29,5 @@ template void SparseMatrix::add (const TYPEMAT, template void SparseMatrix::add_scaled (const TYPEMAT, const SparseMatrix &); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_matrix_vector.in.h b/deal.II/lac/source/sparse_matrix_vector.in.h index cdd09856da..a10a204f66 100644 --- a/deal.II/lac/source/sparse_matrix_vector.in.h +++ b/deal.II/lac/source/sparse_matrix_vector.in.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -16,6 +16,8 @@ // TYPEMAT and TYPEVEC are defined in sparsematrix?.cc +DEAL_II_NAMESPACE_OPEN + template void SparseMatrix:: vmult (Vector &, const Vector &) const; template void SparseMatrix:: @@ -99,3 +101,5 @@ template void SparseMatrix:: SSOR_step (Vector &, const Vector &, const TYPEMAT) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_mic.cc b/deal.II/lac/source/sparse_mic.cc index d0216eb9a9..5fe8417df0 100644 --- a/deal.II/lac/source/sparse_mic.cc +++ b/deal.II/lac/source/sparse_mic.cc @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------- -// Copyright (C) 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2005, 2006 by the deal.II authors // by the deal.II authors and Stephen "Cheffo" Kolaroff // // This file is subject to QPL and may not be distributed @@ -11,6 +11,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations for double and float matrices template class SparseMIC; @@ -41,3 +43,5 @@ template void SparseMIC::decompose (const SparseMatrix &, template void SparseMIC::vmult (Vector &, const Vector &) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparse_vanka.cc b/deal.II/lac/source/sparse_vanka.cc index 83cf0bd39d..52a7de0b33 100644 --- a/deal.II/lac/source/sparse_vanka.cc +++ b/deal.II/lac/source/sparse_vanka.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class SparseVanka; @@ -32,3 +34,5 @@ template void SparseBlockVanka::vmult (Vector &dst, const Vector &src) const; template void SparseBlockVanka::vmult (Vector &dst, const Vector &src) const; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparsity_pattern.cc b/deal.II/lac/source/sparsity_pattern.cc index a180b864a4..e49158f19a 100644 --- a/deal.II/lac/source/sparsity_pattern.cc +++ b/deal.II/lac/source/sparsity_pattern.cc @@ -23,6 +23,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + #ifdef DEAL_II_USE_METIS extern "C" { # include @@ -1045,3 +1047,5 @@ partition (const unsigned int n_partitions, // explicit instantiations template void SparsityPattern::copy_from (const FullMatrix &, bool); template void SparsityPattern::copy_from (const FullMatrix &, bool); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/swappable_vector.cc b/deal.II/lac/source/swappable_vector.cc index db928ba572..77bc79d732 100644 --- a/deal.II/lac/source/swappable_vector.cc +++ b/deal.II/lac/source/swappable_vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2005 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,10 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class SwappableVector; template class SwappableVector; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/tridiagonal_matrix.cc b/deal.II/lac/source/tridiagonal_matrix.cc index 6a6b7a2ec0..b41877fc61 100644 --- a/deal.II/lac/source/tridiagonal_matrix.cc +++ b/deal.II/lac/source/tridiagonal_matrix.cc @@ -15,6 +15,8 @@ #include #include +DEAL_II_NAMESPACE_OPEN + using namespace LAPACKSupport; template @@ -258,3 +260,5 @@ TridiagonalMatrix:: template class TridiagonalMatrix; template class TridiagonalMatrix; + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/vector.cc b/deal.II/lac/source/vector.cc index f4ad86f165..53a5636bcc 100644 --- a/deal.II/lac/source/vector.cc +++ b/deal.II/lac/source/vector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class Vector; @@ -50,3 +52,5 @@ template void Vector::equ(const float, const Vector&); template void Vector::equ(const float, const Vector&); template void Vector::scale(const Vector&); template void Vector::scale(const Vector&); + +DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/vector.long_double.cc b/deal.II/lac/source/vector.long_double.cc index 8714654f01..300c9cc110 100644 --- a/deal.II/lac/source/vector.long_double.cc +++ b/deal.II/lac/source/vector.long_double.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,8 @@ #include +DEAL_II_NAMESPACE_OPEN + // explicit instantiations template class Vector; @@ -46,3 +48,5 @@ template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator= template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator * (const Vector &) const; template void Vector::reinit(const Vector&, const bool); template void Vector::equ(const float, const Vector&); + +DEAL_II_NAMESPACE_CLOSE