]> https://gitweb.dealii.org/ - dealii.git/commitdiff
remove instantiations of mesh loop in 1d
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Fri, 2 Oct 2009 14:26:50 +0000 (14:26 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Fri, 2 Oct 2009 14:26:50 +0000 (14:26 +0000)
git-svn-id: https://svn.dealii.org/trunk@19664 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/source/fe/fe_values.cc
deal.II/deal.II/source/fe/fe_values.inst.in
deal.II/deal.II/source/numerics/mesh_worker.cc
deal.II/deal.II/source/numerics/mesh_worker_info.cc
deal.II/deal.II/source/numerics/mesh_worker_vector_selector.cc

index f371c42fc7669b80c5de2df0486de82668e8ee47..26f8c516d4495f99feefe50ddbf97b1d5b1c2039 100644 (file)
@@ -1992,24 +1992,12 @@ class FEValuesBase : protected FEValuesData<dim,spacedim>,
                                      * the checks on the arguments
                                      * may not detect errors.
                                      */
-    template <class InputVector, typename number>
-    void get_function_values (const InputVector& fe_function,
-                             const VectorSlice<const std::vector<unsigned int> >& indices,
-                             std::vector<std::vector<number> >& values,
-                             const bool quadrature_points_fastest) const;
-
-                                    /**
-                                     * Like the previous function,
-                                     * but allows to only fill a
-                                     * slice of a vector instead of
-                                     * the whole one.
-                                     */
-    template <class InputVector, typename number>
+    template <class InputVector>
     void get_function_values (const InputVector& fe_function,
                              const VectorSlice<const std::vector<unsigned int> >& indices,
-                             VectorSlice<std::vector<std::vector<number> > >& values,
+                             VectorSlice<std::vector<std::vector<double> > > values,
                              const bool quadrature_points_fastest) const;
-
+    
                                     /**
                                      * Compute the gradients of the finite
                                      * element function characterized
@@ -2142,18 +2130,7 @@ class FEValuesBase : protected FEValuesData<dim,spacedim>,
     template <class InputVector>
     void get_function_gradients (const InputVector& fe_function,
                                 const VectorSlice<const std::vector<unsigned int> >& indices,
-                                std::vector<std::vector<Tensor<1,spacedim> > >& gradients,
-                                bool quadrature_points_fastest = false) const;
-
-                                    /**
-                                     * Same as the previous function,
-                                     * but filling only a slice of
-                                     * the result vector.
-                                     */
-    template <class InputVector>
-    void get_function_gradients (const InputVector& fe_function,
-                                const VectorSlice<const std::vector<unsigned int> >& indices,
-                                VectorSlice<std::vector<std::vector<Tensor<1,spacedim> > > >& gradients,
+                                VectorSlice<std::vector<std::vector<Tensor<1,spacedim> > > > gradients,
                                 bool quadrature_points_fastest = false) const;
 
                                     /**
@@ -2277,18 +2254,7 @@ class FEValuesBase : protected FEValuesData<dim,spacedim>,
     void get_function_hessians (
       const InputVector& fe_function,
       const VectorSlice<const std::vector<unsigned int> >& indices,
-      std::vector<std::vector<Tensor<2,spacedim> > >& hessians,
-      bool quadrature_points_fastest = false) const;
-                                    /**
-                                     * Same as the previous function,
-                                     * but filling only a slice of
-                                     * the result vector.
-                                     */
-    template <class InputVector>
-    void get_function_hessians (
-      const InputVector& fe_function,
-      const VectorSlice<const std::vector<unsigned int> >& indices,
-      VectorSlice<std::vector<std::vector<Tensor<2,spacedim> > > >& hessians,
+      VectorSlice<std::vector<std::vector<Tensor<2,spacedim> > > > hessians,
       bool quadrature_points_fastest = false) const;
 
                                     /**
@@ -4617,51 +4583,6 @@ FEValuesBase<dim,spacedim>::inverse_jacobian (const unsigned int i) const
 }
 
 
-template <int dim, int spacedim>
-template <class InputVector, typename number>
-inline void
-FEValuesBase<dim,spacedim>::get_function_values (
-  const InputVector& fe_function,
-  const VectorSlice<const std::vector<unsigned int> >& indices,
-  std::vector<std::vector<number> >& values,
-  const bool quadrature_points_fastest) const
-{
-  VectorSlice<std::vector<std::vector<number> > > slice(values);
-  get_function_values(fe_function, indices, slice, quadrature_points_fastest);
-}
-
-
-
-template <int dim, int spacedim>
-template <class InputVector>
-inline void
-FEValuesBase<dim,spacedim>::get_function_gradients (
-  const InputVector& fe_function,
-  const VectorSlice<const std::vector<unsigned int> >& indices,
-  std::vector<std::vector<Tensor<1,spacedim> > >& values,
-  const bool quadrature_points_fastest) const
-{
-  VectorSlice<std::vector<std::vector<Tensor<1,dim> > > > slice(values);
-  get_function_gradients(fe_function, indices, slice, quadrature_points_fastest);
-}
-
-
-
-template <int dim, int spacedim>
-template <class InputVector>
-inline void
-FEValuesBase<dim,spacedim>::get_function_hessians (
-  const InputVector& fe_function,
-  const VectorSlice<const std::vector<unsigned int> >& indices,
-  std::vector<std::vector<Tensor<2,spacedim> > >& values,
-  const bool quadrature_points_fastest) const
-{
-  VectorSlice<std::vector<std::vector<Tensor<2,dim> > > > slice(values);
-  get_function_hessians(fe_function, indices, slice, quadrature_points_fastest);
-}
-
-
-
 template <int dim, int spacedim>
 template <class InputVector>
 inline
index b830c647ba7f18b9c4093d0e3010741ca0ce7333..c28f55b8b6d06b7080713509e3c4f5e6aa0d4b42 100644 (file)
@@ -2346,11 +2346,11 @@ void FEValuesBase<dim,spacedim>::get_function_values (
 
 
 template <int dim, int spacedim>
-template <class InputVector, typename number>
+template <class InputVector>
 void FEValuesBase<dim,spacedim>::get_function_values (
   const InputVector& fe_function,
   const VectorSlice<const std::vector<unsigned int> >& indices,
-  VectorSlice<std::vector<std::vector<number> > >& values,
+  VectorSlice<std::vector<std::vector<double> > > values,
   bool quadrature_points_fastest) const
 {
   const unsigned int n_components = fe->n_components();
@@ -2666,7 +2666,7 @@ template <class InputVector>
 void FEValuesBase<dim,spacedim>::get_function_gradients (
   const InputVector& fe_function,
   const VectorSlice<const std::vector<unsigned int> >& indices,
-  VectorSlice<std::vector<std::vector<Tensor<1,spacedim> > > >& gradients,
+  VectorSlice<std::vector<std::vector<Tensor<1,spacedim> > > > gradients,
   bool quadrature_points_fastest) const
 {
   const unsigned int n_components = fe->n_components();
@@ -2957,7 +2957,7 @@ template <class InputVector>
 void FEValuesBase<dim, spacedim>::get_function_hessians (
   const InputVector& fe_function,
   const VectorSlice<const std::vector<unsigned int> >& indices,
-  VectorSlice<std::vector<std::vector<Tensor<2,spacedim> > > >& hessians,
+  VectorSlice<std::vector<std::vector<Tensor<2,spacedim> > > > hessians,
   bool quadrature_points_fastest) const
 {
   Assert (this->update_flags & update_second_derivatives, ExcAccessToUninitializedField());
index 264c2e56b2ab285414d0c6a7fc79c757b50c9f8a..b3175fe4192654a7d4b821dcf94132ebb1fe9b7e 100644 (file)
@@ -150,11 +150,11 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension>::get_function_values<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<double> > >&, bool) const;
-    template
-      void FEValuesBase<deal_II_dimension>::get_function_values<VEC>
-      (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<float> > > &, bool) const;
+       VectorSlice<std::vector<std::vector<double> > >, bool) const;
+//     template
+//       void FEValuesBase<deal_II_dimension>::get_function_values<VEC>
+//       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
+//        VectorSlice<std::vector<std::vector<float> > >, bool) const;
 
     template
       void FEValuesBase<deal_II_dimension>::get_function_gradients<VEC>
@@ -170,7 +170,7 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension>::get_function_gradients<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<Tensor<1,deal_II_dimension> > > >&, bool) const;
+       VectorSlice<std::vector<std::vector<Tensor<1,deal_II_dimension> > > >, bool) const;
 
     template
       void FEValuesBase<deal_II_dimension>::get_function_hessians<VEC>
@@ -186,7 +186,7 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension>::get_function_hessians<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<Tensor<2,deal_II_dimension> > > >&, bool) const;
+       VectorSlice<std::vector<std::vector<Tensor<2,deal_II_dimension> > > >, bool) const;
 
     template
        void FEValuesBase<deal_II_dimension>::get_function_laplacians<VEC>
@@ -261,11 +261,11 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_values<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<double> > >&, bool) const;
-    template
-      void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_values<VEC>
-      (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<float> > >&, bool) const;
+       VectorSlice<std::vector<std::vector<double> > >, bool) const;
+//     template
+//       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_values<VEC>
+//       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
+//        VectorSlice<std::vector<std::vector<float> > >, bool) const;
 
     template
       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_gradients<VEC>
@@ -281,7 +281,7 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_gradients<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<Tensor<1,deal_II_dimension+1> > > >&, bool) const;
+       VectorSlice<std::vector<std::vector<Tensor<1,deal_II_dimension+1> > > >, bool) const;
 
     template
       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_hessians<VEC>
@@ -297,7 +297,7 @@ for (VEC : SERIAL_VECTORS)
     template
       void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_hessians<VEC>
       (const VEC&, const VectorSlice<const std::vector<unsigned int> >&,
-       VectorSlice<std::vector<std::vector<Tensor<2,deal_II_dimension+1> > > >&, bool) const;
+       VectorSlice<std::vector<std::vector<Tensor<2,deal_II_dimension+1> > > >, bool) const;
 
     template
        void FEValuesBase<deal_II_dimension,deal_II_dimension+1>::get_function_laplacians<VEC>
index 465eabd06af8977116eb27dc8593b4cafd9c075c..bea95926157ca1aff40eb88216baf0ee88b654c6 100644 (file)
@@ -111,6 +111,7 @@ IntegrationWorker<dim>::initialize_gauss_quadrature(
 
 }
 
-  
+#if deal_II_dimension > 1
 template class IntegrationWorker<deal_II_dimension>;
+#endif
 
index d7c6e7729b7774d8b3e1b72b42c4778cf447b5ac..920f95888c162c906b6c3aebfabf1ed96a332429 100644 (file)
@@ -16,6 +16,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#if deal_II_dimension > 1
+
 namespace MeshWorker
 {
   template class LocalResults<double>;
@@ -37,6 +39,7 @@ namespace MeshWorker
     const Quadrature<FESubfaceValues<deal_II_dimension>::integral_dimension>&, const UpdateFlags);
 }
 
+#endif
 
 DEAL_II_NAMESPACE_CLOSE
 
index 9296026559c10909bdf0242860c0a67ba6383b68..c3faa4b46aafa23748183a74f342d32e12fd486c 100644 (file)
@@ -18,6 +18,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+#if deal_II_dimension > 1
+
 namespace MeshWorker
 {
   template class VectorDataBase<deal_II_dimension>;
@@ -25,4 +27,6 @@ namespace MeshWorker
 #include "mesh_worker_vector_selector.inst"
 }
 
+#endif
+
 DEAL_II_NAMESPACE_CLOSE

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.