Provide MappingQ::transform() variants.

Adding these variants had previously been forgotten.

diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h
index 9577b138681491a0c2c13ab43fb3591af4801302..ec29075344b94693689d5ba7760fff8955eeccfd 100644 (file)
--- a/include/deal.II/fe/mapping_q.h
+++ b/include/deal.II/fe/mapping_q.h
@@ -141,6 +141,22 @@ public:
              const typename Mapping<dim,spacedim>::InternalDataBase &internal,
              VectorSlice<std::vector<Tensor<2,spacedim> > >          output) const;
 
+  // for documentation, see the Mapping base class
+  virtual
+  void
+  transform (const VectorSlice<const std::vector< DerivativeForm<2, dim, spacedim> > > input,
+             const MappingType                                                         type,
+             const typename Mapping<dim,spacedim>::InternalDataBase                   &internal,
+             VectorSlice<std::vector<Tensor<3,spacedim> > >                            output) const;
+
+  // for documentation, see the Mapping base class
+  virtual
+  void
+  transform (const VectorSlice<const std::vector<Tensor<3, dim> > >  input,
+             const MappingType                                       type,
+             const typename Mapping<dim,spacedim>::InternalDataBase &internal,
+             VectorSlice<std::vector<Tensor<3,spacedim> > >          output) const;
+
   /**
    * Return the degree of the mapping, i.e. the value which was passed to the
    * constructor.

diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
index 5c69092a7593d26bac11c518ba4e2850529aa6da..4f811729edbdea0d77f6d15aeb93d6ac988554ca 100644 (file)
--- a/source/fe/mapping_q.cc
+++ b/source/fe/mapping_q.cc
@@ -1086,6 +1086,68 @@ transform (const VectorSlice<const std::vector<Tensor<2, dim> > >  input,
 }
 
 
+
+template<int dim, int spacedim>
+void
+MappingQ<dim,spacedim>::
+transform (const VectorSlice<const std::vector<DerivativeForm<2, dim ,spacedim>  > >  input,
+           const MappingType                                                          mapping_type,
+           const typename Mapping<dim,spacedim>::InternalDataBase                    &mapping_data,
+           VectorSlice<std::vector<Tensor<3,spacedim> > >                             output) const
+{
+  AssertDimension (input.size(), output.size());
+  // The data object may be just a MappingQ1::InternalData, so we have to test
+  // for this first.
+  const typename MappingQ1<dim,spacedim>::InternalData *q1_data =
+    dynamic_cast<const typename MappingQ1<dim,spacedim>::InternalData *> (&mapping_data);
+  Assert(q1_data!=0, ExcInternalError());
+
+  // If it is a genuine MappingQ::InternalData, we have to test further
+  if (!q1_data->is_mapping_q1_data)
+    {
+      Assert (dynamic_cast<const InternalData *>(&mapping_data) != 0,
+              ExcInternalError());
+      const InternalData &data = static_cast<const InternalData &>(mapping_data);
+      // If we only use the Q1-portion, we have to extract that data object
+      if (data.use_mapping_q1_on_current_cell)
+        q1_data = &data.mapping_q1_data;
+    }
+  // Now, q1_data should have the right tensors in it and we call the base
+  // classes transform function
+  MappingQ1<dim,spacedim>::transform(input, mapping_type, *q1_data, output);
+}
+
+
+template<int dim, int spacedim>
+void MappingQ<dim,spacedim>::
+transform (const VectorSlice<const std::vector<Tensor<3, dim> > >  input,
+           const MappingType                                       mapping_type,
+           const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+           VectorSlice<std::vector<Tensor<3,spacedim> > >          output) const
+{
+  AssertDimension (input.size(), output.size());
+  // The data object may be just a MappingQ1::InternalData, so we have to test
+  // for this first.
+  const typename MappingQ1<dim,spacedim>::InternalData *q1_data =
+    dynamic_cast<const typename MappingQ1<dim,spacedim>::InternalData *> (&mapping_data);
+  Assert(q1_data!=0, ExcInternalError());
+
+  // If it is a genuine MappingQ::InternalData, we have to test further
+  if (!q1_data->is_mapping_q1_data)
+    {
+      Assert (dynamic_cast<const InternalData *>(&mapping_data) != 0,
+              ExcInternalError());
+      const InternalData &data = static_cast<const InternalData &>(mapping_data);
+      // If we only use the Q1-portion, we have to extract that data object
+      if (data.use_mapping_q1_on_current_cell)
+        q1_data = &data.mapping_q1_data;
+    }
+  // Now, q1_data should have the right tensors in it and we call the base
+  // classes transform function
+  MappingQ1<dim,spacedim>::transform(input, mapping_type, *q1_data, output);
+}
+
+
 template<int dim, int spacedim>
 Point<spacedim>
 MappingQ<dim,spacedim>::