]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Move Quadrature::get_points() ad Quadrature::get_weights() functions to .h-file....
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 12 Nov 2009 23:16:40 +0000 (23:16 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 12 Nov 2009 23:16:40 +0000 (23:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@20105 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/quadrature.h
deal.II/base/source/quadrature.cc

index d9e944abeb8c3b804fdff0775c20e10a63a3f4f2..5cd81bd057839bbfa77c2aafaf177f81e6dfa87f 100644 (file)
@@ -46,7 +46,7 @@ DEAL_II_NAMESPACE_OPEN
  * dimension zero contains no information. The main purpose of these
  * formulæ is their use in QProjector, which will create a useful
  * formula of dimension one out of them.
- * 
+ *
  * <h3>Mathematical background</h3>
  *
  * For each quadrature formula we denote by <tt>m</tt>, the maximal
@@ -89,7 +89,7 @@ class Quadrature : public Subscriptor
                                      * then be a face quadrature.
                                      */
     typedef Quadrature<dim-1> SubQuadrature;
-    
+
                                     /**
                                      * @deprecated Use size()
                                      * instead.
@@ -137,7 +137,7 @@ class Quadrature : public Subscriptor
                                      */
     Quadrature (const SubQuadrature &,
                const Quadrature<1> &);
-    
+
                                     /**
                                      * Build this quadrature formula
                                      * as the <tt>dim</tt>-fold
@@ -165,7 +165,7 @@ class Quadrature : public Subscriptor
                                       * Copy constructor.
                                       */
     Quadrature (const Quadrature<dim> &q);
-    
+
                                     /**
                                      * Construct a quadrature formula
                                      * from given vectors of
@@ -210,7 +210,7 @@ class Quadrature : public Subscriptor
                                      * size.
                                      */
     Quadrature& operator = (const Quadrature<dim>&);
-    
+
                                     /**
                                      * Virtual destructor.
                                      */
@@ -220,7 +220,7 @@ class Quadrature : public Subscriptor
                                      * Number of quadrature points.
                                      */
     unsigned int size () const;
-    
+
                                     /**
                                      * Return the <tt>i</tt>th quadrature
                                      * point.
@@ -233,7 +233,7 @@ class Quadrature : public Subscriptor
                                      * points.
                                      */
     const std::vector<Point<dim> > & get_points () const;
-    
+
                                     /**
                                      * Return the weight of the <tt>i</tt>th
                                      * quadrature point.
@@ -294,14 +294,14 @@ class QAnisotropic : public Quadrature<dim>
                                      * quadrature rule.
                                      */
     QAnisotropic(const Quadrature<1>& qx);
-    
+
                                     /**
                                      * Constructor for a
                                      * two-dimensional formula.
                                      */
     QAnisotropic(const Quadrature<1>& qx,
                 const Quadrature<1>& qy);
-    
+
                                     /**
                                      * Constructor for a
                                      * three-dimensional formula.
@@ -405,6 +405,28 @@ Quadrature<dim>::weight (const unsigned int i) const
 
 
 
+template <int dim>
+inline
+const std::vector<Point<dim> > &
+Quadrature<dim>::get_points () const
+{
+  Assert (dim > 0, ExcInternalError());
+  return quadrature_points;
+}
+
+
+
+template <int dim>
+inline
+const std::vector<double> &
+Quadrature<dim>::get_weights () const
+{
+  return weights;
+}
+
+
+
+
 
 /* -------------- declaration of explicit specializations ------------- */
 
@@ -425,9 +447,6 @@ Quadrature<1>::Quadrature (const Quadrature<0> &,
 template <>
 Quadrature<1>::Quadrature (const Quadrature<0> &);
 
-template <>
-const std::vector<Point<0> > & Quadrature<0>::get_points () const;
-
 #endif // DOXYGEN
 DEAL_II_NAMESPACE_CLOSE
 
index 80d46e8449654a61b7798047e55148b43067d6c4..5e104b9650cc98e602abd0ad7464b97f3cd35c0e 100644 (file)
@@ -277,34 +277,6 @@ Quadrature<dim>::~Quadrature ()
 
 
 
-template <>
-const std::vector<Point<0> > &
-Quadrature<0>::get_points () const
-{
-  Assert (false, ExcInternalError());
-  return quadrature_points;
-}
-
-
-
-template <int dim>
-const std::vector<Point<dim> > &
-Quadrature<dim>::get_points () const
-{
-  return quadrature_points;
-}
-
-
-
-template <int dim>
-const std::vector<double> &
-Quadrature<dim>::get_weights () const
-{
-  return weights;
-}
-
-
-
 template <int dim>
 unsigned int
 Quadrature<dim>::memory_consumption () const

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.