From: bangerth Date: Sun, 17 Jun 2012 19:41:48 +0000 (+0000) Subject: More changes by Bob Goodwin to make things compile with MS Visual C++. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e703f28e0710cf5d59e4e884480b4e803fd6072c;p=dealii-svn.git More changes by Bob Goodwin to make things compile with MS Visual C++. git-svn-id: https://svn.dealii.org/trunk@25634 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/symmetric_tensor.h b/deal.II/include/deal.II/base/symmetric_tensor.h index 90f6948cc8..b6ba9855e0 100644 --- a/deal.II/include/deal.II/base/symmetric_tensor.h +++ b/deal.II/include/deal.II/base/symmetric_tensor.h @@ -698,7 +698,7 @@ class SymmetricTensor * namespace is to work around * bugs in some older compilers. */ - SymmetricTensor (const Number (&array) [internal::SymmetricTensorAccessors::StorageType::n_independent_components]); + SymmetricTensor (const Number (&array) [n_independent_components]); /** * Assignment operator. @@ -1155,7 +1155,7 @@ SymmetricTensor::SymmetricTensor (const Tensor<2,dim,Number> &t template inline -SymmetricTensor::SymmetricTensor (const Number (&array) [internal::SymmetricTensorAccessors::StorageType::n_independent_components]) +SymmetricTensor::SymmetricTensor (const Number (&array) [n_independent_components]) : data (array) {} diff --git a/deal.II/include/deal.II/base/table.h b/deal.II/include/deal.II/base/table.h index 800b93d993..7d1f7d4658 100644 --- a/deal.II/include/deal.II/base/table.h +++ b/deal.II/include/deal.II/base/table.h @@ -533,7 +533,7 @@ class TableBase : public Subscriptor TableBase& operator = (const TableBase &src); /** - * Test for equality of two tables. + * Test for equality of two tables. */ bool operator == (const TableBase & T2) const; @@ -898,7 +898,7 @@ class Table<2,T> : public TableBase<2,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<2,T,true,1> + dealii::internal::TableBaseAccessors::Accessor<2,T,true,1> operator [] (const unsigned int i) const; /** @@ -911,7 +911,7 @@ class Table<2,T> : public TableBase<2,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<2,T,false,1> + dealii::internal::TableBaseAccessors::Accessor<2,T,false,1> operator [] (const unsigned int i); /** @@ -1065,7 +1065,7 @@ class Table<3,T> : public TableBase<3,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<3,T,true,2> + dealii::internal::TableBaseAccessors::Accessor<3,T,true,2> operator [] (const unsigned int i) const; /** @@ -1079,7 +1079,7 @@ class Table<3,T> : public TableBase<3,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<3,T,false,2> + dealii::internal::TableBaseAccessors::Accessor<3,T,false,2> operator [] (const unsigned int i); /** @@ -1092,8 +1092,8 @@ class Table<3,T> : public TableBase<3,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k) const; + const unsigned int j, + const unsigned int k) const; /** @@ -1106,8 +1106,8 @@ class Table<3,T> : public TableBase<3,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k); + const unsigned int j, + const unsigned int k); /** * Make the corresponding @@ -1169,7 +1169,7 @@ class Table<4,T> : public TableBase<4,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<4,T,true,3> + dealii::internal::TableBaseAccessors::Accessor<4,T,true,3> operator [] (const unsigned int i) const; /** @@ -1183,7 +1183,7 @@ class Table<4,T> : public TableBase<4,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<4,T,false,3> + dealii::internal::TableBaseAccessors::Accessor<4,T,false,3> operator [] (const unsigned int i); /** @@ -1196,9 +1196,9 @@ class Table<4,T> : public TableBase<4,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l) const; + const unsigned int j, + const unsigned int k, + const unsigned int l) const; /** @@ -1211,9 +1211,9 @@ class Table<4,T> : public TableBase<4,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l); + const unsigned int j, + const unsigned int k, + const unsigned int l); /** * Make the corresponding @@ -1278,7 +1278,7 @@ class Table<5,T> : public TableBase<5,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<5,T,true,4> + dealii::internal::TableBaseAccessors::Accessor<5,T,true,4> operator [] (const unsigned int i) const; /** @@ -1292,7 +1292,7 @@ class Table<5,T> : public TableBase<5,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<5,T,false,4> + dealii::internal::TableBaseAccessors::Accessor<5,T,false,4> operator [] (const unsigned int i); /** @@ -1305,10 +1305,10 @@ class Table<5,T> : public TableBase<5,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m) const; + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m) const; /** * Direct access to one element @@ -1320,10 +1320,10 @@ class Table<5,T> : public TableBase<5,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m); + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m); /** * Make the corresponding @@ -1389,7 +1389,7 @@ class Table<6,T> : public TableBase<6,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<6,T,true,5> + dealii::internal::TableBaseAccessors::Accessor<6,T,true,5> operator [] (const unsigned int i) const; /** @@ -1403,7 +1403,7 @@ class Table<6,T> : public TableBase<6,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<6,T,false,5> + dealii::internal::TableBaseAccessors::Accessor<6,T,false,5> operator [] (const unsigned int i); /** @@ -1416,11 +1416,11 @@ class Table<6,T> : public TableBase<6,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m, - const unsigned int n) const; + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m, + const unsigned int n) const; /** * Direct access to one element @@ -1432,11 +1432,11 @@ class Table<6,T> : public TableBase<6,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m, - const unsigned int n); + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m, + const unsigned int n); /** * Make the corresponding @@ -1502,7 +1502,7 @@ class Table<7,T> : public TableBase<7,T> * This version of the function * only allows read access. */ - internal::TableBaseAccessors::Accessor<7,T,true,6> + dealii::internal::TableBaseAccessors::Accessor<7,T,true,6> operator [] (const unsigned int i) const; /** @@ -1516,7 +1516,7 @@ class Table<7,T> : public TableBase<7,T> * This version of the function * allows read-write access. */ - internal::TableBaseAccessors::Accessor<7,T,false,6> + dealii::internal::TableBaseAccessors::Accessor<7,T,false,6> operator [] (const unsigned int i); /** @@ -1529,12 +1529,12 @@ class Table<7,T> : public TableBase<7,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m, - const unsigned int n, - const unsigned int o) const; + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m, + const unsigned int n, + const unsigned int o) const; /** * Direct access to one element @@ -1546,12 +1546,12 @@ class Table<7,T> : public TableBase<7,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j, - const unsigned int k, - const unsigned int l, - const unsigned int m, - const unsigned int n, - const unsigned int o); + const unsigned int j, + const unsigned int k, + const unsigned int l, + const unsigned int m, + const unsigned int n, + const unsigned int o); /** * Make the corresponding @@ -1629,7 +1629,7 @@ class TransposeTable : public TableBase<2,T> * only allows read access. */ typename std::vector::const_reference operator () (const unsigned int i, - const unsigned int j) const; + const unsigned int j) const; /** * Direct access to one element @@ -1641,7 +1641,7 @@ class TransposeTable : public TableBase<2,T> * allows read-write access. */ typename std::vector::reference operator () (const unsigned int i, - const unsigned int j); + const unsigned int j); /** * Number of rows. This function @@ -1676,7 +1676,7 @@ class TransposeTable : public TableBase<2,T> * then called vector2d. */ typename std::vector::reference el (const unsigned int i, - const unsigned int j); + const unsigned int j); /** * Return the value of the @@ -1703,7 +1703,7 @@ class TransposeTable : public TableBase<2,T> * then called vector2d. */ typename std::vector::const_reference el (const unsigned int i, - const unsigned int j) const; + const unsigned int j) const; }; @@ -2306,26 +2306,26 @@ Table<2,T>::reinit (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<2,T,true,1> +dealii::internal::TableBaseAccessors::Accessor<2,T,true,1> Table<2,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); - return internal::TableBaseAccessors::Accessor<2,T,true,1>(*this, - this->values.begin()+i*n_cols()); + return dealii::internal::TableBaseAccessors::Accessor<2,T,true,1>(*this, + this->values.begin()+i*n_cols()); } template inline -internal::TableBaseAccessors::Accessor<2,T,false,1> +dealii::internal::TableBaseAccessors::Accessor<2,T,false,1> Table<2,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); - return internal::TableBaseAccessors::Accessor<2,T,false,1>(*this, - this->values.begin()+i*n_cols()); + return dealii::internal::TableBaseAccessors::Accessor<2,T,false,1>(*this, + this->values.begin()+i*n_cols()); } @@ -2548,14 +2548,14 @@ Table<3,T>::Table (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<3,T,true,2> +dealii::internal::TableBaseAccessors::Accessor<3,T,true,2> Table<3,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); const unsigned int subobject_size = this->table_size[1] * this->table_size[2]; - return (internal::TableBaseAccessors::Accessor<3,T,true,2> + return (dealii::internal::TableBaseAccessors::Accessor<3,T,true,2> (*this, this->values.begin() + i*subobject_size)); } @@ -2564,14 +2564,14 @@ Table<3,T>::operator [] (const unsigned int i) const template inline -internal::TableBaseAccessors::Accessor<3,T,false,2> +dealii::internal::TableBaseAccessors::Accessor<3,T,false,2> Table<3,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); const unsigned int subobject_size = this->table_size[1] * this->table_size[2]; - return (internal::TableBaseAccessors::Accessor<3,T,false,2> + return (dealii::internal::TableBaseAccessors::Accessor<3,T,false,2> (*this, this->values.begin() + i*subobject_size)); } @@ -2592,7 +2592,7 @@ Table<3,T>::operator () (const unsigned int i, Assert (k < this->table_size[2], ExcIndexRange (k, 0, this->table_size[2])); return this->values[(i*this->table_size[1]+j) - *this->table_size[2] + k]; + *this->table_size[2] + k]; } @@ -2611,7 +2611,7 @@ Table<3,T>::operator () (const unsigned int i, Assert (k < this->table_size[2], ExcIndexRange (k, 0, this->table_size[2])); return this->values[(i*this->table_size[1]+j) - *this->table_size[2] + k]; + *this->table_size[2] + k]; } @@ -2657,7 +2657,7 @@ Table<4,T>::Table (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<4,T,true,3> +dealii::internal::TableBaseAccessors::Accessor<4,T,true,3> Table<4,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], @@ -2665,7 +2665,7 @@ Table<4,T>::operator [] (const unsigned int i) const const unsigned int subobject_size = this->table_size[1] * this->table_size[2] * this->table_size[3]; - return (internal::TableBaseAccessors::Accessor<4,T,true,3> + return (dealii::internal::TableBaseAccessors::Accessor<4,T,true,3> (*this, this->values.begin() + i*subobject_size)); } @@ -2674,7 +2674,7 @@ Table<4,T>::operator [] (const unsigned int i) const template inline -internal::TableBaseAccessors::Accessor<4,T,false,3> +dealii::internal::TableBaseAccessors::Accessor<4,T,false,3> Table<4,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], @@ -2682,7 +2682,7 @@ Table<4,T>::operator [] (const unsigned int i) const unsigned int subobject_size = this->table_size[1] * this->table_size[2] * this->table_size[3]; - return (internal::TableBaseAccessors::Accessor<4,T,false,3> + return (dealii::internal::TableBaseAccessors::Accessor<4,T,false,3> (*this, this->values.begin() + i*subobject_size)); } @@ -2706,8 +2706,8 @@ Table<4,T>::operator () (const unsigned int i, Assert (l < this->table_size[3], ExcIndexRange (l, 0, this->table_size[3])); return this->values[((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l]; + *this->table_size[2] + k) + *this->table_size[3] + l]; } @@ -2729,8 +2729,8 @@ Table<4,T>::operator () (const unsigned int i, Assert (l < this->table_size[3], ExcIndexRange (l, 0, this->table_size[3])); return this->values[((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l]; + *this->table_size[2] + k) + *this->table_size[3] + l]; } @@ -2777,7 +2777,7 @@ Table<5,T>::Table (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<5,T,true,4> +dealii::internal::TableBaseAccessors::Accessor<5,T,true,4> Table<5,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], @@ -2786,7 +2786,7 @@ Table<5,T>::operator [] (const unsigned int i) const this->table_size[2] * this->table_size[3] * this->table_size[4]; - return (internal::TableBaseAccessors::Accessor<5,T,true,4> + return (dealii::internal::TableBaseAccessors::Accessor<5,T,true,4> (*this, this->values.begin() + i*subobject_size)); } @@ -2795,7 +2795,7 @@ Table<5,T>::operator [] (const unsigned int i) const template inline -internal::TableBaseAccessors::Accessor<5,T,false,4> +dealii::internal::TableBaseAccessors::Accessor<5,T,false,4> Table<5,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], @@ -2804,7 +2804,7 @@ Table<5,T>::operator [] (const unsigned int i) this->table_size[2] * this->table_size[3] * this->table_size[4]; - return (internal::TableBaseAccessors::Accessor<5,T,false,4> + return (dealii::internal::TableBaseAccessors::Accessor<5,T,false,4> (*this, this->values.begin() + i*subobject_size)); } @@ -2831,9 +2831,9 @@ Table<5,T>::operator () (const unsigned int i, Assert (m < this->table_size[4], ExcIndexRange (m, 0, this->table_size[4])); return this->values[(((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m]; } @@ -2858,9 +2858,9 @@ Table<5,T>::operator () (const unsigned int i, Assert (m < this->table_size[4], ExcIndexRange (m, 0, this->table_size[4])); return this->values[(((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m]; } @@ -2908,7 +2908,7 @@ Table<6,T>::Table (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<6,T,true,5> +dealii::internal::TableBaseAccessors::Accessor<6,T,true,5> Table<6,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], @@ -2918,7 +2918,7 @@ Table<6,T>::operator [] (const unsigned int i) const this->table_size[3] * this->table_size[4] * this->table_size[5]; - return (internal::TableBaseAccessors::Accessor<6,T,true,5> + return (dealii::internal::TableBaseAccessors::Accessor<6,T,true,5> (*this, this->values.begin() + i*subobject_size)); } @@ -2927,7 +2927,7 @@ Table<6,T>::operator [] (const unsigned int i) const template inline -internal::TableBaseAccessors::Accessor<6,T,false,5> +dealii::internal::TableBaseAccessors::Accessor<6,T,false,5> Table<6,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], @@ -2937,7 +2937,7 @@ Table<6,T>::operator [] (const unsigned int i) this->table_size[3] * this->table_size[4] * this->table_size[5]; - return (internal::TableBaseAccessors::Accessor<6,T,false,5> + return (dealii::internal::TableBaseAccessors::Accessor<6,T,false,5> (*this, this->values.begin() + i*subobject_size)); } @@ -2967,10 +2967,10 @@ Table<6,T>::operator () (const unsigned int i, Assert (n < this->table_size[5], ExcIndexRange (n, 0, this->table_size[5])); return this->values[((((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m) - *this->table_size[5] + n]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m) + *this->table_size[5] + n]; } @@ -2998,10 +2998,10 @@ Table<6,T>::operator () (const unsigned int i, Assert (n < this->table_size[5], ExcIndexRange (n, 0, this->table_size[5])); return this->values[((((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m) - *this->table_size[5] + n]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m) + *this->table_size[5] + n]; } @@ -3050,7 +3050,7 @@ Table<7,T>::Table (const unsigned int size1, template inline -internal::TableBaseAccessors::Accessor<7,T,true,6> +dealii::internal::TableBaseAccessors::Accessor<7,T,true,6> Table<7,T>::operator [] (const unsigned int i) const { Assert (i < this->table_size[0], @@ -3061,7 +3061,7 @@ Table<7,T>::operator [] (const unsigned int i) const this->table_size[4] * this->table_size[5] * this->table_size[6]; - return (internal::TableBaseAccessors::Accessor<7,T,true,6> + return (dealii::internal::TableBaseAccessors::Accessor<7,T,true,6> (*this, this->values.begin() + i*subobject_size)); } @@ -3070,7 +3070,7 @@ Table<7,T>::operator [] (const unsigned int i) const template inline -internal::TableBaseAccessors::Accessor<7,T,false,6> +dealii::internal::TableBaseAccessors::Accessor<7,T,false,6> Table<7,T>::operator [] (const unsigned int i) { Assert (i < this->table_size[0], @@ -3081,7 +3081,7 @@ Table<7,T>::operator [] (const unsigned int i) this->table_size[4] * this->table_size[5] * this->table_size[6]; - return (internal::TableBaseAccessors::Accessor<7,T,false,6> + return (dealii::internal::TableBaseAccessors::Accessor<7,T,false,6> (*this, this->values.begin() + i*subobject_size)); } @@ -3114,11 +3114,11 @@ Table<7,T>::operator () (const unsigned int i, Assert (o < this->table_size[6], ExcIndexRange (o, 0, this->table_size[6])); return this->values[(((((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m) - *this->table_size[5] + n) - *this->table_size[6] + o]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m) + *this->table_size[5] + n) + *this->table_size[6] + o]; } @@ -3149,11 +3149,11 @@ Table<7,T>::operator () (const unsigned int i, Assert (o < this->table_size[5], ExcIndexRange (o, 0, this->table_size[6])); return this->values[(((((i*this->table_size[1]+j) - *this->table_size[2] + k) - *this->table_size[3] + l) - *this->table_size[4] + m) - *this->table_size[5] + n) - *this->table_size[6] + o]; + *this->table_size[2] + k) + *this->table_size[3] + l) + *this->table_size[4] + m) + *this->table_size[5] + n) + *this->table_size[6] + o]; } diff --git a/deal.II/include/deal.II/dofs/dof_accessor.h b/deal.II/include/deal.II/dofs/dof_accessor.h index 0ceee3f85d..ccb6d05160 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.h @@ -169,7 +169,7 @@ namespace internal * @author Wolfgang Bangerth, 1998, 2006, 2008 */ template -class DoFAccessor : public internal::DoFAccessor::Inheritance::BaseClass +class DoFAccessor : public dealii::internal::DoFAccessor::Inheritance::BaseClass { public: @@ -194,7 +194,7 @@ class DoFAccessor : public internal::DoFAccessor::Inheritance::BaseClass + typename dealii::internal::DoFAccessor::Inheritance::BaseClass BaseClass; /** @@ -309,14 +309,14 @@ class DoFAccessor : public internal::DoFAccessor::Inheritance::line_iterator + typename dealii::internal::DoFHandler::Iterators::line_iterator line (const unsigned int i) const; /** * Pointer to the @p ith quad * bounding this object. */ - typename internal::DoFHandler::Iterators::quad_iterator + typename dealii::internal::DoFHandler::Iterators::quad_iterator quad (const unsigned int i) const; /** @@ -767,10 +767,10 @@ class DoFAccessor : public internal::DoFAccessor::Inheritance friend class DoFHandler; template friend class hp::DoFHandler; - friend struct internal::DoFHandler::Policy::Implementation; - friend struct internal::DoFHandler::Implementation; - friend struct internal::hp::DoFHandler::Implementation; - friend struct internal::DoFCellAccessor::Implementation; + friend struct dealii::internal::DoFHandler::Policy::Implementation; + friend struct dealii::internal::DoFHandler::Implementation; + friend struct dealii::internal::hp::DoFHandler::Implementation; + friend struct dealii::internal::DoFCellAccessor::Implementation; }; @@ -973,14 +973,14 @@ class DoFAccessor<0,DH<1,spacedim> > : public TriaAccessor<0,1,spacedim> * Pointer to the @p ith line * bounding this object. */ - typename internal::DoFHandler::Iterators >::line_iterator + typename dealii::internal::DoFHandler::Iterators >::line_iterator line (const unsigned int i) const; /** * Pointer to the @p ith quad * bounding this object. */ - typename internal::DoFHandler::Iterators >::quad_iterator + typename dealii::internal::DoFHandler::Iterators >::quad_iterator quad (const unsigned int i) const; /** @@ -1410,10 +1410,10 @@ class DoFAccessor<0,DH<1,spacedim> > : public TriaAccessor<0,1,spacedim> template friend class DoFHandler; template friend class hp::DoFHandler; - friend struct internal::DoFHandler::Policy::Implementation; - friend struct internal::DoFHandler::Implementation; - friend struct internal::hp::DoFHandler::Implementation; - friend struct internal::DoFCellAccessor::Implementation; + friend struct dealii::internal::DoFHandler::Policy::Implementation; + friend struct dealii::internal::DoFHandler::Implementation; + friend struct dealii::internal::hp::DoFHandler::Implementation; + friend struct dealii::internal::DoFCellAccessor::Implementation; }; @@ -1529,7 +1529,7 @@ class DoFCellAccessor : public DoFAccessor * without access to the DoF * data. */ - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator parent () const; /** @@ -1548,7 +1548,7 @@ class DoFCellAccessor : public DoFAccessor * without access to the DoF * data. */ - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator neighbor (const unsigned int) const; /** @@ -1560,7 +1560,7 @@ class DoFCellAccessor : public DoFAccessor * without access to the DoF * data. */ - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator child (const unsigned int) const; /** @@ -1571,7 +1571,7 @@ class DoFCellAccessor : public DoFAccessor * 1D, and maps to DoFAccessor::line * in 2D. */ - typename internal::DoFHandler::Iterators::face_iterator + typename dealii::internal::DoFHandler::Iterators::face_iterator face (const unsigned int i) const; /** @@ -1585,7 +1585,7 @@ class DoFCellAccessor : public DoFAccessor * access to the triangulation * data). */ - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator neighbor_child_on_subface (const unsigned int face_no, const unsigned int subface_no) const; @@ -2106,7 +2106,7 @@ class DoFCellAccessor : public DoFAccessor * function */ template friend class DoFHandler; - friend struct internal::DoFCellAccessor::Implementation; + friend struct dealii::internal::DoFCellAccessor::Implementation; }; diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index 9c4435ad90..dedeae9968 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -48,10 +48,10 @@ DoFAccessor::DoFAccessor ( const int index, const DH *dof_handler) : - internal::DoFAccessor::Inheritance::BaseClass (tria, - level, - index), + dealii::internal::DoFAccessor::Inheritance::BaseClass (tria, + level, + index), dof_handler(const_cast(dof_handler)) {} @@ -224,7 +224,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>) + dealii::internal::int2type<1>) { return dof_handler.levels[obj_level]->lines. get_dof_index (dof_handler, @@ -242,7 +242,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>, + dealii::internal::int2type<1>, const unsigned int global_index) { dof_handler.levels[obj_level]->lines. @@ -262,7 +262,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>) + dealii::internal::int2type<1>) { // faces have no levels Assert (obj_level == 0, ExcInternalError()); @@ -282,7 +282,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>, + dealii::internal::int2type<1>, const unsigned int global_index) { // faces have no levels @@ -304,7 +304,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<2>) + dealii::internal::int2type<2>) { return dof_handler.levels[obj_level]->quads. get_dof_index (dof_handler, @@ -322,7 +322,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<2>, + dealii::internal::int2type<2>, const unsigned int global_index) { dof_handler.levels[obj_level]->quads. @@ -342,7 +342,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>) + dealii::internal::int2type<1>) { // faces have no levels Assert (obj_level == 0, ExcInternalError()); @@ -362,7 +362,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<1>, + dealii::internal::int2type<1>, const unsigned int global_index) { // faces have no levels @@ -385,7 +385,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<2>) + dealii::internal::int2type<2>) { // faces have no levels Assert (obj_level == 0, ExcInternalError()); @@ -405,7 +405,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<2>, + dealii::internal::int2type<2>, const unsigned int global_index) { // faces have no levels @@ -428,7 +428,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<3>) + dealii::internal::int2type<3>) { return dof_handler.levels[obj_level]->hexes. get_dof_index (dof_handler, @@ -446,7 +446,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - internal::int2type<3>, + dealii::internal::int2type<3>, const unsigned int global_index) { dof_handler.levels[obj_level]->hexes. @@ -466,7 +466,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.levels[obj_level]->lines. get_dof_index (dof_handler, @@ -485,7 +485,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &, + const dealii::internal::int2type<1> &, const unsigned int global_index) { dof_handler.levels[obj_level]->lines. @@ -506,7 +506,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines. get_dof_index (dof_handler, @@ -525,7 +525,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &, + const dealii::internal::int2type<1> &, const unsigned int global_index) { dof_handler.faces->lines. @@ -546,7 +546,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.levels[obj_level]->quads. get_dof_index (dof_handler, @@ -565,7 +565,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<2> &, + const dealii::internal::int2type<2> &, const unsigned int global_index) { dof_handler.levels[obj_level]->quads. @@ -586,7 +586,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines. get_dof_index (dof_handler, @@ -605,7 +605,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<1> &, + const dealii::internal::int2type<1> &, const unsigned int global_index) { dof_handler.faces->lines. @@ -626,7 +626,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.faces->quads. get_dof_index (dof_handler, @@ -645,7 +645,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<2> &, + const dealii::internal::int2type<2> &, const unsigned int global_index) { dof_handler.faces->quads. @@ -666,7 +666,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<3> &) + const dealii::internal::int2type<3> &) { return dof_handler.levels[obj_level]->hexes. get_dof_index (dof_handler, @@ -685,7 +685,7 @@ namespace internal const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, - const internal::int2type<3> &, + const dealii::internal::int2type<3> &, const unsigned int global_index) { dof_handler.levels[obj_level]->hexes. @@ -705,7 +705,7 @@ namespace internal const unsigned int, const unsigned int, const unsigned int fe_index, - const internal::int2type &) + const dealii::internal::int2type &) { return (fe_index == 0); } @@ -718,7 +718,7 @@ namespace internal n_active_fe_indices (const dealii::DoFHandler &dof_handler, const unsigned int obj_level, const unsigned int obj_index, - const internal::int2type &) + const dealii::internal::int2type &) { // check that the object we look // at is in fact active. the @@ -768,7 +768,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type &) + const dealii::internal::int2type &) { // check that the object we look // at is in fact active. the @@ -819,7 +819,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.levels[obj_level]->lines.fe_index_is_active(dof_handler, obj_index, @@ -834,7 +834,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<1,spacedim> &dof_handler, const unsigned int obj_level, const unsigned int obj_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.levels[obj_level]->lines.n_active_fe_indices (dof_handler, obj_index); @@ -849,7 +849,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.levels[obj_level]->lines.nth_active_fe_index (dof_handler, obj_level, @@ -865,7 +865,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.fe_index_is_active(dof_handler, obj_index, @@ -880,7 +880,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<2,spacedim> &dof_handler, const unsigned int , const unsigned int obj_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.n_active_fe_indices (dof_handler, obj_index); @@ -894,7 +894,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.nth_active_fe_index (dof_handler, obj_level, @@ -911,7 +911,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.levels[obj_level]->quads.fe_index_is_active(dof_handler, obj_index, @@ -926,7 +926,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<2,spacedim> &dof_handler, const unsigned int obj_level, const unsigned int obj_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.levels[obj_level]->quads.n_active_fe_indices (dof_handler, obj_index); @@ -941,7 +941,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.levels[obj_level]->quads.nth_active_fe_index (dof_handler, obj_level, @@ -958,7 +958,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.fe_index_is_active(dof_handler, obj_index, @@ -973,7 +973,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<3,spacedim> &dof_handler, const unsigned int, const unsigned int obj_index, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.n_active_fe_indices (dof_handler, obj_index); @@ -988,7 +988,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<1> &) + const dealii::internal::int2type<1> &) { return dof_handler.faces->lines.nth_active_fe_index (dof_handler, obj_level, @@ -1005,7 +1005,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.faces->quads.fe_index_is_active(dof_handler, obj_index, @@ -1020,7 +1020,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, - const internal::int2type<3> &) + const dealii::internal::int2type<3> &) { return dof_handler.levels[obj_level]->hexes.fe_index_is_active(dof_handler, obj_index, @@ -1035,7 +1035,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<3,spacedim> &dof_handler, const unsigned int , const unsigned int obj_index, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.faces->quads.n_active_fe_indices (dof_handler, obj_index); @@ -1050,7 +1050,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<2> &) + const dealii::internal::int2type<2> &) { return dof_handler.faces->quads.nth_active_fe_index (dof_handler, obj_level, @@ -1066,7 +1066,7 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler<3,spacedim> &dof_handler, const unsigned int obj_level, const unsigned int obj_index, - const internal::int2type<3> &) + const dealii::internal::int2type<3> &) { return dof_handler.levels[obj_level]->hexes.n_active_fe_indices (dof_handler, obj_index); @@ -1081,7 +1081,7 @@ namespace internal const unsigned int obj_level, const unsigned int obj_index, const unsigned int n, - const internal::int2type<3> &) + const dealii::internal::int2type<3> &) { return dof_handler.levels[obj_level]->hexes.nth_active_fe_index (dof_handler, obj_level, @@ -1439,12 +1439,12 @@ DoFAccessor::dof_index (const unsigned int i, const unsigned int fe_index) const { // access the respective DoF - return internal::DoFAccessor::Implementation::get_dof_index (*this->dof_handler, - this->level(), - this->present_index, - fe_index, - i, - internal::int2type()); + return dealii::internal::DoFAccessor::Implementation::get_dof_index (*this->dof_handler, + this->level(), + this->present_index, + fe_index, + i, + dealii::internal::int2type()); } @@ -1457,13 +1457,13 @@ DoFAccessor::set_dof_index (const unsigned int i, const unsigned int fe_index) const { // access the respective DoF - internal::DoFAccessor::Implementation::set_dof_index (*this->dof_handler, - this->level(), - this->present_index, - fe_index, - i, - internal::int2type(), - index); + dealii::internal::DoFAccessor::Implementation::set_dof_index (*this->dof_handler, + this->level(), + this->present_index, + fe_index, + i, + dealii::internal::int2type(), + index); } @@ -1475,11 +1475,11 @@ DoFAccessor::n_active_fe_indices () const { // access the respective DoF return - internal::DoFAccessor::Implementation:: + dealii::internal::DoFAccessor::Implementation:: n_active_fe_indices (*this->dof_handler, - this->level(), - this->present_index, - internal::int2type()); + this->level(), + this->present_index, + dealii::internal::int2type()); } @@ -1491,12 +1491,12 @@ DoFAccessor::nth_active_fe_index (const unsigned int n) const { // access the respective DoF return - internal::DoFAccessor::Implementation:: + dealii::internal::DoFAccessor::Implementation:: nth_active_fe_index (*this->dof_handler, - this->level(), - this->present_index, - n, - internal::int2type()); + this->level(), + this->present_index, + n, + dealii::internal::int2type()); } @@ -1508,12 +1508,12 @@ DoFAccessor::fe_index_is_active (const unsigned int fe_index) const { // access the respective DoF return - internal::DoFAccessor::Implementation:: + dealii::internal::DoFAccessor::Implementation:: fe_index_is_active (*this->dof_handler, this->level(), this->present_index, fe_index, - internal::int2type()); + dealii::internal::int2type()); } @@ -1526,7 +1526,7 @@ DoFAccessor::vertex_dof_index (const unsigned int vertex, const unsigned int fe_index) const { return - internal::DoFAccessor::Implementation::get_vertex_dof_index + dealii::internal::DoFAccessor::Implementation::get_vertex_dof_index (*this->dof_handler, this->vertex_index(vertex), fe_index, @@ -1543,7 +1543,7 @@ DoFAccessor::set_vertex_dof_index (const unsigned int vertex, const unsigned int index, const unsigned int fe_index) const { - internal::DoFAccessor::Implementation::set_vertex_dof_index + dealii::internal::DoFAccessor::Implementation::set_vertex_dof_index (*this->dof_handler, this->vertex_index(vertex), fe_index, @@ -1591,7 +1591,7 @@ DoFAccessor::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")); - return internal::DoFAccessor::get_fe (this->dof_handler->get_fe(), fe_index); + return dealii::internal::DoFAccessor::get_fe (this->dof_handler->get_fe(), fe_index); } @@ -1770,7 +1770,7 @@ DoFAccessor::get_dof_indices (std::vector &dof_indic ExcInternalError()); // now do the actual work - internal::DoFAccessor::get_dof_indices (*this, dof_indices, fe_index); + dealii::internal::DoFAccessor::get_dof_indices (*this, dof_indices, fe_index); } @@ -1779,14 +1779,14 @@ DoFAccessor::get_dof_indices (std::vector &dof_indic template inline -typename internal::DoFHandler::Iterators::line_iterator +typename dealii::internal::DoFHandler::Iterators::line_iterator DoFAccessor::line (const unsigned int i) const { Assert (structdim > 1, ExcImpossibleInDim(structdim)); // checking of 'i' happens in // line_index(i) - return typename internal::DoFHandler::Iterators::line_iterator + return typename dealii::internal::DoFHandler::Iterators::line_iterator ( this->tria, 0, // only sub-objects are allowed, which have no level @@ -1798,14 +1798,14 @@ DoFAccessor::line (const unsigned int i) const template inline -typename internal::DoFHandler::Iterators::quad_iterator +typename dealii::internal::DoFHandler::Iterators::quad_iterator DoFAccessor::quad (const unsigned int i) const { Assert (structdim > 2, ExcImpossibleInDim(structdim)); // checking of 'i' happens in // quad_index(i) - return typename internal::DoFHandler::Iterators::quad_iterator + return typename dealii::internal::DoFHandler::Iterators::quad_iterator ( this->tria, 0, // only sub-objects are allowed, which have no level @@ -1908,7 +1908,7 @@ get_dof_indices (std::vector &dof_indices, { for (unsigned int i=0; iglobal_vertex_index, fe_index, @@ -1926,7 +1926,7 @@ vertex_dof_index (const unsigned int vertex, const unsigned int fe_index) const { Assert (vertex == 0, ExcIndexRange (vertex, 0, 1)); - return internal::DoFAccessor::Implementation:: + return dealii::internal::DoFAccessor::Implementation:: get_vertex_dof_index (*dof_handler, this->global_vertex_index, fe_index, @@ -1990,7 +1990,7 @@ namespace internal // make sure we refer to class // dealii::DoFCellAccessor, not // namespace - // internal::DoFCellAccessor + // dealii::internal::DoFCellAccessor using dealii::DoFCellAccessor; using dealii::DoFHandler; @@ -2727,7 +2727,7 @@ namespace internal unsigned int * dofs = &accessor.dof_handler->levels[accessor.level()] ->cell_dof_indices_cache[accessor.present_index * n_dofs]; - // distribute cell vector + // distribute cell vector global_destination.add(n_dofs, dofs, local_source_begin); } @@ -2755,11 +2755,11 @@ namespace internal //TODO[WB/MK]: This function could me made more efficient because it allocates memory, which could be avoided by passing in another argument as a scratch array. This should be fixed eventually - // get indices of dofs + // get indices of dofs std::vector dofs (n_dofs); accessor.get_dof_indices (dofs); - // distribute cell vector + // distribute cell vector global_destination.add (n_dofs, dofs.begin(), local_source_begin); } @@ -2798,7 +2798,7 @@ namespace internal unsigned int * dofs = &accessor.dof_handler->levels[accessor.level()] ->cell_dof_indices_cache[accessor.present_index * n_dofs]; - // distribute cell vector + // distribute cell vector constraints.distribute_local_to_global (local_source_begin, local_source_end, dofs, global_destination); } @@ -2828,11 +2828,11 @@ namespace internal //TODO[WB/MK]: This function could me made more efficient because it allocates memory, which could be avoided by passing in another argument as a scratch array. This should be fixed eventually - // get indices of dofs + // get indices of dofs std::vector dofs (n_dofs); accessor.get_dof_indices (dofs); - // distribute cell vector + // distribute cell vector constraints.distribute_local_to_global (local_source_begin, local_source_end, dofs.begin(), global_destination); } @@ -2874,7 +2874,7 @@ namespace internal unsigned int * dofs = &accessor.dof_handler->levels[accessor.level()] ->cell_dof_indices_cache[accessor.present_index * n_dofs]; - // distribute cell matrix + // distribute cell matrix for (unsigned int i=0; i dofs (n_dofs); accessor.get_dof_indices (dofs); - // distribute cell matrix + // distribute cell matrix global_destination.add(dofs,local_source); } @@ -2958,7 +2958,7 @@ namespace internal unsigned int * dofs = &accessor.dof_handler->levels[accessor.level()] ->cell_dof_indices_cache[accessor.present_index * n_dofs]; - // distribute cell matrices + // distribute cell matrices for (unsigned int i=0; i dofs (n_dofs); accessor.get_dof_indices (dofs); - // distribute cell matrix and vector + // distribute cell matrix and vector global_matrix.add(dofs,local_matrix); global_vector.add(dofs,local_vector); } @@ -3051,10 +3051,10 @@ DoFCellAccessor (const DoFAccessor &) template inline -typename internal::DoFHandler::Iterators::cell_iterator +typename dealii::internal::DoFHandler::Iterators::cell_iterator DoFCellAccessor::neighbor (const unsigned int i) const { - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator q (this->tria, this->neighbor_level (i), this->neighbor_index (i), @@ -3070,10 +3070,10 @@ DoFCellAccessor::neighbor (const unsigned int i) const template inline -typename internal::DoFHandler::Iterators::cell_iterator +typename dealii::internal::DoFHandler::Iterators::cell_iterator DoFCellAccessor::child (const unsigned int i) const { - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator q (this->tria, this->level()+1, this->child_index (i), @@ -3089,10 +3089,10 @@ DoFCellAccessor::child (const unsigned int i) const template inline -typename internal::DoFHandler::Iterators::cell_iterator +typename dealii::internal::DoFHandler::Iterators::cell_iterator DoFCellAccessor::parent () const { - typename internal::DoFHandler::Iterators::cell_iterator + typename dealii::internal::DoFHandler::Iterators::cell_iterator q (this->tria, this->level() - 1, this->parent_index (), @@ -3108,10 +3108,10 @@ namespace internal { template inline - typename internal::DoFHandler::Iterators::face_iterator + typename dealii::internal::DoFHandler::Iterators::face_iterator get_face (const dealii::DoFCellAccessor &cell, const unsigned int i, - const internal::int2type<1>) + const dealii::internal::int2type<1>) { dealii::DoFAccessor<0, DH> a (&cell.get_triangulation(), @@ -3126,16 +3126,16 @@ namespace internal dealii::TriaAccessor<0, 1, DH::space_dimension>::interior_vertex)), cell.vertex_index(i), &cell.get_dof_handler()); - return typename internal::DoFHandler::Iterators::face_iterator(a); + return typename dealii::internal::DoFHandler::Iterators::face_iterator(a); } template inline - typename internal::DoFHandler::Iterators::face_iterator + typename dealii::internal::DoFHandler::Iterators::face_iterator get_face (const dealii::DoFCellAccessor &cell, const unsigned int i, - const internal::int2type<2>) + const dealii::internal::int2type<2>) { return cell.line(i); } @@ -3143,10 +3143,10 @@ namespace internal template inline - typename internal::DoFHandler::Iterators::face_iterator + typename dealii::internal::DoFHandler::Iterators::face_iterator get_face (const dealii::DoFCellAccessor &cell, const unsigned int i, - const internal::int2type<3>) + const dealii::internal::int2type<3>) { return cell.quad(i); } @@ -3155,7 +3155,7 @@ namespace internal template -typename internal::DoFHandler::Iterators::face_iterator +typename dealii::internal::DoFHandler::Iterators::face_iterator DoFCellAccessor::face (const unsigned int i) const { Assert (i::faces_per_cell, ExcIndexRange (i, 0, GeometryInfo::faces_per_cell)); @@ -3163,7 +3163,7 @@ DoFCellAccessor::face (const unsigned int i) const ExcMessage ("DoFHandler not initialized")); const unsigned int dim = DH::dimension; - return internal::DoFCellAccessor::get_face (*this, i, internal::int2type()); + return dealii::internal::DoFCellAccessor::get_face (*this, i, dealii::internal::int2type()); } @@ -3178,7 +3178,7 @@ get_dof_indices (std::vector &dof_indices) const ExcMessage ("Can't ask for DoF indices on artificial cells.")); AssertDimension (dof_indices.size(), this->get_fe().dofs_per_cell); - internal::DoFCellAccessor::Implementation::get_dof_indices (*this, dof_indices); + dealii::internal::DoFCellAccessor::Implementation::get_dof_indices (*this, dof_indices); } @@ -3193,7 +3193,7 @@ DoFCellAccessor::get_dof_values (const InputVector &values, ExcMessage ("Can't ask for DoF indices on artificial cells.")); AssertDimension (local_values.size(), this->get_fe().dofs_per_cell); - internal::DoFCellAccessor::Implementation + dealii::internal::DoFCellAccessor::Implementation ::get_dof_values (*this, values, local_values.begin(), local_values.end()); } @@ -3208,7 +3208,7 @@ DoFCellAccessor::get_dof_values (const InputVector &values, { Assert (this->is_artificial() == false, ExcMessage ("Can't ask for DoF indices on artificial cells.")); - internal::DoFCellAccessor::Implementation + dealii::internal::DoFCellAccessor::Implementation ::get_dof_values (*this, values, local_values_begin, local_values_end); } @@ -3224,7 +3224,7 @@ DoFCellAccessor::get_dof_values (const ConstraintMatrix &constraints, { Assert (this->is_artificial() == false, ExcMessage ("Can't ask for DoF indices on artificial cells.")); - internal::DoFCellAccessor::Implementation + dealii::internal::DoFCellAccessor::Implementation ::get_dof_values (*this, constraints, values, local_values_begin, local_values_end); } @@ -3239,7 +3239,7 @@ DoFCellAccessor::set_dof_values (const Vector &local_values, { Assert (this->is_artificial() == false, ExcMessage ("Can't ask for DoF indices on artificial cells.")); - internal::DoFCellAccessor::Implementation + dealii::internal::DoFCellAccessor::Implementation ::set_dof_values (*this, local_values, values); } @@ -3250,7 +3250,7 @@ inline const FiniteElement & DoFCellAccessor::get_fe () const { - return internal::DoFAccessor::get_fe (this->dof_handler->get_fe(), active_fe_index()); + return dealii::internal::DoFAccessor::get_fe (this->dof_handler->get_fe(), active_fe_index()); } @@ -3260,7 +3260,7 @@ inline unsigned int DoFCellAccessor::active_fe_index () const { - return internal::DoFCellAccessor::Implementation::active_fe_index (*this); + return dealii::internal::DoFCellAccessor::Implementation::active_fe_index (*this); } @@ -3270,7 +3270,7 @@ inline void DoFCellAccessor::set_active_fe_index (const unsigned int i) { - internal::DoFCellAccessor::Implementation::set_active_fe_index (*this, i); + dealii::internal::DoFCellAccessor::Implementation::set_active_fe_index (*this, i); } @@ -3284,7 +3284,7 @@ DoFCellAccessor:: distribute_local_to_global (const Vector &local_source, OutputVector &global_destination) const { - internal::DoFCellAccessor::Implementation:: + dealii::internal::DoFCellAccessor::Implementation:: distribute_local_to_global (*this, local_source.begin(), local_source.end(), global_destination); } @@ -3300,7 +3300,7 @@ distribute_local_to_global (ForwardIterator local_source_begin, ForwardIterator local_source_end, OutputVector &global_destination) const { - internal::DoFCellAccessor::Implementation:: + dealii::internal::DoFCellAccessor::Implementation:: distribute_local_to_global (*this, local_source_begin, local_source_end, global_destination); } @@ -3317,7 +3317,7 @@ distribute_local_to_global (const ConstraintMatrix &constraints, ForwardIterator local_source_end, OutputVector &global_destination) const { - internal::DoFCellAccessor::Implementation:: + dealii::internal::DoFCellAccessor::Implementation:: distribute_local_to_global (*this, constraints, local_source_begin, local_source_end, global_destination); } @@ -3332,7 +3332,7 @@ DoFCellAccessor:: distribute_local_to_global (const FullMatrix &local_source, OutputMatrix &global_destination) const { - internal::DoFCellAccessor::Implementation:: + dealii::internal::DoFCellAccessor::Implementation:: distribute_local_to_global (*this,local_source,global_destination); } @@ -3348,7 +3348,7 @@ distribute_local_to_global (const FullMatrix &local_matrix, OutputMatrix &global_matrix, OutputVector &global_vector) const { - internal::DoFCellAccessor::Implementation:: + dealii::internal::DoFCellAccessor::Implementation:: distribute_local_to_global (*this,local_matrix,local_vector, global_matrix,global_vector); } diff --git a/deal.II/include/deal.II/dofs/dof_handler.h b/deal.II/include/deal.II/dofs/dof_handler.h index 54eb34d7ec..86fd9cbbe0 100644 --- a/deal.II/include/deal.II/dofs/dof_handler.h +++ b/deal.II/include/deal.II/dofs/dof_handler.h @@ -66,7 +66,7 @@ namespace internal * to the fact that indices in global vectors and matrices also refer to all * degrees of freedom and some kind of condensation is needed to restrict the * systems of equations to the unconstrained degrees of freedom only. The - * actual layout of storage of the indices is described in the internal::DoFHandler::DoFLevel class + * actual layout of storage of the indices is described in the dealii::internal::DoFHandler::DoFLevel class * documentation. * * The class offers iterators to traverse all cells, in much the same way as @@ -171,7 +171,7 @@ namespace internal template class DoFHandler : public Subscriptor { - typedef internal::DoFHandler::Iterators > IteratorSelector; + typedef dealii::internal::DoFHandler::Iterators > IteratorSelector; public: typedef typename IteratorSelector::CellAccessor cell_accessor; typedef typename IteratorSelector::FaceAccessor face_accessor; @@ -341,74 +341,74 @@ class DoFHandler : public Subscriptor */ virtual void clear (); - /** - * Renumber degrees of freedom based on - * a list of new dof numbers for all the - * dofs. - * - * This function is called by - * the functions in - * DoFRenumbering function - * after computing the ordering - * of the degrees of freedom. - * This function is called, for - * example, by the functions in - * the DoFRenumbering - * namespace, but it can of - * course also be called from - * user code. - * - * @arg new_number This array - * must have a size equal to - * the number of degrees of - * freedom owned by the current - * processor, i.e. the size - * must be equal to what - * n_locally_owned_dofs() - * returns. If only one - * processor participates in - * storing the current mesh, - * then this equals the total - * number of degrees of - * freedom, i.e. the result of - * n_dofs(). The contents of - * this array are the new - * global indices for each - * freedom listed in the - * IndexSet returned by - * locally_owned_dofs(). In the - * case of a sequential mesh - * this means that the array is - * a list of new indices for - * each of the degrees of - * freedom on the current - * mesh. In the case that we - * have a - * parallel::distributed::Triangulation - * underlying this DoFHandler - * object, the array is a list - * of new indices for all the - * locally owned degrees of - * freedom, enumerated in the - * same order as the currently - * locally owned DoFs. In other - * words, assume that degree of - * freedom i is - * currently locally owned, - * then - * new_numbers[locally_owned_dofs().index_within_set(i)] - * returns the new global DoF - * index of - * i. Since the - * IndexSet of - * locally_owned_dofs() is - * complete in the sequential - * case, the latter convention - * for the content of the array - * reduces to the former in the - * case that only one processor - * participates in the mesh. - */ + /** + * Renumber degrees of freedom based on + * a list of new dof numbers for all the + * dofs. + * + * This function is called by + * the functions in + * DoFRenumbering function + * after computing the ordering + * of the degrees of freedom. + * This function is called, for + * example, by the functions in + * the DoFRenumbering + * namespace, but it can of + * course also be called from + * user code. + * + * @arg new_number This array + * must have a size equal to + * the number of degrees of + * freedom owned by the current + * processor, i.e. the size + * must be equal to what + * n_locally_owned_dofs() + * returns. If only one + * processor participates in + * storing the current mesh, + * then this equals the total + * number of degrees of + * freedom, i.e. the result of + * n_dofs(). The contents of + * this array are the new + * global indices for each + * freedom listed in the + * IndexSet returned by + * locally_owned_dofs(). In the + * case of a sequential mesh + * this means that the array is + * a list of new indices for + * each of the degrees of + * freedom on the current + * mesh. In the case that we + * have a + * parallel::distributed::Triangulation + * underlying this DoFHandler + * object, the array is a list + * of new indices for all the + * locally owned degrees of + * freedom, enumerated in the + * same order as the currently + * locally owned DoFs. In other + * words, assume that degree of + * freedom i is + * currently locally owned, + * then + * new_numbers[locally_owned_dofs().index_within_set(i)] + * returns the new global DoF + * index of + * i. Since the + * IndexSet of + * locally_owned_dofs() is + * complete in the sequential + * case, the latter convention + * for the content of the array + * reduces to the former in the + * case that only one processor + * participates in the mesh. + */ void renumber_dofs (const std::vector &new_numbers); /** @@ -775,7 +775,7 @@ class DoFHandler : public Subscriptor * Return an iterator pointing to the last * line of the level @p level, used or not. - */ + */ raw_line_iterator last_raw_line (const unsigned int level) const; /** @@ -872,7 +872,7 @@ class DoFHandler : public Subscriptor * Return an iterator pointing to the last * quad of the level @p level, used or not. - */ + */ raw_quad_iterator last_raw_quad (const unsigned int level) const; /** @@ -973,7 +973,7 @@ class DoFHandler : public Subscriptor * Return an iterator pointing to the last * hex of the level @p level, used or not. - */ + */ raw_hex_iterator last_raw_hex (const unsigned int level) const; @@ -1228,18 +1228,18 @@ class DoFHandler : public Subscriptor * stream for the purpose of * serialization. */ - template - void save (Archive & ar, const unsigned int version) const; + template + void save (Archive & ar, const unsigned int version) const; /** * Read the data of this object from a * stream for the purpose of * serialization. */ - template - void load (Archive & ar, const unsigned int version); + template + void load (Archive & ar, const unsigned int version); - BOOST_SERIALIZATION_SPLIT_MEMBER() + BOOST_SERIALIZATION_SPLIT_MEMBER() /** * We are trying to renumber the @@ -1335,7 +1335,7 @@ class DoFHandler : public Subscriptor * of freedom should be distributed and * renumbered. */ - std_cxx1x::shared_ptr > policy; + std_cxx1x::shared_ptr > policy; /** * A structure that contains all @@ -1348,7 +1348,7 @@ class DoFHandler : public Subscriptor * accessor function in this * class that returns its value. */ - internal::DoFHandler::NumberCache number_cache; + dealii::internal::DoFHandler::NumberCache number_cache; private: @@ -1386,7 +1386,7 @@ class DoFHandler : public Subscriptor * levels[] tree of the * Triangulation objects. */ - std::vector*> levels; + std::vector*> levels; /** * Space to store DoF numbers of @@ -1396,18 +1396,18 @@ class DoFHandler : public Subscriptor * hierarchically, but in a flat * array. */ - internal::DoFHandler::DoFFaces *faces; + dealii::internal::DoFHandler::DoFFaces *faces; /** * Make accessor objects friends. */ template friend class DoFAccessor; template friend class DoFCellAccessor; - friend struct internal::DoFAccessor::Implementation; - friend struct internal::DoFCellAccessor::Implementation; + friend struct dealii::internal::DoFAccessor::Implementation; + friend struct dealii::internal::DoFCellAccessor::Implementation; - friend struct internal::DoFHandler::Implementation; - friend struct internal::DoFHandler::Policy::Implementation; + friend struct dealii::internal::DoFHandler::Implementation; + friend struct dealii::internal::DoFHandler::Policy::Implementation; }; @@ -1507,9 +1507,9 @@ void DoFHandler::save (Archive & ar, ar & levels; ar & faces; - // write out the number of triangulation cells and later check - // during loading that this number is indeed correct; same with something that - // identifies the FE and the policy + // write out the number of triangulation cells and later check + // during loading that this number is indeed correct; same with something that + // identifies the FE and the policy unsigned int n_cells = tria->n_cells(); std::string fe_name = selected_fe->get_name(); std::string policy_name = typeid(*policy).name(); @@ -1527,10 +1527,10 @@ void DoFHandler::load (Archive & ar, ar & vertex_dofs; ar & number_cache; - // boost::serialization can restore pointers just fine, but if the - // pointer object still points to something useful, that object is - // not destroyed and we end up with a memory leak. consequently, - // first delete previous content before re-loading stuff + // boost::serialization can restore pointers just fine, but if the + // pointer object still points to something useful, that object is + // not destroyed and we end up with a memory leak. consequently, + // first delete previous content before re-loading stuff for (unsigned int i=0; i::load (Archive & ar, ar & levels; ar & faces; - // these are the checks that correspond to the last block in the save() function + // these are the checks that correspond to the last block in the save() function unsigned int n_cells; std::string fe_name; std::string policy_name; diff --git a/deal.II/include/deal.II/fe/fe.h b/deal.II/include/deal.II/fe/fe.h index 289288f4b8..cd900b3507 100644 --- a/deal.II/include/deal.II/fe/fe.h +++ b/deal.II/include/deal.II/fe/fe.h @@ -292,10 +292,10 @@ namespace hp * The piece of code in the constructor of a finite element * responsible for this looks like * @code - FullMatrix M(this->dofs_per_cell, this->dofs_per_cell); - FETools::compute_node_matrix(M, *this); - this->inverse_node_matrix.reinit(this->dofs_per_cell, this->dofs_per_cell); - this->inverse_node_matrix.invert(M); + FullMatrix M(this->dofs_per_cell, this->dofs_per_cell); + FETools::compute_node_matrix(M, *this); + this->inverse_node_matrix.reinit(this->dofs_per_cell, this->dofs_per_cell); + this->inverse_node_matrix.invert(M); * @endcode * Don't forget to make sure that #unit_support_points or * #generalized_support_points are initialized before this! @@ -308,10 +308,10 @@ namespace hp * * This can be achieved by * @code - for (unsigned int i=0; i::children_per_cell; ++i) - this->prolongation[i].reinit (this->dofs_per_cell, - this->dofs_per_cell); - FETools::compute_embedding_matrices (*this, this->prolongation); + for (unsigned int i=0; i::children_per_cell; ++i) + this->prolongation[i].reinit (this->dofs_per_cell, + this->dofs_per_cell); + FETools::compute_embedding_matrices (*this, this->prolongation); * @endcode * *
Computing the #restriction matrices for error estimators
@@ -337,19 +337,19 @@ class FiniteElement : public Subscriptor, public FiniteElementData { public: - /** - * Base class for internal data. - * Adds data for second derivatives to - * Mapping::InternalDataBase() - * - * For information about the - * general purpose of this class, - * see the documentation of the - * base class. - * - * @author Guido Kanschat, 2001 - */ - class InternalDataBase : public Mapping::InternalDataBase + /** + * Base class for internal data. + * Adds data for second derivatives to + * Mapping::InternalDataBase() + * + * For information about the + * general purpose of this class, + * see the documentation of the + * base class. + * + * @author Guido Kanschat, 2001 + */ + class InternalDataBase : public Mapping::InternalDataBase { public: /** @@ -926,7 +926,7 @@ class FiniteElement : public Subscriptor, * succeed or generate the * exception. */ - const FullMatrix & constraints (const internal::SubfaceCase &subface_case=internal::SubfaceCase::case_isotropic) const; + const FullMatrix & constraints (const dealii::internal::SubfaceCase &subface_case=dealii::internal::SubfaceCase::case_isotropic) const; /** * Return whether this element @@ -958,7 +958,7 @@ class FiniteElement : public Subscriptor, * the lack of information this * just expresses. */ - bool constraints_are_implemented (const internal::SubfaceCase &subface_case=internal::SubfaceCase::case_isotropic) const; + bool constraints_are_implemented (const dealii::internal::SubfaceCase &subface_case=dealii::internal::SubfaceCase::case_isotropic) const; /** @@ -1262,8 +1262,8 @@ class FiniteElement : public Subscriptor, * from the system_to_component_index() * function. */ - unsigned int component_to_system_index(const unsigned int component, - const unsigned int index) const; + unsigned int component_to_system_index(const unsigned int component, + const unsigned int index) const; /** * Same as @@ -2645,7 +2645,7 @@ std::pair FiniteElement::system_to_component_index (const unsigned int index) const { Assert (index < system_to_component_table.size(), - ExcIndexRange(index, 0, system_to_component_table.size())); + ExcIndexRange(index, 0, system_to_component_table.size())); Assert (is_primitive (index), ( typename FiniteElement::ExcShapeFunctionNotPrimitive(index)) ); return system_to_component_table[index]; @@ -2677,14 +2677,14 @@ template inline unsigned int FiniteElement::component_to_system_index (const unsigned int component, - const unsigned int index) const + const unsigned int index) const { - std::vector< std::pair >::const_iterator - it = std::find(system_to_component_table.begin(), system_to_component_table.end(), - std::pair(component, index)); + std::vector< std::pair >::const_iterator + it = std::find(system_to_component_table.begin(), system_to_component_table.end(), + std::pair(component, index)); - Assert(it != system_to_component_table.end(), ExcComponentIndexInvalid(component, index)); - return std::distance(system_to_component_table.begin(), it); + Assert(it != system_to_component_table.end(), ExcComponentIndexInvalid(component, index)); + return std::distance(system_to_component_table.begin(), it); } @@ -2724,7 +2724,7 @@ std::pair,unsigned int> FiniteElement::system_to_base_index (const unsigned int index) const { Assert (index < system_to_base_table.size(), - ExcIndexRange(index, 0, system_to_base_table.size())); + ExcIndexRange(index, 0, system_to_base_table.size())); return system_to_base_table[index]; } @@ -2787,9 +2787,9 @@ FiniteElement::system_to_block_index (const unsigned int index) co // first block of this base plus // the index within the base blocks return std::pair( - first_block_of_base(system_to_base_table[index].first.first) - + system_to_base_table[index].first.second, - system_to_base_table[index].second); + first_block_of_base(system_to_base_table[index].first.first) + + system_to_base_table[index].first.second, + system_to_base_table[index].second); } diff --git a/deal.II/include/deal.II/fe/fe_values.h b/deal.II/include/deal.II/fe/fe_values.h index c90121418c..c4ba055eac 100644 --- a/deal.II/include/deal.II/fe/fe_values.h +++ b/deal.II/include/deal.II/fe/fe_values.h @@ -36,9 +36,9 @@ #include #include - // dummy include in order to have the - // definition of PetscScalar available - // without including other PETSc stuff + // dummy include in order to have the + // definition of PetscScalar available + // without including other PETSc stuff #ifdef DEAL_II_USE_PETSC # include #endif @@ -652,7 +652,7 @@ namespace FEValuesViews * spacedim=3 it is a * Tensor@<1, dim@>. */ - typedef typename internal::CurlType::type curl_type; + typedef typename dealii::internal::CurlType::type curl_type; /** * A typedef for the type of second @@ -806,7 +806,7 @@ namespace FEValuesViews */ curl_type curl (const unsigned int shape_function, - const unsigned int q_point) const; + const unsigned int q_point) const; /** * Return the Hessian (the tensor of @@ -936,7 +936,7 @@ namespace FEValuesViews */ template void get_function_curls (const InputVector& fe_function, - std::vector& curls) const; + std::vector& curls) const; /** * Return the Hessians of the selected @@ -1378,7 +1378,7 @@ namespace internal std::vector > scalars; std::vector > vectors; std::vector > - symmetric_second_order_tensors; + symmetric_second_order_tensors; /** * Constructor. @@ -3132,32 +3132,32 @@ class FEValuesBase : protected FEValuesData, */ std::auto_ptr present_cell; - /** - * A signal connection we use to ensure we get informed whenever the - * triangulation changes. We need to know about that because it - * invalidates all cell iterators and, as part of that, the - * 'present_cell' iterator we keep around between subsequent - * calls to reinit() in order to compute the cell similarity. - */ + /** + * A signal connection we use to ensure we get informed whenever the + * triangulation changes. We need to know about that because it + * invalidates all cell iterators and, as part of that, the + * 'present_cell' iterator we keep around between subsequent + * calls to reinit() in order to compute the cell similarity. + */ boost::signals2::connection tria_listener; - /** - * A function that is connected to the triangulation in - * order to reset the stored 'present_cell' iterator to an invalid - * one whenever the triangulation is changed and the iterator consequently - * becomes invalid. - */ + /** + * A function that is connected to the triangulation in + * order to reset the stored 'present_cell' iterator to an invalid + * one whenever the triangulation is changed and the iterator consequently + * becomes invalid. + */ void invalidate_present_cell (); - /** - * This function is called by the various reinit() functions in derived - * classes. Given the cell indicated by the argument, test whether - * we have to throw away the previously stored present_cell argument - * because it would require us to compare cells from different - * triangulations. In checking all this, also make sure that we have - * tria_listener connected to the triangulation to which we will set - * present_cell right after calling this function. - */ + /** + * This function is called by the various reinit() functions in derived + * classes. Given the cell indicated by the argument, test whether + * we have to throw away the previously stored present_cell argument + * because it would require us to compare cells from different + * triangulations. In checking all this, also make sure that we have + * tria_listener connected to the triangulation to which we will set + * present_cell right after calling this function. + */ void maybe_invalidate_previous_present_cell (const typename Triangulation::cell_iterator &cell); @@ -3244,7 +3244,7 @@ class FEValuesBase : protected FEValuesData, * A cache for all possible FEValuesViews * objects. */ - internal::FEValuesViews::Cache fe_values_views_cache; + dealii::internal::FEValuesViews::Cache fe_values_views_cache; /** * Make the view classes friends of this @@ -4155,121 +4155,121 @@ namespace FEValuesViews inline typename Vector::curl_type Vector::curl (const unsigned int shape_function, const unsigned int q_point) const { - // this function works like in the case above - typedef FEValuesBase FVB; - - Assert (shape_function < fe_values.fe->dofs_per_cell, - ExcIndexRange (shape_function, 0, fe_values.fe->dofs_per_cell)); - Assert (fe_values.update_flags & update_gradients, - typename FVB::ExcAccessToUninitializedField()); - // same as for the scalar case except that we have one more index - const int snc = shape_function_data[shape_function].single_nonzero_component; - - if (snc == -2) - return curl_type (); - - else - switch (dim) { - case 1: { - Assert (false, ExcMessage("Computing the curl in 1d is not a useful operation")); - return curl_type (); - } - - case 2: { - if (snc != -1) { - curl_type return_value; - - // the single - // nonzero component - // can only be zero - // or one in 2d - if (shape_function_data[shape_function].single_nonzero_component_index == 0) - return_value[0] = -1.0 * fe_values.shape_gradients[snc][q_point][1]; - else - return_value[0] = fe_values.shape_gradients[snc][q_point][0]; - - return return_value; - } + // this function works like in the case above + typedef FEValuesBase FVB; - else { - curl_type return_value; + Assert (shape_function < fe_values.fe->dofs_per_cell, + ExcIndexRange (shape_function, 0, fe_values.fe->dofs_per_cell)); + Assert (fe_values.update_flags & update_gradients, + typename FVB::ExcAccessToUninitializedField()); + // same as for the scalar case except that we have one more index + const int snc = shape_function_data[shape_function].single_nonzero_component; - return_value[0] = 0.0; + if (snc == -2) + return curl_type (); - if (shape_function_data[shape_function].is_nonzero_shape_function_component[0]) - return_value[0] - -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][1]; + else + switch (dim) { + case 1: { + Assert (false, ExcMessage("Computing the curl in 1d is not a useful operation")); + return curl_type (); + } - if (shape_function_data[shape_function].is_nonzero_shape_function_component[1]) - return_value[0] - += fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][0]; + case 2: { + if (snc != -1) { + curl_type return_value; - return return_value; + // the single + // nonzero component + // can only be zero + // or one in 2d + if (shape_function_data[shape_function].single_nonzero_component_index == 0) + return_value[0] = -1.0 * fe_values.shape_gradients[snc][q_point][1]; + else + return_value[0] = fe_values.shape_gradients[snc][q_point][0]; + + return return_value; + } + + else { + curl_type return_value; + + return_value[0] = 0.0; + + if (shape_function_data[shape_function].is_nonzero_shape_function_component[0]) + return_value[0] + -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][1]; + + if (shape_function_data[shape_function].is_nonzero_shape_function_component[1]) + return_value[0] + += fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][0]; + + return return_value; + } + } + + case 3: { + if (snc != -1) { + curl_type return_value; + + switch (shape_function_data[shape_function].single_nonzero_component_index) { + case 0: { + return_value[0] = 0; + return_value[1] = fe_values.shape_gradients[snc][q_point][2]; + return_value[2] = -1.0 * fe_values.shape_gradients[snc][q_point][1]; + return return_value; } - } - - case 3: { - if (snc != -1) { - curl_type return_value; - - switch (shape_function_data[shape_function].single_nonzero_component_index) { - case 0: { - return_value[0] = 0; - return_value[1] = fe_values.shape_gradients[snc][q_point][2]; - return_value[2] = -1.0 * fe_values.shape_gradients[snc][q_point][1]; - return return_value; - } - - case 1: { - return_value[0] = -1.0 * fe_values.shape_gradients[snc][q_point][2]; - return_value[1] = 0; - return_value[2] = fe_values.shape_gradients[snc][q_point][0]; - return return_value; - } - - default: { - return_value[0] = fe_values.shape_gradients[snc][q_point][1]; - return_value[1] = -1.0 * fe_values.shape_gradients[snc][q_point][0]; - return_value[2] = 0; - return return_value; - } - } + + case 1: { + return_value[0] = -1.0 * fe_values.shape_gradients[snc][q_point][2]; + return_value[1] = 0; + return_value[2] = fe_values.shape_gradients[snc][q_point][0]; + return return_value; } - else { - curl_type return_value; - - for (unsigned int i = 0; i < dim; ++i) - return_value[i] = 0.0; - - if (shape_function_data[shape_function].is_nonzero_shape_function_component[0]) { - return_value[1] - += fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][2]; - return_value[2] - -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][1]; - } - - if (shape_function_data[shape_function].is_nonzero_shape_function_component[1]) { - return_value[0] - -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][2]; - return_value[2] - += fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][0]; - } - - if (shape_function_data[shape_function].is_nonzero_shape_function_component[2]) { - return_value[0] - += fe_values.shape_gradients[shape_function_data[shape_function].row_index[2]][q_point][1]; - return_value[1] - -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[2]][q_point][0]; - } - - return return_value; + default: { + return_value[0] = fe_values.shape_gradients[snc][q_point][1]; + return_value[1] = -1.0 * fe_values.shape_gradients[snc][q_point][0]; + return_value[2] = 0; + return return_value; } - } + } + } + + else { + curl_type return_value; + + for (unsigned int i = 0; i < dim; ++i) + return_value[i] = 0.0; + + if (shape_function_data[shape_function].is_nonzero_shape_function_component[0]) { + return_value[1] + += fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][2]; + return_value[2] + -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[0]][q_point][1]; + } + + if (shape_function_data[shape_function].is_nonzero_shape_function_component[1]) { + return_value[0] + -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][2]; + return_value[2] + += fe_values.shape_gradients[shape_function_data[shape_function].row_index[1]][q_point][0]; + } + + if (shape_function_data[shape_function].is_nonzero_shape_function_component[2]) { + return_value[0] + += fe_values.shape_gradients[shape_function_data[shape_function].row_index[2]][q_point][1]; + return_value[1] + -= fe_values.shape_gradients[shape_function_data[shape_function].row_index[2]][q_point][0]; + } + + return return_value; + } } - // should not end up here - Assert (false, ExcInternalError()); - return curl_type(); + } + // should not end up here + Assert (false, ExcInternalError()); + return curl_type(); } template diff --git a/deal.II/include/deal.II/grid/tria.h b/deal.II/include/deal.II/grid/tria.h index f8b2f5cf0d..d6daa52fa2 100644 --- a/deal.II/include/deal.II/grid/tria.h +++ b/deal.II/include/deal.II/grid/tria.h @@ -425,7 +425,7 @@ namespace internal * are the ones one wants to use in the boundary element method. * * This class is written to be as independent of the dimension as possible - * (thus the complex construction of the internal::Triangulation::TriaLevel + * (thus the complex construction of the dealii::internal::Triangulation::TriaLevel * classes) to allow code-sharing, to allow reducing the need to mirror * changes in the code for one dimension to the code for other * dimensions. Nonetheless, some of the functions are dependent of the @@ -1438,7 +1438,7 @@ class Triangulation : public Subscriptor * the definition of the iterator * classes simpler. */ - typedef internal::Triangulation::Iterators IteratorSelector; + typedef dealii::internal::Triangulation::Iterators IteratorSelector; public: /** @@ -3682,7 +3682,7 @@ class Triangulation : public Subscriptor * objects storing the cell data on the * different levels. */ - std::vector*> levels; + std::vector*> levels; /** * Pointer to the faces of the triangulation. In 1d @@ -3691,7 +3691,7 @@ class Triangulation : public Subscriptor * these have no level and are therefore treated * seperately. */ - internal::Triangulation::TriaFaces * faces; + dealii::internal::Triangulation::TriaFaces * faces; /** @@ -3746,7 +3746,7 @@ class Triangulation : public Subscriptor * frequent operation, this was not * an optimal solution. */ - internal::Triangulation::NumberCache number_cache; + dealii::internal::Triangulation::NumberCache number_cache; /** * A map that relates the number of a @@ -3796,11 +3796,11 @@ class Triangulation : public Subscriptor friend class CellAccessor; - friend struct internal::TriaAccessor::Implementation; + friend struct dealii::internal::TriaAccessor::Implementation; friend class hp::DoFHandler; - friend struct internal::Triangulation::Implementation; + friend struct dealii::internal::Triangulation::Implementation; }; diff --git a/deal.II/include/deal.II/grid/tria_accessor.h b/deal.II/include/deal.II/grid/tria_accessor.h index b5d9892971..0c63c94c69 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.h +++ b/deal.II/include/deal.II/grid/tria_accessor.h @@ -417,7 +417,7 @@ class TriaAccessorBase * a Triangulation with same * dimension. */ - internal::Triangulation::TriaObjects > & + dealii::internal::Triangulation::TriaObjects > & objects () const; public: @@ -496,7 +496,7 @@ class TriaAccessorBase * (structdim==dim). Else, * contains zero. */ - typename internal::TriaAccessor::PresentLevelType::type present_level; + typename dealii::internal::TriaAccessor::PresentLevelType::type present_level; /** * Used to store the index of @@ -762,7 +762,7 @@ class TriaAccessor : public TriaAccessorBase * Pointer to the @p ith line * bounding this object. */ - typename internal::Triangulation::Iterators::line_iterator + typename dealii::internal::Triangulation::Iterators::line_iterator line (const unsigned int i) const; /** @@ -780,7 +780,7 @@ class TriaAccessor : public TriaAccessorBase * Pointer to the @p ith quad * bounding this object. */ - typename internal::Triangulation::Iterators::quad_iterator + typename dealii::internal::Triangulation::Iterators::quad_iterator quad (const unsigned int i) const; /** @@ -1065,8 +1065,8 @@ class TriaAccessor : public TriaAccessorBase * domain and so cannot determine whether * the value you are trying to set makes * sense under the current circumstances. - * - * @ingroup boundary + * + * @ingroup boundary */ void set_boundary_indicator (const types::boundary_id_t) const; @@ -1085,8 +1085,8 @@ class TriaAccessor : public TriaAccessorBase * of face and edges are all set * at the same time using the * current function. - * - * @ingroup boundary + * + * @ingroup boundary */ void set_all_boundary_indicators (const types::boundary_id_t) const; @@ -1434,7 +1434,7 @@ class TriaAccessor : public TriaAccessorBase * structures of a * triangulation. */ - void set (const internal::Triangulation::TriaObject &o) const; + void set (const dealii::internal::Triangulation::TriaObject &o) const; /** * Set the flag indicating, what @@ -1591,8 +1591,8 @@ class TriaAccessor : public TriaAccessorBase template friend class Triangulation; - friend struct internal::Triangulation::Implementation; - friend struct internal::TriaAccessor::Implementation; + friend struct dealii::internal::Triangulation::Implementation; + friend struct dealii::internal::TriaAccessor::Implementation; }; @@ -1873,7 +1873,7 @@ class TriaAccessor<0, 1, spacedim> * bounding this object. Will * point to an invalid object. */ - typename internal::Triangulation::Iterators<1,spacedim>::line_iterator + typename dealii::internal::Triangulation::Iterators<1,spacedim>::line_iterator static line (const unsigned int); /** @@ -1892,7 +1892,7 @@ class TriaAccessor<0, 1, spacedim> * bounding this object. */ static - typename internal::Triangulation::Iterators<1,spacedim>::quad_iterator + typename dealii::internal::Triangulation::Iterators<1,spacedim>::quad_iterator quad (const unsigned int i); /** @@ -2067,8 +2067,8 @@ class TriaAccessor<0, 1, spacedim> * domain and so cannot determine whether * the value you are trying to set makes * sense under the current circumstances. - * - * @ingroup boundary + * + * @ingroup boundary */ void set_boundary_indicator (const types::boundary_id_t); @@ -2078,8 +2078,8 @@ class TriaAccessor<0, 1, spacedim> * single vertex, call * set_boundary_indicator with the same * argument. - * - * @ingroup boundary + * + * @ingroup boundary */ void set_all_boundary_indicators (const types::boundary_id_t); @@ -2577,7 +2577,7 @@ class CellAccessor : public TriaAccessor * function may only be called for active * cells in 2d and 3d. */ - internal::SubfaceCase subface_case(const unsigned int face_no) const; + dealii::internal::SubfaceCase subface_case(const unsigned int face_no) const; /** * Return whether the coarsen flag @@ -2751,21 +2751,21 @@ class CellAccessor : public TriaAccessor */ bool active () const; - /** - * Return whether this cell is owned by the current processor - * or is owned by another processor. The function always returns - * true if applied to an object of type dealii::Triangulation, - * but may yield false if the triangulation is of type - * parallel::distributed::Triangulation. - * - * See the @ref GlossGhostCell - * "glossary" and the @ref - * distributed module for more - * information. - * - * @post The returned value is equal to !is_ghost() && - * !is_artificial(). - **/ + /** + * Return whether this cell is owned by the current processor + * or is owned by another processor. The function always returns + * true if applied to an object of type dealii::Triangulation, + * but may yield false if the triangulation is of type + * parallel::distributed::Triangulation. + * + * See the @ref GlossGhostCell + * "glossary" and the @ref + * distributed module for more + * information. + * + * @post The returned value is equal to !is_ghost() && + * !is_artificial(). + **/ bool is_locally_owned () const; /** @@ -2857,7 +2857,7 @@ class CellAccessor : public TriaAccessor to the manifold where the cell is embedded and then check if this projection is inside the cell. - */ + */ bool point_inside (const Point &p) const; /** @@ -2974,7 +2974,7 @@ class CellAccessor : public TriaAccessor template friend class Triangulation; - friend struct internal::Triangulation::Implementation; + friend struct dealii::internal::Triangulation::Implementation; }; diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h index 801a098e0b..e15a341ac3 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.templates.h +++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h @@ -271,9 +271,9 @@ namespace internal */ template inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces *faces, - const internal::int2type<1>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces *faces, + const dealii::internal::int2type<1>) { return &faces->lines; } @@ -281,35 +281,35 @@ namespace internal template inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces *faces, - const internal::int2type<2>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces *faces, + const dealii::internal::int2type<2>) { return &faces->quads; } inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces<1>*, - const internal::int2type<1>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces<1>*, + const dealii::internal::int2type<1>) { Assert (false, ExcInternalError()); return 0; } inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces<2>*, - const internal::int2type<2>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces<2>*, + const dealii::internal::int2type<2>) { Assert (false, ExcInternalError()); return 0; } inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces<3>*, - const internal::int2type<3>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces<3>*, + const dealii::internal::int2type<3>) { Assert (false, ExcInternalError()); return 0; @@ -322,9 +322,9 @@ namespace internal */ template inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaFaces *faces, - const internal::int2type<3>) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaFaces *faces, + const dealii::internal::int2type<3>) { Assert (false, ExcInternalError()); return 0; @@ -336,9 +336,9 @@ namespace internal */ template inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaObjects >*, - const internal::int2type) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaObjects >*, + const dealii::internal::int2type) { Assert (false, ExcInternalError()); return 0; @@ -346,9 +346,9 @@ namespace internal template inline - internal::Triangulation::TriaObjects >* - get_objects (internal::Triangulation::TriaObjects >* cells, - const internal::int2type) + dealii::internal::Triangulation::TriaObjects >* + get_objects (dealii::internal::Triangulation::TriaObjects >* cells, + const dealii::internal::int2type) { return cells; } @@ -359,18 +359,18 @@ namespace internal template inline -internal::Triangulation::TriaObjects > & +dealii::internal::Triangulation::TriaObjects > & TriaAccessorBase::objects() const { if (structdim != dim) // get sub-objects. note that the // current class is only used for // objects that are *not* cells - return *internal::TriaAccessorBase::get_objects (this->tria->faces, - internal::int2type ()); + return *dealii::internal::TriaAccessorBase::get_objects (this->tria->faces, + dealii::internal::int2type ()); else - return *internal::TriaAccessorBase::get_objects (&this->tria->levels[this->present_level]->cells, - internal::int2type ()); + return *dealii::internal::TriaAccessorBase::get_objects (&this->tria->levels[this->present_level]->cells, + dealii::internal::int2type ()); } @@ -508,7 +508,7 @@ namespace internal // we mean the *class* // dealii::TriaAccessor, not the // enclosing namespace - // internal::TriaAccessor + // dealii::internal::TriaAccessor using dealii::TriaAccessor; /** @@ -1101,9 +1101,9 @@ template inline TriaAccessor:: TriaAccessor (const Triangulation *parent, - const int level, - const int index, - const AccessorData *local_data) + const int level, + const int index, + const AccessorData *local_data) : TriaAccessorBase (parent, level, index, local_data) {} @@ -1130,7 +1130,7 @@ vertex_index (const unsigned int corner) const Assert (corner::vertices_per_cell, ExcIndexRange(corner,0,GeometryInfo::vertices_per_cell)); - return internal::TriaAccessor::Implementation::vertex_index (*this, corner); + return dealii::internal::TriaAccessor::Implementation::vertex_index (*this, corner); } @@ -1146,11 +1146,11 @@ TriaAccessor::vertex (const unsigned int i) const template inline -typename internal::Triangulation::Iterators::line_iterator +typename dealii::internal::Triangulation::Iterators::line_iterator TriaAccessor::line (const unsigned int i) const { // checks happen in line_index - return typename internal::Triangulation::Iterators::line_iterator + return typename dealii::internal::Triangulation::Iterators::line_iterator (this->tria, 0, line_index (i)); } @@ -1164,7 +1164,7 @@ TriaAccessor::line_index (const unsigned int i) const Assert (i < GeometryInfo::lines_per_cell, ExcIndexRange (i, 0, GeometryInfo::lines_per_cell)); - return internal::TriaAccessor::Implementation::line_index (*this, i); + return dealii::internal::TriaAccessor::Implementation::line_index (*this, i); } @@ -1172,11 +1172,11 @@ TriaAccessor::line_index (const unsigned int i) const template inline -typename internal::Triangulation::Iterators::quad_iterator +typename dealii::internal::Triangulation::Iterators::quad_iterator TriaAccessor::quad (const unsigned int i) const { // checks happen in quad_index - return typename internal::Triangulation::Iterators::quad_iterator + return typename dealii::internal::Triangulation::Iterators::quad_iterator (this->tria, 0, quad_index (i)); } @@ -1187,7 +1187,7 @@ inline unsigned int TriaAccessor::quad_index (const unsigned int i) const { - return internal::TriaAccessor::Implementation::quad_index (*this, i); + return dealii::internal::TriaAccessor::Implementation::quad_index (*this, i); } @@ -1199,7 +1199,7 @@ TriaAccessor::face_orientation (const unsigned int face) { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - return internal::TriaAccessor::Implementation::face_orientation (*this, face); + return dealii::internal::TriaAccessor::Implementation::face_orientation (*this, face); } @@ -1211,7 +1211,7 @@ TriaAccessor::face_flip (const unsigned int face) const { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - return internal::TriaAccessor::Implementation::face_flip (*this, face); + return dealii::internal::TriaAccessor::Implementation::face_flip (*this, face); } @@ -1222,7 +1222,7 @@ TriaAccessor::face_rotation (const unsigned int face) co { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - return internal::TriaAccessor::Implementation::face_rotation (*this, face); + return dealii::internal::TriaAccessor::Implementation::face_rotation (*this, face); } @@ -1236,7 +1236,7 @@ TriaAccessor::line_orientation (const unsigned int line) Assert (line::lines_per_cell, ExcIndexRange (line, 0, GeometryInfo::lines_per_cell)); - return internal::TriaAccessor::Implementation::line_orientation (*this, line); + return dealii::internal::TriaAccessor::Implementation::line_orientation (*this, line); } @@ -1245,11 +1245,11 @@ template inline void TriaAccessor::set_face_orientation (const unsigned int face, - const bool value) const + const bool value) const { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - internal::TriaAccessor::Implementation::set_face_orientation (*this, face, value); + dealii::internal::TriaAccessor::Implementation::set_face_orientation (*this, face, value); } @@ -1258,11 +1258,11 @@ template inline void TriaAccessor::set_face_flip (const unsigned int face, - const bool value) const + const bool value) const { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - internal::TriaAccessor::Implementation::set_face_flip (*this, face, value); + dealii::internal::TriaAccessor::Implementation::set_face_flip (*this, face, value); } @@ -1270,11 +1270,11 @@ template inline void TriaAccessor::set_face_rotation (const unsigned int face, - const bool value) const + const bool value) const { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); - internal::TriaAccessor::Implementation::set_face_rotation (*this, face, value); + dealii::internal::TriaAccessor::Implementation::set_face_rotation (*this, face, value); } @@ -1283,13 +1283,13 @@ template inline void TriaAccessor::set_line_orientation (const unsigned int line, - const bool value) const + const bool value) const { Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (line::lines_per_cell, ExcIndexRange (line, 0, GeometryInfo::lines_per_cell)); - internal::TriaAccessor::Implementation::set_line_orientation (*this, line, value); + dealii::internal::TriaAccessor::Implementation::set_line_orientation (*this, line, value); } @@ -1321,9 +1321,9 @@ parent_index () const { Assert (this->present_level > 0, TriaAccessorExceptions::ExcCellHasNoParent ()); - // the parent of two consecutive cells - // is stored only once, since it is - // the same + // the parent of two consecutive cells + // is stored only once, since it is + // the same return this->tria->levels[this->present_level]->parents[this->present_index / 2]; } @@ -1565,7 +1565,7 @@ TriaAccessor::clear_refinement_case () const template void TriaAccessor::set_children (const unsigned int i, - const int index) const + const int index) const { Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (i%2==0, TriaAccessorExceptions::ExcSetOnlyEvenChildren(i)); @@ -1924,7 +1924,7 @@ template double TriaAccessor::minimum_vertex_distance () const { - switch (structdim) + switch (structdim) { case 1: return std::sqrt((this->vertex(1)-this->vertex(0)).square()); @@ -2188,10 +2188,10 @@ TriaAccessor<0, 1, spacedim>::center () const template inline -typename internal::Triangulation::Iterators<1,spacedim>::line_iterator +typename dealii::internal::Triangulation::Iterators<1,spacedim>::line_iterator TriaAccessor<0, 1, spacedim>::line (const unsigned int) { - return typename internal::Triangulation::Iterators<1,spacedim>::line_iterator(); + return typename dealii::internal::Triangulation::Iterators<1,spacedim>::line_iterator(); } @@ -2207,10 +2207,10 @@ TriaAccessor<0, 1, spacedim>::line_index (const unsigned int) template inline -typename internal::Triangulation::Iterators<1,spacedim>::quad_iterator +typename dealii::internal::Triangulation::Iterators<1,spacedim>::quad_iterator TriaAccessor<0, 1, spacedim>::quad (const unsigned int) { - return typename internal::Triangulation::Iterators<1,spacedim>::quad_iterator(); + return typename dealii::internal::Triangulation::Iterators<1,spacedim>::quad_iterator(); } @@ -2411,7 +2411,7 @@ CellAccessor (const Triangulation *parent, const int index, const AccessorData *local_data) : - TriaAccessor (parent, level, index, local_data) + TriaAccessor (parent, level, index, local_data) {} @@ -2480,7 +2480,7 @@ inline TriaIterator > CellAccessor::face (const unsigned int i) const { - return internal::CellAccessor::get_face (*this, i); + return dealii::internal::CellAccessor::get_face (*this, i); } @@ -2582,7 +2582,7 @@ template inline bool CellAccessor::flag_for_face_refinement (const unsigned int face_no, - const RefinementCase &face_refinement_case) const + const RefinementCase &face_refinement_case) const { Assert (dim>1, ExcImpossibleInDim(dim)); Assert (face_no::faces_per_cell, @@ -2624,8 +2624,8 @@ CellAccessor::flag_for_line_refinement (const unsigned int line_no // line refinement and the already existing // flagged refinement case RefinementCase old_ref_case=refine_flag_set(), - new_ref_case=old_ref_case - | GeometryInfo::min_cell_refinement_case_for_line_refinement(line_no); + new_ref_case=old_ref_case + | GeometryInfo::min_cell_refinement_case_for_line_refinement(line_no); set_refine_flag(new_ref_case); // return, whether we had to change the // refinement flag @@ -2636,60 +2636,60 @@ CellAccessor::flag_for_line_refinement (const unsigned int line_no template <> inline -internal::SubfaceCase<1> +dealii::internal::SubfaceCase<1> CellAccessor<1>::subface_case(const unsigned int) const { - return internal::SubfaceCase<1>::case_none; + return dealii::internal::SubfaceCase<1>::case_none; } template <> inline -internal::SubfaceCase<1> +dealii::internal::SubfaceCase<1> CellAccessor<1,2>::subface_case(const unsigned int) const { - return internal::SubfaceCase<1>::case_none; + return dealii::internal::SubfaceCase<1>::case_none; } template <> inline -internal::SubfaceCase<1> +dealii::internal::SubfaceCase<1> CellAccessor<1,3>::subface_case(const unsigned int) const { - return internal::SubfaceCase<1>::case_none; + return dealii::internal::SubfaceCase<1>::case_none; } template <> inline -internal::SubfaceCase<2> +dealii::internal::SubfaceCase<2> CellAccessor<2>::subface_case(const unsigned int face_no) const { Assert(active(), TriaAccessorExceptions::ExcCellNotActive()); Assert(face_no::faces_per_cell, ExcIndexRange(face_no,0,GeometryInfo<2>::faces_per_cell)); return ((face(face_no)->has_children()) ? - internal::SubfaceCase<2>::case_x : - internal::SubfaceCase<2>::case_none); + dealii::internal::SubfaceCase<2>::case_x : + dealii::internal::SubfaceCase<2>::case_none); } template <> inline -internal::SubfaceCase<2> +dealii::internal::SubfaceCase<2> CellAccessor<2,3>::subface_case(const unsigned int face_no) const { Assert(active(), TriaAccessorExceptions::ExcCellNotActive()); Assert(face_no::faces_per_cell, ExcIndexRange(face_no,0,GeometryInfo<2>::faces_per_cell)); return ((face(face_no)->has_children()) ? - internal::SubfaceCase<2>::case_x : - internal::SubfaceCase<2>::case_none); + dealii::internal::SubfaceCase<2>::case_x : + dealii::internal::SubfaceCase<2>::case_none); } template <> inline -internal::SubfaceCase<3> +dealii::internal::SubfaceCase<3> CellAccessor<3>::subface_case(const unsigned int face_no) const { Assert(active(), TriaAccessorExceptions::ExcCellNotActive()); @@ -2698,7 +2698,7 @@ CellAccessor<3>::subface_case(const unsigned int face_no) const switch (static_cast (face(face_no)->refinement_case())) { case RefinementCase<3>::no_refinement: - return internal::SubfaceCase<3>::case_none; + return dealii::internal::SubfaceCase<3>::case_none; break; case RefinementCase<3>::cut_x: if (face(face_no)->child(0)->has_children()) @@ -2709,10 +2709,10 @@ CellAccessor<3>::subface_case(const unsigned int face_no) const { Assert(face(face_no)->child(1)->refinement_case()==RefinementCase<2>::cut_y, ExcInternalError()); - return internal::SubfaceCase<3>::case_x1y2y; + return dealii::internal::SubfaceCase<3>::case_x1y2y; } else - return internal::SubfaceCase<3>::case_x1y; + return dealii::internal::SubfaceCase<3>::case_x1y; } else { @@ -2720,10 +2720,10 @@ CellAccessor<3>::subface_case(const unsigned int face_no) const { Assert(face(face_no)->child(1)->refinement_case()==RefinementCase<2>::cut_y, ExcInternalError()); - return internal::SubfaceCase<3>::case_x2y; + return dealii::internal::SubfaceCase<3>::case_x2y; } else - return internal::SubfaceCase<3>::case_x; + return dealii::internal::SubfaceCase<3>::case_x; } break; case RefinementCase<3>::cut_y: @@ -2735,10 +2735,10 @@ CellAccessor<3>::subface_case(const unsigned int face_no) const { Assert(face(face_no)->child(1)->refinement_case()==RefinementCase<2>::cut_x, ExcInternalError()); - return internal::SubfaceCase<3>::case_y1x2x; + return dealii::internal::SubfaceCase<3>::case_y1x2x; } else - return internal::SubfaceCase<3>::case_y1x; + return dealii::internal::SubfaceCase<3>::case_y1x; } else { @@ -2746,20 +2746,20 @@ CellAccessor<3>::subface_case(const unsigned int face_no) const { Assert(face(face_no)->child(1)->refinement_case()==RefinementCase<2>::cut_x, ExcInternalError()); - return internal::SubfaceCase<3>::case_y2x; + return dealii::internal::SubfaceCase<3>::case_y2x; } else - return internal::SubfaceCase<3>::case_y; + return dealii::internal::SubfaceCase<3>::case_y; } break; case RefinementCase<3>::cut_xy: - return internal::SubfaceCase<3>::case_xy; + return dealii::internal::SubfaceCase<3>::case_xy; break; default: Assert(false, ExcInternalError()); } // we should never get here - return internal::SubfaceCase<3>::case_none; + return dealii::internal::SubfaceCase<3>::case_none; } @@ -2811,7 +2811,7 @@ inline TriaIterator > CellAccessor::neighbor (const unsigned int i) const { - TriaIterator > + TriaIterator > q (this->tria, neighbor_level (i), neighbor_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), @@ -2827,7 +2827,7 @@ inline TriaIterator > CellAccessor::child (const unsigned int i) const { - TriaIterator > + TriaIterator > q (this->tria, this->present_level+1, this->child_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), diff --git a/deal.II/include/deal.II/hp/dof_handler.h b/deal.II/include/deal.II/hp/dof_handler.h index 13c0e813af..e26959fca6 100644 --- a/deal.II/include/deal.II/hp/dof_handler.h +++ b/deal.II/include/deal.II/hp/dof_handler.h @@ -75,7 +75,7 @@ namespace hp template class DoFHandler : public Subscriptor { - typedef internal::DoFHandler::Iterators > IteratorSelector; + typedef dealii::internal::DoFHandler::Iterators > IteratorSelector; public: typedef typename IteratorSelector::CellAccessor cell_accessor; typedef typename IteratorSelector::FaceAccessor face_accessor; @@ -1107,7 +1107,7 @@ namespace hp * Create default tables for * the active_fe_indices in * the - * internal::hp::DoFLevels. They + * dealii::internal::hp::DoFLevels. They * are initialized with the a * zero indicator, meaning * that fe[0] is going to be @@ -1189,16 +1189,16 @@ namespace hp * entity. */ void renumber_dofs_internal (const std::vector &new_numbers, - internal::int2type<0>); + dealii::internal::int2type<0>); void renumber_dofs_internal (const std::vector &new_numbers, - internal::int2type<1>); + dealii::internal::int2type<1>); void renumber_dofs_internal (const std::vector &new_numbers, - internal::int2type<2>); + dealii::internal::int2type<2>); void renumber_dofs_internal (const std::vector &new_numbers, - internal::int2type<3>); + dealii::internal::int2type<3>); /** * Space to store the DoF @@ -1207,7 +1207,7 @@ namespace hp * levels[] tree of * the Triangulation objects. */ - std::vector*> levels; + std::vector*> levels; /** * Space to store the DoF * numbers for the faces. @@ -1215,7 +1215,7 @@ namespace hp * faces pointer of * the Triangulation objects. */ - internal::hp::DoFFaces * faces; + dealii::internal::hp::DoFFaces * faces; /** * A structure that contains all @@ -1228,7 +1228,7 @@ namespace hp * accessor function in this * class that returns its value. */ - internal::DoFHandler::NumberCache number_cache; + dealii::internal::DoFHandler::NumberCache number_cache; /** * Array to store the indices @@ -1301,8 +1301,8 @@ namespace hp */ template friend class dealii::DoFAccessor; template friend class dealii::DoFCellAccessor; - friend struct internal::DoFAccessor::Implementation; - friend struct internal::DoFCellAccessor::Implementation; + friend struct dealii::internal::DoFAccessor::Implementation; + friend struct dealii::internal::DoFCellAccessor::Implementation; /** * Likewise for DoFLevel @@ -1311,9 +1311,9 @@ namespace hp * the functions that set and * retrieve vertex dof indices. */ - template friend class internal::hp::DoFLevel; - template friend class internal::hp::DoFObjects; - friend struct internal::hp::DoFHandler::Implementation; + template friend class dealii::internal::hp::DoFLevel; + template friend class dealii::internal::hp::DoFObjects; + friend struct dealii::internal::hp::DoFHandler::Implementation; }; diff --git a/deal.II/include/deal.II/hp/fe_values.h b/deal.II/include/deal.II/hp/fe_values.h index 195f199ced..66f7178f09 100644 --- a/deal.II/include/deal.II/hp/fe_values.h +++ b/deal.II/include/deal.II/hp/fe_values.h @@ -245,7 +245,7 @@ namespace hp * @author Wolfgang Bangerth, 2003 */ template - class FEValues : public internal::hp::FEValuesBase > + class FEValues : public dealii::internal::hp::FEValuesBase > { public: @@ -546,7 +546,7 @@ namespace hp * @author Wolfgang Bangerth, 2003 */ template - class FEFaceValues : public internal::hp::FEValuesBase > + class FEFaceValues : public dealii::internal::hp::FEValuesBase > { public: /** @@ -827,7 +827,7 @@ namespace hp * @author Wolfgang Bangerth, 2003 */ template - class FESubfaceValues : public internal::hp::FEValuesBase > + class FESubfaceValues : public dealii::internal::hp::FEValuesBase > { public: /** diff --git a/deal.II/include/deal.II/lac/block_vector_base.h b/deal.II/include/deal.II/lac/block_vector_base.h index 89d5688bff..88c9e0e183 100644 --- a/deal.II/include/deal.II/lac/block_vector_base.h +++ b/deal.II/include/deal.II/lac/block_vector_base.h @@ -738,8 +738,8 @@ class BlockVectorBase : public Subscriptor typedef typename BlockType::value_type value_type; typedef value_type *pointer; typedef const value_type *const_pointer; - typedef internal::BlockVectorIterators::Iterator iterator; - typedef internal::BlockVectorIterators::Iterator const_iterator; + typedef dealii::internal::BlockVectorIterators::Iterator iterator; + typedef dealii::internal::BlockVectorIterators::Iterator const_iterator; typedef typename BlockType::reference reference; typedef typename BlockType::const_reference const_reference; @@ -1163,7 +1163,7 @@ class BlockVectorBase : public Subscriptor */ #ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template - friend class internal::BlockVectorIterators::Iterator; + friend class dealii::internal::BlockVectorIterators::Iterator; #else friend class iterator; friend class const_iterator; diff --git a/deal.II/include/deal.II/lac/vector.h b/deal.II/include/deal.II/lac/vector.h index 498a746687..2500fc913d 100644 --- a/deal.II/include/deal.II/lac/vector.h +++ b/deal.II/include/deal.II/lac/vector.h @@ -1174,14 +1174,14 @@ Vector & Vector::operator = (const Number s) Assert (numbers::is_finite(s), ExcNumberNotFinite()); if (s != Number()) Assert (vec_size!=0, ExcEmptyObject()); - if (vec_size>internal::Vector::minimum_parallel_grain_size) + if (vec_size>dealii::internal::Vector::minimum_parallel_grain_size) parallel::apply_to_subranges (0U, vec_size, - std_cxx1x::bind(&internal::Vector::template + std_cxx1x::bind(&dealii::internal::Vector::template set_subrange, s, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::ref(*this)), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); else if (vec_size > 0) - internal::Vector::set_subrange(s, 0U, vec_size, *this); + dealii::internal::Vector::set_subrange(s, 0U, vec_size, *this); return *this; } @@ -1218,15 +1218,15 @@ Vector::operator = (const Vector& v) if (v.vec_size != vec_size) reinit (v.vec_size, true); - if (vec_size>internal::Vector::minimum_parallel_grain_size) + if (vec_size>dealii::internal::Vector::minimum_parallel_grain_size) parallel::apply_to_subranges (0U, vec_size, - std_cxx1x::bind(&internal::Vector::template + std_cxx1x::bind(&dealii::internal::Vector::template copy_subrange, std_cxx1x::cref(v), std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::ref(*this)), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); else if (vec_size > 0) - internal::Vector::copy_subrange(v, 0U, vec_size, *this); + dealii::internal::Vector::copy_subrange(v, 0U, vec_size, *this); return *this; } @@ -1241,15 +1241,15 @@ Vector::operator = (const Vector& v) { if (v.vec_size != vec_size) reinit (v.vec_size, true); - if (vec_size>internal::Vector::minimum_parallel_grain_size) + if (vec_size>dealii::internal::Vector::minimum_parallel_grain_size) parallel::apply_to_subranges (0U, vec_size, - std_cxx1x::bind(&internal::Vector::template + std_cxx1x::bind(&dealii::internal::Vector::template copy_subrange_ext, std_cxx1x::cref(v), std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::ref(*this)), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); else if (vec_size > 0) - internal::Vector::copy_subrange_ext(v, 0U, vec_size, *this); + dealii::internal::Vector::copy_subrange_ext(v, 0U, vec_size, *this); return *this; } @@ -1383,7 +1383,7 @@ Vector::scale (const Number factor) val+vec_size, val, (factor*boost::lambda::_1), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); } @@ -1452,7 +1452,7 @@ Vector::add (const Number a, v.val, val, (boost::lambda::_1 + a*boost::lambda::_2), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); } @@ -1475,7 +1475,7 @@ Vector::sadd (const Number x, v.val, val, (x*boost::lambda::_1 + a*boost::lambda::_2), - internal::Vector::minimum_parallel_grain_size); + dealii::internal::Vector::minimum_parallel_grain_size); } diff --git a/deal.II/include/deal.II/multigrid/mg_dof_accessor.h b/deal.II/include/deal.II/multigrid/mg_dof_accessor.h index 681de01fed..11a832bb29 100644 --- a/deal.II/include/deal.II/multigrid/mg_dof_accessor.h +++ b/deal.II/include/deal.II/multigrid/mg_dof_accessor.h @@ -151,7 +151,7 @@ namespace internal * @author Wolfgang Bangerth, 1998, 2006, 2008 */ template -class MGDoFAccessor : public internal::MGDoFAccessor::Inheritance::BaseClass +class MGDoFAccessor : public dealii::internal::MGDoFAccessor::Inheritance::BaseClass { public: /** @@ -161,7 +161,7 @@ class MGDoFAccessor : public internal::MGDoFAccessor::Inheritance::BaseClass + typename dealii::internal::MGDoFAccessor::Inheritance::BaseClass BaseClass; /** @@ -323,14 +323,14 @@ class MGDoFAccessor : public internal::MGDoFAccessor::Inheritance::line_iterator + typename dealii::internal::MGDoFHandler::Iterators::line_iterator line (const unsigned int i) const; /** * Return a pointer to the @p ith quad * bounding this @p Hex. */ - typename internal::MGDoFHandler::Iterators::quad_iterator + typename dealii::internal::MGDoFHandler::Iterators::quad_iterator quad (const unsigned int i) const; /** @@ -416,7 +416,7 @@ class MGDoFAccessor : public internal::MGDoFAccessor::Inheritance friend class MGDoFHandler; - friend struct internal::MGDoFHandler::Implementation; + friend struct dealii::internal::MGDoFHandler::Implementation; }; @@ -432,7 +432,7 @@ class MGDoFAccessor : public internal::MGDoFAccessor::Inheritance -class MGDoFAccessor<0,1,spacedim> : public internal::MGDoFAccessor::Inheritance<0,1,spacedim>::BaseClass +class MGDoFAccessor<0,1,spacedim> : public dealii::internal::MGDoFAccessor::Inheritance<0,1,spacedim>::BaseClass { public: /** @@ -442,7 +442,7 @@ class MGDoFAccessor<0,1,spacedim> : public internal::MGDoFAccessor::Inheritance< * simpler. */ typedef - typename internal::MGDoFAccessor::Inheritance<0,1,spacedim>::BaseClass + typename dealii::internal::MGDoFAccessor::Inheritance<0,1,spacedim>::BaseClass BaseClass; /** @@ -742,7 +742,7 @@ class MGDoFCellAccessor : public MGDoFAccessor * This function is not implemented in 1D, * and maps to MGDoFAccessor<2, dim>::line in 2D. */ - typename internal::MGDoFHandler::Iterators::face_iterator + typename dealii::internal::MGDoFHandler::Iterators::face_iterator face (const unsigned int i) const; /** @@ -756,7 +756,7 @@ class MGDoFCellAccessor : public MGDoFAccessor * access to the triangulation * data). */ - typename internal::MGDoFHandler::Iterators::cell_iterator + typename dealii::internal::MGDoFHandler::Iterators::cell_iterator neighbor_child_on_subface (const unsigned int face_no, const unsigned int subface_no) const; diff --git a/deal.II/include/deal.II/multigrid/mg_dof_handler.h b/deal.II/include/deal.II/multigrid/mg_dof_handler.h index d9dad28d0c..aa0bf6b665 100644 --- a/deal.II/include/deal.II/multigrid/mg_dof_handler.h +++ b/deal.II/include/deal.II/multigrid/mg_dof_handler.h @@ -54,7 +54,7 @@ namespace internal template class MGDoFHandler : public DoFHandler { - typedef internal::MGDoFHandler::Iterators IteratorSelector; + typedef dealii::internal::MGDoFHandler::Iterators IteratorSelector; public: typedef typename IteratorSelector::CellAccessor cell_accessor; typedef typename IteratorSelector::FaceAccessor face_accessor; @@ -985,13 +985,13 @@ class MGDoFHandler : public DoFHandler * are numbers which start from * zero on each level. */ - std::vector*> mg_levels; + std::vector*> mg_levels; /** * Space to store the DoF numbers * for the faces. */ - internal::DoFHandler::DoFFaces * mg_faces; + dealii::internal::DoFHandler::DoFFaces * mg_faces; /** * For each vertex there is a @@ -1013,7 +1013,7 @@ class MGDoFHandler : public DoFHandler * Make accessor objects friends. */ template friend class MGDoFAccessor; - friend struct internal::MGDoFHandler::Implementation; + friend struct dealii::internal::MGDoFHandler::Implementation; }; /*@}*/