Move a member variable to derived classes.

The variable isn't used in the base class, and not all derived classes
use it either.

diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h
index cd5d6cf75a5641538fe4704626949d469f9ee18e..2909526df2396eb0486ed2c1897bdadb5c77d4c6 100644 (file)
--- a/include/deal.II/fe/mapping.h
+++ b/include/deal.II/fe/mapping.h
@@ -320,12 +320,6 @@ public:
      */
     virtual std::size_t memory_consumption () const;
 
-    /**
-     * The determinant of the Jacobian in each quadrature point. Filled if
-     * #update_volume_elements.
-     */
-    mutable std::vector<double> volume_elements;
-
     /**
      * The positions of the mapped (generalized) support points.
      */

diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h
index 66ede966605c28e0bf213bcd4149abe4cc6d573c..917cf17dcd1413e91e13e96cc6fba367d3ac7d93 100644 (file)
--- a/include/deal.II/fe/mapping_fe_field.h
+++ b/include/deal.II/fe/mapping_fe_field.h
@@ -288,6 +288,12 @@ public:
      */
     mutable std::vector< DerivativeForm<1,dim,spacedim> > contravariant;
 
+    /**
+     * The determinant of the Jacobian in each quadrature point. Filled if
+     * #update_volume_elements.
+     */
+    mutable std::vector<double> volume_elements;
+
     /**
      * Unit tangential vectors. Used for the computation of boundary forms and
      * normal vectors.

diff --git a/include/deal.II/fe/mapping_q1.h b/include/deal.II/fe/mapping_q1.h
index 2b6e7a429d84f50fd17f9e595ce08d0fd1eb529a..e34b736dddeb2d0a8cccd020f6e46dd12c747e52 100644 (file)
--- a/include/deal.II/fe/mapping_q1.h
+++ b/include/deal.II/fe/mapping_q1.h
@@ -278,6 +278,12 @@ public:
      */
     mutable typename Triangulation<dim,spacedim>::cell_iterator cell_of_current_support_points;
 
+    /**
+     * The determinant of the Jacobian in each quadrature point. Filled if
+     * #update_volume_elements.
+     */
+    mutable std::vector<double> volume_elements;
+
     /**
      * Default value of this flag is @p true. If <tt>*this</tt> is an object
      * of a derived class, this flag is set to @p false.

diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc
index 0acb705a55d4ce3d693074e38f82badc669e29d0..4d3976f8c456631b225fb3e655437fb64a6f2cba 100644 (file)
--- a/source/fe/mapping_fe_field.cc
+++ b/source/fe/mapping_fe_field.cc
@@ -60,6 +60,7 @@ template<int dim, int spacedim, class VECTOR, class DH>
 std::size_t
 MappingFEField<dim,spacedim,VECTOR,DH>::InternalData::memory_consumption () const
 {
+  Assert (false, ExcNotImplemented());
   return 0;
 }
 

diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc
index a2d077e749584f4eae7a8b5ee41f9698a9ba51a2..8ac9ef5ab31ebe0c3e84bc11aa364be8e2ae5335 100644 (file)
--- a/source/fe/mapping_q1.cc
+++ b/source/fe/mapping_q1.cc
@@ -61,6 +61,7 @@ MappingQ1<dim,spacedim>::InternalData::memory_consumption () const
           MemoryConsumption::memory_consumption (aux) +
           MemoryConsumption::memory_consumption (mapping_support_points) +
           MemoryConsumption::memory_consumption (cell_of_current_support_points) +
+          MemoryConsumption::memory_consumption (volume_elements) +
           MemoryConsumption::memory_consumption (is_mapping_q1_data) +
           MemoryConsumption::memory_consumption (n_shape_functions));
 }