From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Sat, 26 Nov 2016 03:09:45 +0000 (-0700)
Subject: Change the type of ChartManifold::sub_manifold.
X-Git-Tag: v8.5.0-rc1~361^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9500401dc5f397216321f43974b56cfcbac14c26;p=dealii.git

Change the type of ChartManifold::sub_manifold.
---

diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h
index bee19b2757..a1fda6dfb2 100644
--- a/include/deal.II/grid/manifold.h
+++ b/include/deal.II/grid/manifold.h
@@ -1028,8 +1028,15 @@ private:
   /**
    * The sub_manifold object is used to compute the average of the points in
    * the chart coordinates system.
+   *
+   * In an ideal world, it would have type
+   * FlatManifold<dim,chartdim>. However, this would instantiate cases
+   * where dim>spacedim, which leads to invalid situations. We instead
+   * use <chartdim,chartdim>, which is (i) always valid, and (ii) does
+   * not matter at all since the first (dim) argument of manifolds is,
+   * in fact, ignored as far as manifold functionality is concerned.
    */
-  const FlatManifold<dim,chartdim> sub_manifold;
+  const FlatManifold<chartdim,chartdim> sub_manifold;
 };