From: Stefano Dominici <sfndmn@gmail.com>
Date: Thu, 18 Oct 2018 15:03:36 +0000 (+0200)
Subject: Modified TensorProductManifold class
X-Git-Tag: v9.1.0-rc1~605^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106ebf2441dd647514b68b79cd0323307ce56740;p=dealii.git

Modified TensorProductManifold class

The data members are copies of the constructor parameters and are stored
in shared_ptr objects. The constructor converts the unique_ptr objects from clone() method called on the constructor arguments into shared_ptr().
---

diff --git a/include/deal.II/grid/tensor_product_manifold.h b/include/deal.II/grid/tensor_product_manifold.h
index 2c847d6099..73c6561132 100644
--- a/include/deal.II/grid/tensor_product_manifold.h
+++ b/include/deal.II/grid/tensor_product_manifold.h
@@ -119,24 +119,10 @@ public:
   push_forward_gradient(const Point<chartdim> &chart_point) const override;
 
 private:
-  SmartPointer<const ChartManifold<dim_A, spacedim_A, chartdim_A>,
-               TensorProductManifold<dim,
-                                     dim_A,
-                                     spacedim_A,
-                                     chartdim_A,
-                                     dim_B,
-                                     spacedim_B,
-                                     chartdim_B>>
+  std::shared_ptr<const ChartManifold<dim_A, spacedim_A, chartdim_A>>
     manifold_A;
 
-  SmartPointer<const ChartManifold<dim_B, spacedim_B, chartdim_B>,
-               TensorProductManifold<dim,
-                                     dim_A,
-                                     spacedim_A,
-                                     chartdim_A,
-                                     dim_B,
-                                     spacedim_B,
-                                     chartdim_B>>
+  std::shared_ptr<const ChartManifold<dim_B, spacedim_B, chartdim_B>>
     manifold_B;
 };
 
@@ -210,9 +196,18 @@ TensorProductManifold<dim,
       internal::TensorProductManifoldImplementation::concat(
         manifold_A.get_periodicity(),
         manifold_B.get_periodicity()))
-  , manifold_A(&manifold_A)
-  , manifold_B(&manifold_B)
-{}
+{
+  std::shared_ptr<Manifold<dim_A, spacedim_A>> tmpA(
+    std::move(manifold_A.clone()));
+  std::shared_ptr<Manifold<dim_B, spacedim_B>> tmpB(
+    std::move(manifold_B.clone()));
+  this->manifold_A =
+    std::static_pointer_cast<ChartManifold<dim_A, spacedim_A, chartdim_A>>(
+      tmpA);
+  this->manifold_B =
+    std::static_pointer_cast<ChartManifold<dim_B, spacedim_B, chartdim_B>>(
+      tmpB);
+}
 
 template <int dim,
           int dim_A,