From fe8ab47cd34eaec286659c534ce4221f63f1fdbb Mon Sep 17 00:00:00 2001 From: guido Date: Sat, 23 Mar 2002 18:08:13 +0000 Subject: [PATCH] inlining some access functions and unused header file removed git-svn-id: https://svn.dealii.org/trunk@5605 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/mapping_q1.h | 58 +++++++++++++++++++++++++ deal.II/deal.II/source/fe/fe.cc | 1 - deal.II/deal.II/source/fe/fe_dgp.cc | 1 - deal.II/deal.II/source/fe/fe_dgq.cc | 1 - deal.II/deal.II/source/fe/fe_q.cc | 1 - deal.II/deal.II/source/fe/mapping_q1.cc | 51 ---------------------- 6 files changed, 58 insertions(+), 55 deletions(-) diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index 0806e2406f..613d549fda 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -522,6 +522,64 @@ class MappingQ1 : public Mapping static const unsigned int n_shape_functions = GeometryInfo::vertices_per_cell; }; +/*----------------------------------------------------------------------*/ + +template +inline +double +MappingQ1::InternalData::shape (const unsigned int qpoint, + const unsigned int shape_nr) const +{ + Assert(qpoint*n_shape_functions + shape_nr < shape_values.size(), + ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, + shape_values.size())); + return shape_values [qpoint*n_shape_functions + shape_nr]; +} + + + +template +inline +double & +MappingQ1::InternalData::shape (const unsigned int qpoint, + const unsigned int shape_nr) +{ + Assert(qpoint*n_shape_functions + shape_nr < shape_values.size(), + ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, + shape_values.size())); + return shape_values [qpoint*n_shape_functions + shape_nr]; +} + + +template +inline +Tensor<1,dim> +MappingQ1::InternalData::derivative (const unsigned int qpoint, + const unsigned int shape_nr) const +{ + Assert(qpoint*n_shape_functions + shape_nr < shape_derivatives.size(), + ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, + shape_derivatives.size())); + return shape_derivatives [qpoint*n_shape_functions + shape_nr]; +} + + + +template +inline +Tensor<1,dim> & +MappingQ1::InternalData::derivative (const unsigned int qpoint, + const unsigned int shape_nr) +{ + Assert(qpoint*n_shape_functions + shape_nr < shape_derivatives.size(), + ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, + shape_derivatives.size())); + return shape_derivatives [qpoint*n_shape_functions + shape_nr]; +} + + + + /* -------------- declaration of explicit specializations ------------- */ diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index a27679dd73..94bdcbcf25 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc index 58aa8bf28c..2e6db63f43 100644 --- a/deal.II/deal.II/source/fe/fe_dgp.cc +++ b/deal.II/deal.II/source/fe/fe_dgp.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 2d6abc635a..ad46be0614 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 636bed5422..a483f7ba11 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index 628e348ce1..bd83e01d0f 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -41,57 +41,6 @@ MappingQ1::InternalData::InternalData (const unsigned int n_shape_functions -template -double -MappingQ1::InternalData::shape (const unsigned int qpoint, - const unsigned int shape_nr) const -{ - Assert(qpoint*n_shape_functions + shape_nr < shape_values.size(), - ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, - shape_values.size())); - return shape_values [qpoint*n_shape_functions + shape_nr]; -} - - - -template -double & -MappingQ1::InternalData::shape (const unsigned int qpoint, - const unsigned int shape_nr) -{ - Assert(qpoint*n_shape_functions + shape_nr < shape_values.size(), - ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, - shape_values.size())); - return shape_values [qpoint*n_shape_functions + shape_nr]; -} - - -template -Tensor<1,dim> -MappingQ1::InternalData::derivative (const unsigned int qpoint, - const unsigned int shape_nr) const -{ - Assert(qpoint*n_shape_functions + shape_nr < shape_derivatives.size(), - ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, - shape_derivatives.size())); - return shape_derivatives [qpoint*n_shape_functions + shape_nr]; -} - - - -template -Tensor<1,dim> & -MappingQ1::InternalData::derivative (const unsigned int qpoint, - const unsigned int shape_nr) -{ - Assert(qpoint*n_shape_functions + shape_nr < shape_derivatives.size(), - ExcIndexRange(qpoint*n_shape_functions + shape_nr, 0, - shape_derivatives.size())); - return shape_derivatives [qpoint*n_shape_functions + shape_nr]; -} - - - template unsigned int MappingQ1::InternalData::memory_consumption () const -- 2.39.5