From: Ralf Hartmann Date: Fri, 10 Feb 2006 12:36:26 +0000 (+0000) Subject: Replace QCollection::get_quadrature() and n_quadratures() by operator[] and size() X-Git-Tag: v8.0.0~12387 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9226ebafaecbc3e0de84e5161997d385bce15d69;p=dealii.git Replace QCollection::get_quadrature() and n_quadratures() by operator[] and size() git-svn-id: https://svn.dealii.org/trunk@12292 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/q_collection.h b/deal.II/deal.II/include/fe/q_collection.h index 23e0cea93c..a454125634 100644 --- a/deal.II/deal.II/include/fe/q_collection.h +++ b/deal.II/deal.II/include/fe/q_collection.h @@ -60,7 +60,7 @@ namespace hp * Returns the number of quadrature * pointers stored in this object. */ - unsigned int n_quadratures () const; + unsigned int size () const; /** * Returns a reference to the @@ -72,7 +72,7 @@ namespace hp * collection. */ const Quadrature & - get_quadrature (const unsigned int index) const; + operator[] (const unsigned int index) const; /** * Adds a new quadrature rule to the @@ -139,7 +139,7 @@ namespace hp template inline unsigned int - QCollection::n_quadratures () const + QCollection::size () const { return quadratures.size(); } diff --git a/deal.II/deal.II/source/fe/hp_fe_values.cc b/deal.II/deal.II/source/fe/hp_fe_values.cc index 8ac956e8eb..41eb74f27e 100644 --- a/deal.II/deal.II/source/fe/hp_fe_values.cc +++ b/deal.II/deal.II/source/fe/hp_fe_values.cc @@ -130,8 +130,7 @@ namespace hp { return new ::FEValues ( this->mapping_collection.get_mapping (active_fe_index), fe, - this->q_collection.get_quadrature (active_fe_index), - this->update_flags); + this->q_collection[active_fe_index], this->update_flags); } @@ -188,8 +187,7 @@ namespace hp { return new ::FEFaceValues ( this->mapping_collection.get_mapping (active_fe_index), fe, - this->q_collection.get_quadrature (active_fe_index), - this->update_flags); + this->q_collection[active_fe_index], this->update_flags); } @@ -248,8 +246,7 @@ namespace hp { return new ::FESubfaceValues ( this->mapping_collection.get_mapping (active_fe_index), fe, - this->q_collection.get_quadrature (active_fe_index), - this->update_flags); + this->q_collection[active_fe_index], this->update_flags); } } diff --git a/deal.II/deal.II/source/fe/q_collection.cc b/deal.II/deal.II/source/fe/q_collection.cc index fdce94252d..409bbe2471 100644 --- a/deal.II/deal.II/source/fe/q_collection.cc +++ b/deal.II/deal.II/source/fe/q_collection.cc @@ -41,7 +41,7 @@ namespace hp template inline const Quadrature & - QCollection::get_quadrature (const unsigned int index) const + QCollection::operator[] (const unsigned int index) const { // if we have only a single quadrature // that was given during construction,