]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Refactored FunctionManifold.
authorLuca Heltai <luca.heltai@sissa.it>
Thu, 7 Aug 2014 14:15:26 +0000 (16:15 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Thu, 7 Aug 2014 14:16:27 +0000 (16:16 +0200)
doc/news/changes.h
include/deal.II/grid/manifold_lib.h
source/grid/manifold_lib.cc
source/grid/manifold_lib.inst.in
tests/manifold/function_manifold_01.cc [moved from tests/manifold/function_manifold_chart_01.cc with 96% similarity]
tests/manifold/function_manifold_01.output [moved from tests/manifold/function_manifold_chart_01.output with 100% similarity]
tests/manifold/function_manifold_02.cc [moved from tests/manifold/function_manifold_chart_02.cc with 96% similarity]
tests/manifold/function_manifold_02.output [moved from tests/manifold/function_manifold_chart_02.output with 100% similarity]

index 1fdaab934a15731181b0fa4ad84041398400444f..469c185d1fc0d5cfb517693bb9b2fba2b77e75af 100644 (file)
@@ -99,7 +99,7 @@ inconvenience this causes.
 <ol>
 
 
-  <li> New: Added FunctionManifoldChart descritpion.
+  <li> New: Added FunctionManifold descritpion.
   <br>
   This class allows arbitrary manifold descriptions, in which you have
   an explicit Function<chartdim> for the ManifoldChart::push_forward()
index 899083dfa06c99147b01ccbba38b1e3866834fb8..562efb98382ceeef81250ca53648f2a4792c9a0f 100644 (file)
@@ -201,7 +201,7 @@ private:
  * @author Luca Heltai, 2014
  */
 template <int dim, int spacedim=dim, int chartdim=dim>
-class FunctionManifoldChart : public ManifoldChart<dim, spacedim, chartdim> 
+class FunctionManifold : public ManifoldChart<dim, spacedim, chartdim> 
 {
 public:
   /**
@@ -213,7 +213,7 @@ public:
    * The tolerance argument is used in debug mode to actually check
    * that the two functions are one the inverse of the other.
    */
-  FunctionManifoldChart(const Function<chartdim> &push_forward_function,
+  FunctionManifold(const Function<chartdim> &push_forward_function,
                        const Function<spacedim> &pull_back_function,
                        const Point<chartdim> periodicity=Point<chartdim>(),
                        const double tolerance=1e-10);
@@ -233,7 +233,7 @@ public:
    * The tolerance argument is used in debug mode to actually check
    * that the two functions are one the inverse of the other.
    */
-  FunctionManifoldChart(const std::string push_forward_expression,
+  FunctionManifold(const std::string push_forward_expression,
                        const std::string pull_back_expression,
                        const Point<chartdim> periodicity=Point<chartdim>(), 
                        const typename FunctionParser<spacedim>::ConstMap = typename FunctionParser<spacedim>::ConstMap(),
@@ -244,7 +244,7 @@ public:
   /**
    * If needed, we delete the pointers we own.
    */
-  ~FunctionManifoldChart();
+  ~FunctionManifold();
   
   /**
    * Given a point in the chartdim coordinate system, uses the
@@ -272,13 +272,13 @@ private:
    * Pointer to the push_forward function.
    */
   SmartPointer<const Function<chartdim>,
-              FunctionManifoldChart<dim,spacedim,chartdim> > push_forward_function;
+              FunctionManifold<dim,spacedim,chartdim> > push_forward_function;
   
   /**
    * Pointer to the pull_back function.
    */
   SmartPointer<const Function<spacedim>, 
-              FunctionManifoldChart<dim,spacedim,chartdim> > pull_back_function;
+              FunctionManifold<dim,spacedim,chartdim> > pull_back_function;
   
   /**
    * Relative tolerance. In debug mode, we check that the two
index ee76066b44283bdcc8d0bbc61c23de9098766c07..209b10b1ddd9b7316dfcc2a187511f5c22665ba7 100644 (file)
@@ -208,7 +208,7 @@ get_new_point (const Quadrature<spacedim> &quad) const
 // FunctionManifoldChart
 // ============================================================
 template <int dim, int spacedim, int chartdim>
-FunctionManifoldChart<dim,spacedim,chartdim>::FunctionManifoldChart
+FunctionManifold<dim,spacedim,chartdim>::FunctionManifold
 (const Function<chartdim> &push_forward_function,
  const Function<spacedim> &pull_back_function,
  const Point<chartdim> periodicity,
@@ -224,7 +224,7 @@ FunctionManifoldChart<dim,spacedim,chartdim>::FunctionManifoldChart
 }
 
 template <int dim, int spacedim, int chartdim>
-FunctionManifoldChart<dim,spacedim,chartdim>::FunctionManifoldChart
+FunctionManifold<dim,spacedim,chartdim>::FunctionManifold
 (const std::string push_forward_expression,
  const std::string pull_back_expression, 
  const Point<chartdim> periodicity, 
@@ -246,7 +246,7 @@ FunctionManifoldChart<dim,spacedim,chartdim>::FunctionManifoldChart
 }
 
 template <int dim, int spacedim, int chartdim>
-FunctionManifoldChart<dim,spacedim,chartdim>::~FunctionManifoldChart() {
+FunctionManifold<dim,spacedim,chartdim>::~FunctionManifold() {
   if(owns_pointers == true) {
     const Function<chartdim> * pf = push_forward_function;
     push_forward_function = 0;
@@ -260,7 +260,7 @@ FunctionManifoldChart<dim,spacedim,chartdim>::~FunctionManifoldChart() {
                                                                   
 template <int dim, int spacedim, int chartdim>
 Point<spacedim>
-FunctionManifoldChart<dim,spacedim,chartdim>::push_forward(const Point<chartdim> &chart_point) const
+FunctionManifold<dim,spacedim,chartdim>::push_forward(const Point<chartdim> &chart_point) const
 {
   Vector<double> pf(spacedim);
   Point<spacedim> result;
@@ -284,7 +284,7 @@ FunctionManifoldChart<dim,spacedim,chartdim>::push_forward(const Point<chartdim>
 
 template <int dim, int spacedim, int chartdim>
 Point<chartdim>
-FunctionManifoldChart<dim,spacedim,chartdim>::pull_back(const Point<spacedim> &space_point) const
+FunctionManifold<dim,spacedim,chartdim>::pull_back(const Point<spacedim> &space_point) const
 {
   Vector<double> pb(chartdim);
   Point<chartdim> result;
index 0945e6d66a7b8d0980ffe320cf45ac69194c1fc1..00a6d200c0cc7de9c4e11e7366ecc7dcb4ea9e9d 100644 (file)
@@ -22,9 +22,9 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 #endif
 #if deal_II_dimension <= deal_II_space_dimension
     template class CylindricalManifold<deal_II_dimension, deal_II_space_dimension>;
-    template class FunctionManifoldChart<deal_II_dimension, deal_II_space_dimension, 1>;                         
-    template class FunctionManifoldChart<deal_II_dimension, deal_II_space_dimension, 2>;
-    template class FunctionManifoldChart<deal_II_dimension, deal_II_space_dimension, 3>;
+    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 1>;                      
+    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 2>;
+    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 3>;
 #endif
   }
 
similarity index 96%
rename from tests/manifold/function_manifold_chart_01.cc
rename to tests/manifold/function_manifold_01.cc
index 04e06cf53949f1e03b2ee03b056d9ef4d0c51d32..e63969370c10306e62041b85afc13a8cf6da8b61 100644 (file)
@@ -49,7 +49,7 @@ void test(unsigned int ref=1)
     Assert(false, ExcInternalError());
   }
   
-  FunctionManifoldChart<dim,spacedim,spacedim> manifold(push_forward_expression, 
+  FunctionManifold<dim,spacedim,spacedim> manifold(push_forward_expression, 
                                                        pull_back_expression);
 
   Triangulation<dim,spacedim> tria;
similarity index 96%
rename from tests/manifold/function_manifold_chart_02.cc
rename to tests/manifold/function_manifold_02.cc
index f6ac49b13b0bd6b4c8cc3d2acb6b65e2a74dda18..e5f0c37cbd352027a7fd5d0f428bece047c44f02 100644 (file)
@@ -49,7 +49,7 @@ void test(unsigned int ref=1)
     Assert(false, ExcInternalError());
   }
   
-  FunctionManifoldChart<dim,spacedim,spacedim> manifold(push_forward_expression, 
+  FunctionManifold<dim,spacedim,spacedim> manifold(push_forward_expression, 
                                                        pull_back_expression);
 
   Triangulation<dim,spacedim> tria;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.