]> https://gitweb.dealii.org/ - dealii.git/commitdiff
move declaration of dimension into FEValuesBase
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 23 Feb 2010 23:04:22 +0000 (23:04 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 23 Feb 2010 23:04:22 +0000 (23:04 +0000)
git-svn-id: https://svn.dealii.org/trunk@20678 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/source/fe/fe_values.cc

index 8dd4ee1827abbf74a1274234cd4155a4f921f4c3..79501b6fe3fc5b60c7f77ebebea511d31950a6c4 100644 (file)
@@ -1474,6 +1474,18 @@ class FEValuesBase : protected FEValuesData<dim,spacedim>,
                      public Subscriptor
 {
   public:
+                                     /**
+                                      * Dimension in which this object
+                                      * operates.
+                                      */
+    static const unsigned int dimension = dim;
+
+                                     /**
+                                      * Dimension of the space in
+                                      * which this object operates.
+                                      */
+    static const unsigned int space_dimension = spacedim;
+
                                     /**
                                      * Number of quadrature points.
                                      */
@@ -2812,18 +2824,6 @@ template <int dim, int spacedim=dim>
 class FEValues : public FEValuesBase<dim,spacedim>
 {
   public:
-                                     /**
-                                      * Dimension in which this object
-                                      * operates.
-                                      */
-    static const unsigned int dimension = dim;
-
-                                     /**
-                                      * Dimension of the space in
-                                      * which this object operates.
-                                      */
-    static const unsigned int space_dimension = spacedim;
-
                                      /**
                                       * Dimension of the object over
                                       * which we integrate. For the
index 4134d62af22fd019c58f548f86ab41e0e544961f..983102bcaf51a74e85082e546cfb39ad13e54932 100644 (file)
@@ -3059,17 +3059,21 @@ FEValuesBase<dim,spacedim>::get_cell_similarity () const
 }
 
 
-/*------------------------------- FEValues -------------------------------*/
+template <int dim, int spacedim>
+const unsigned int FEValuesBase<dim,spacedim>::dimension;
 
 
 template <int dim, int spacedim>
-const unsigned int FEValues<dim,spacedim>::dimension;
+const unsigned int FEValuesBase<dim,spacedim>::space_dimension;
+
+/*------------------------------- FEValues -------------------------------*/
 
 template <int dim, int spacedim>
 const unsigned int FEValues<dim,spacedim>::integral_dimension;
 
 
 
+
 template <int dim, int spacedim>
 FEValues<dim,spacedim>::FEValues (const Mapping<dim,spacedim>       &mapping,
                                  const FiniteElement<dim,spacedim> &fe,

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.