From: bangerth Date: Tue, 2 Nov 2010 22:19:12 +0000 (+0000) Subject: Reindent. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=444551dbf682ef9e973c420d9c4b9607d3d370f3;p=dealii-svn.git Reindent. git-svn-id: https://svn.dealii.org/trunk@22586 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/hp/fe_values.h b/deal.II/include/deal.II/hp/fe_values.h index aaf18849b2..f39cbc0874 100644 --- a/deal.II/include/deal.II/hp/fe_values.h +++ b/deal.II/include/deal.II/hp/fe_values.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -50,23 +50,23 @@ namespace internal * indicates the type of underlying non-hp FE*Values base type, * i.e. it could either be dealii::FEValues, dealii::FEFaceValues, or * dealii::FESubfaceValues. - * + * * @ingroup hp * * @author Wolfgang Bangerth, 2003 */ template - class FEValuesBase + class FEValuesBase { - public: + public: /** * Constructor. Set the fields * of this class to the values * indicated by the parameters * to the constructor. */ - FEValuesBase (const dealii::hp::MappingCollection &mapping_collection, - const dealii::hp::FECollection &fe_collection, + FEValuesBase (const dealii::hp::MappingCollection &mapping_collection, + const dealii::hp::FECollection &fe_collection, const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); /** @@ -78,7 +78,7 @@ namespace internal * object for the mapping * object. */ - FEValuesBase (const dealii::hp::FECollection &fe_collection, + FEValuesBase (const dealii::hp::FECollection &fe_collection, const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); @@ -89,7 +89,7 @@ namespace internal */ const dealii::hp::FECollection & get_fe_collection () const; - + /** * Return a reference to the @p * FEValues object selected by the @@ -131,74 +131,74 @@ namespace internal */ const SmartPointer, FEValuesBase > fe_collection; - - /** - * A pointer to the - * collection of mappings to - * be used. - */ - const SmartPointer, - FEValuesBase > mapping_collection; - - /** - * Copy of the quadrature - * collection object - * provided to the - * constructor. - */ - const dealii::hp::QCollection q_collection; - private: - /** - * A table in which we store - * pointers to fe_values - * objects for different - * finite element, mapping, - * and quadrature objects - * from our collection. The - * first index indicates the - * index of the finite - * element within the - * fe_collection, the second - * the index of the mapping - * within the mapping - * collection, and the last - * one the index of the - * quadrature formula within - * the q_collection. - * - * Initially, all entries - * have zero pointers, and we - * will allocate them lazily - * as needed in - * select_fe_values(). - */ - Table<3,std_cxx1x::shared_ptr > fe_values_table; + /** + * A pointer to the + * collection of mappings to + * be used. + */ + const SmartPointer, + FEValuesBase > mapping_collection; - /** - * Set of indices pointing at - * the fe_values object - * selected last time the - * select_fe_value() function - * was called. - */ - TableIndices<3> present_fe_values_index; - - /** - * Values of the update flags as - * given to the constructor. - */ - const UpdateFlags update_flags; - }; + /** + * Copy of the quadrature + * collection object + * provided to the + * constructor. + */ + const dealii::hp::QCollection q_collection; + + private: + /** + * A table in which we store + * pointers to fe_values + * objects for different + * finite element, mapping, + * and quadrature objects + * from our collection. The + * first index indicates the + * index of the finite + * element within the + * fe_collection, the second + * the index of the mapping + * within the mapping + * collection, and the last + * one the index of the + * quadrature formula within + * the q_collection. + * + * Initially, all entries + * have zero pointers, and we + * will allocate them lazily + * as needed in + * select_fe_values(). + */ + Table<3,std_cxx1x::shared_ptr > fe_values_table; + + /** + * Set of indices pointing at + * the fe_values object + * selected last time the + * select_fe_value() function + * was called. + */ + TableIndices<3> present_fe_values_index; + + /** + * Values of the update flags as + * given to the constructor. + */ + const UpdateFlags update_flags; +}; + +} - } - } namespace hp { - + /** * An hp equivalent of the ::FEValues class. See the step-27 * tutorial program for examples of use. @@ -244,15 +244,15 @@ namespace hp * * @ingroup hp hpcollection * @author Wolfgang Bangerth, 2003 - */ + */ template - class FEValues : public internal::hp::FEValuesBase > + class FEValues : public internal::hp::FEValuesBase > { public: - - static const unsigned int dimension = dim; - static const unsigned int space_dimension = spacedim; + static const unsigned int dimension = dim; + + static const unsigned int space_dimension = spacedim; /** * Constructor. Initialize this @@ -274,8 +274,8 @@ namespace hp * DoFHandler::get_fe() * function. */ - FEValues (const dealii::hp::MappingCollection &mapping_collection, - const dealii::hp::FECollection &fe_collection, + FEValues (const dealii::hp::MappingCollection &mapping_collection, + const dealii::hp::FECollection &fe_collection, const dealii::hp::QCollection &q_collection, const UpdateFlags update_flags); @@ -302,7 +302,7 @@ namespace hp * DoFHandler::get_fe() * function. */ - FEValues (const hp::FECollection &fe_collection, + FEValues (const hp::FECollection &fe_collection, const hp::QCollection &q_collection, const UpdateFlags update_flags); @@ -481,7 +481,7 @@ namespace hp const unsigned int q_index = numbers::invalid_unsigned_int, const unsigned int mapping_index = numbers::invalid_unsigned_int, const unsigned int fe_index = numbers::invalid_unsigned_int); - + /** * Like the previous function, * but for non-hp @@ -545,7 +545,7 @@ namespace hp * * @ingroup hp hpcollection * @author Wolfgang Bangerth, 2003 - */ + */ template class FEFaceValues : public internal::hp::FEValuesBase > { @@ -779,7 +779,7 @@ namespace hp const unsigned int q_index = numbers::invalid_unsigned_int, const unsigned int mapping_index = numbers::invalid_unsigned_int, const unsigned int fe_index = numbers::invalid_unsigned_int); - + /** * Like the previous function, * but for non-hp @@ -826,7 +826,7 @@ namespace hp * * @ingroup hp hpcollection * @author Wolfgang Bangerth, 2003 - */ + */ template class FESubfaceValues : public internal::hp::FEValuesBase > { @@ -1042,7 +1042,7 @@ namespace hp const unsigned int q_index = numbers::invalid_unsigned_int, const unsigned int mapping_index = numbers::invalid_unsigned_int, const unsigned int fe_index = numbers::invalid_unsigned_int); - + /** * Like the previous function, * but for non-hp @@ -1081,13 +1081,13 @@ namespace hp const unsigned int mapping_index = numbers::invalid_unsigned_int, const unsigned int fe_index = numbers::invalid_unsigned_int); }; - + } // -------------- inline and template functions -------------- -namespace internal +namespace internal { namespace hp { @@ -1109,7 +1109,7 @@ namespace internal return *fe_collection; } } - + } DEAL_II_NAMESPACE_CLOSE