inlining some access functions and unused header file removed

git-svn-id: https://svn.dealii.org/trunk@5605 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h
index 0806e2406f2f8481939f3a40d93aba908d274d9f..613d549fda8bad3c47e31e92ea1d612e2e4cd416 100644 (file)
--- 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<dim>
     static const unsigned int n_shape_functions = GeometryInfo<dim>::vertices_per_cell;
 };
 
+/*----------------------------------------------------------------------*/
+
+template<int dim>
+inline
+double
+MappingQ1<dim>::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 <int dim>
+inline
+double &
+MappingQ1<dim>::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 <int dim>
+inline
+Tensor<1,dim>
+MappingQ1<dim>::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 <int dim>
+inline
+Tensor<1,dim> &
+MappingQ1<dim>::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 a27679dd73a1ecdc285401aa212ded76ae910eaa..94bdcbcf25f501d62c5f8f9e30dc69555f5428c2 100644 (file)
--- a/deal.II/deal.II/source/fe/fe.cc
+++ b/deal.II/deal.II/source/fe/fe.cc
@@ -15,7 +15,6 @@
 #include <fe/fe.h>
 #include <base/memory_consumption.h>
 #include <fe/mapping.h>
-#include <fe/mapping_q1.h>
 #include <fe/fe_values.h>
 #include <base/quadrature.h>
 #include <grid/tria.h>

diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc
index 58aa8bf28cd3846b5714d6ed9c5d53397f3a7844..2e6db63f431a22a31ab702fa2212861c4d869086 100644 (file)
--- 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 <dofs/dof_accessor.h>
 #include <fe/fe.h>
 #include <fe/mapping.h>
-#include <fe/mapping_q1.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_values.h>
 

diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc
index 2d6abc635a9ea805027fdb65121e94c171a156e6..ad46be06142cc06ed669daa51c3acabf2e9b7886 100644 (file)
--- 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 <dofs/dof_accessor.h>
 #include <fe/fe.h>
 #include <fe/mapping.h>
-#include <fe/mapping_q1.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_values.h>
 

diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc
index 636bed5422173decee38706ebda656e7489b7315..a483f7ba117c0fa4235de9d81756ba66b0d0f473 100644 (file)
--- 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 <dofs/dof_accessor.h>
 #include <fe/fe.h>
 #include <fe/mapping.h>
-#include <fe/mapping_q1.h>
 #include <fe/fe_q.h>
 #include <fe/fe_values.h>
 

diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc
index 628e348ce13b033c2fb76ef55b92469d5660796a..bd83e01d0fd72e0392780e79126ccff80579c0c0 100644 (file)
--- 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<dim>::InternalData::InternalData (const unsigned int n_shape_functions
 
 
 
-template<int dim>
-double
-MappingQ1<dim>::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 <int dim>
-double &
-MappingQ1<dim>::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 <int dim>
-Tensor<1,dim>
-MappingQ1<dim>::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 <int dim>
-Tensor<1,dim> &
-MappingQ1<dim>::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 <int dim>
 unsigned int
 MappingQ1<dim>::InternalData::memory_consumption () const