From 6335854b5b875a4a9ed21b27bd769b3cfcd30385 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 28 Jul 2004 14:21:33 +0000 Subject: [PATCH] Make a number of frequently used functions inline. git-svn-id: https://svn.dealii.org/trunk@9529 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_values.h | 49 ++++++++++++++++++++++++++ deal.II/deal.II/source/fe/fe_values.cc | 44 ----------------------- 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 517cddb842..f93a216e03 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -2381,6 +2381,55 @@ FEValuesBase::get_cell () const return *present_cell; } + +template +inline +const std::vector > & +FEValuesBase::get_quadrature_points () const +{ + Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); + return this->quadrature_points; +} + + + +template +inline +const std::vector & +FEValuesBase::get_JxW_values () const +{ + Assert (this->update_flags & update_JxW_values, ExcAccessToUninitializedField()); + return this->JxW_values; +} + + + +template +inline +const Point & +FEValuesBase::quadrature_point (const unsigned int i) const +{ + Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); + Assert (iquadrature_points.size(), ExcIndexRange(i, 0, this->quadrature_points.size())); + + return this->quadrature_points[i]; +} + + + + +template +inline +double +FEValuesBase::JxW (const unsigned int i) const +{ + Assert (this->update_flags & update_JxW_values, ExcAccessToUninitializedField()); + Assert (iJxW_values.size(), ExcIndexRange(i, 0, this->JxW_values.size())); + + return this->JxW_values[i]; +} + + /*------------------------ Inline functions: FEValues ----------------------------*/ diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 284a4b5bc2..2c6d8f27c7 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -558,26 +558,6 @@ void FEValuesBase::get_function_values ( -template -const std::vector > & -FEValuesBase::get_quadrature_points () const -{ - Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); - return this->quadrature_points; -} - - - -template -const std::vector & -FEValuesBase::get_JxW_values () const -{ - Assert (this->update_flags & update_JxW_values, ExcAccessToUninitializedField()); - return this->JxW_values; -} - - - template template void @@ -761,30 +741,6 @@ get_function_2nd_derivatives (const InputVector &fe_func -template -const Point & -FEValuesBase::quadrature_point (const unsigned int i) const -{ - Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); - Assert (iquadrature_points.size(), ExcIndexRange(i, 0, this->quadrature_points.size())); - - return this->quadrature_points[i]; -} - - - - -template -double FEValuesBase::JxW (const unsigned int i) const -{ - Assert (this->update_flags & update_JxW_values, ExcAccessToUninitializedField()); - Assert (iJxW_values.size(), ExcIndexRange(i, 0, this->JxW_values.size())); - - return this->JxW_values[i]; -} - - - template unsigned int FEValuesBase::memory_consumption () const -- 2.39.5