From: Guido Kanschat Date: Fri, 2 Oct 2009 14:26:50 +0000 (+0000) Subject: remove instantiations of mesh loop in 1d X-Git-Tag: v8.0.0~6999 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bba3dd0b775e8f0fd934775d656b95dd0083c06;p=dealii.git remove instantiations of mesh loop in 1d git-svn-id: https://svn.dealii.org/trunk@19664 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index f371c42fc7..26f8c516d4 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -1992,24 +1992,12 @@ class FEValuesBase : protected FEValuesData, * the checks on the arguments * may not detect errors. */ - template - void get_function_values (const InputVector& fe_function, - const VectorSlice >& indices, - std::vector >& 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 + template void get_function_values (const InputVector& fe_function, const VectorSlice >& indices, - VectorSlice > >& values, + VectorSlice > > values, const bool quadrature_points_fastest) const; - + /** * Compute the gradients of the finite * element function characterized @@ -2142,18 +2130,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_gradients (const InputVector& fe_function, const VectorSlice >& indices, - std::vector > >& gradients, - bool quadrature_points_fastest = false) const; - - /** - * Same as the previous function, - * but filling only a slice of - * the result vector. - */ - template - void get_function_gradients (const InputVector& fe_function, - const VectorSlice >& indices, - VectorSlice > > >& gradients, + VectorSlice > > > gradients, bool quadrature_points_fastest = false) const; /** @@ -2277,18 +2254,7 @@ class FEValuesBase : protected FEValuesData, void get_function_hessians ( const InputVector& fe_function, const VectorSlice >& indices, - std::vector > >& hessians, - bool quadrature_points_fastest = false) const; - /** - * Same as the previous function, - * but filling only a slice of - * the result vector. - */ - template - void get_function_hessians ( - const InputVector& fe_function, - const VectorSlice >& indices, - VectorSlice > > >& hessians, + VectorSlice > > > hessians, bool quadrature_points_fastest = false) const; /** @@ -4617,51 +4583,6 @@ FEValuesBase::inverse_jacobian (const unsigned int i) const } -template -template -inline void -FEValuesBase::get_function_values ( - const InputVector& fe_function, - const VectorSlice >& indices, - std::vector >& values, - const bool quadrature_points_fastest) const -{ - VectorSlice > > slice(values); - get_function_values(fe_function, indices, slice, quadrature_points_fastest); -} - - - -template -template -inline void -FEValuesBase::get_function_gradients ( - const InputVector& fe_function, - const VectorSlice >& indices, - std::vector > >& values, - const bool quadrature_points_fastest) const -{ - VectorSlice > > > slice(values); - get_function_gradients(fe_function, indices, slice, quadrature_points_fastest); -} - - - -template -template -inline void -FEValuesBase::get_function_hessians ( - const InputVector& fe_function, - const VectorSlice >& indices, - std::vector > >& values, - const bool quadrature_points_fastest) const -{ - VectorSlice > > > slice(values); - get_function_hessians(fe_function, indices, slice, quadrature_points_fastest); -} - - - template template inline diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index b830c647ba..c28f55b8b6 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -2346,11 +2346,11 @@ void FEValuesBase::get_function_values ( template -template +template void FEValuesBase::get_function_values ( const InputVector& fe_function, const VectorSlice >& indices, - VectorSlice > >& values, + VectorSlice > > values, bool quadrature_points_fastest) const { const unsigned int n_components = fe->n_components(); @@ -2666,7 +2666,7 @@ template void FEValuesBase::get_function_gradients ( const InputVector& fe_function, const VectorSlice >& indices, - VectorSlice > > >& gradients, + VectorSlice > > > gradients, bool quadrature_points_fastest) const { const unsigned int n_components = fe->n_components(); @@ -2957,7 +2957,7 @@ template void FEValuesBase::get_function_hessians ( const InputVector& fe_function, const VectorSlice >& indices, - VectorSlice > > >& hessians, + VectorSlice > > > hessians, bool quadrature_points_fastest) const { Assert (this->update_flags & update_second_derivatives, ExcAccessToUninitializedField()); diff --git a/deal.II/deal.II/source/fe/fe_values.inst.in b/deal.II/deal.II/source/fe/fe_values.inst.in index 264c2e56b2..b3175fe419 100644 --- a/deal.II/deal.II/source/fe/fe_values.inst.in +++ b/deal.II/deal.II/source/fe/fe_values.inst.in @@ -150,11 +150,11 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_values (const VEC&, const VectorSlice >&, - VectorSlice > >&, bool) const; - template - void FEValuesBase::get_function_values - (const VEC&, const VectorSlice >&, - VectorSlice > > &, bool) const; + VectorSlice > >, bool) const; +// template +// void FEValuesBase::get_function_values +// (const VEC&, const VectorSlice >&, +// VectorSlice > >, bool) const; template void FEValuesBase::get_function_gradients @@ -170,7 +170,7 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_gradients (const VEC&, const VectorSlice >&, - VectorSlice > > >&, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_hessians @@ -186,7 +186,7 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_hessians (const VEC&, const VectorSlice >&, - VectorSlice > > >&, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_laplacians @@ -261,11 +261,11 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_values (const VEC&, const VectorSlice >&, - VectorSlice > >&, bool) const; - template - void FEValuesBase::get_function_values - (const VEC&, const VectorSlice >&, - VectorSlice > >&, bool) const; + VectorSlice > >, bool) const; +// template +// void FEValuesBase::get_function_values +// (const VEC&, const VectorSlice >&, +// VectorSlice > >, bool) const; template void FEValuesBase::get_function_gradients @@ -281,7 +281,7 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_gradients (const VEC&, const VectorSlice >&, - VectorSlice > > >&, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_hessians @@ -297,7 +297,7 @@ for (VEC : SERIAL_VECTORS) template void FEValuesBase::get_function_hessians (const VEC&, const VectorSlice >&, - VectorSlice > > >&, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_laplacians diff --git a/deal.II/deal.II/source/numerics/mesh_worker.cc b/deal.II/deal.II/source/numerics/mesh_worker.cc index 465eabd06a..bea9592615 100644 --- a/deal.II/deal.II/source/numerics/mesh_worker.cc +++ b/deal.II/deal.II/source/numerics/mesh_worker.cc @@ -111,6 +111,7 @@ IntegrationWorker::initialize_gauss_quadrature( } - +#if deal_II_dimension > 1 template class IntegrationWorker; +#endif diff --git a/deal.II/deal.II/source/numerics/mesh_worker_info.cc b/deal.II/deal.II/source/numerics/mesh_worker_info.cc index d7c6e7729b..920f95888c 100644 --- a/deal.II/deal.II/source/numerics/mesh_worker_info.cc +++ b/deal.II/deal.II/source/numerics/mesh_worker_info.cc @@ -16,6 +16,8 @@ DEAL_II_NAMESPACE_OPEN +#if deal_II_dimension > 1 + namespace MeshWorker { template class LocalResults; @@ -37,6 +39,7 @@ namespace MeshWorker const Quadrature::integral_dimension>&, const UpdateFlags); } +#endif DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/mesh_worker_vector_selector.cc b/deal.II/deal.II/source/numerics/mesh_worker_vector_selector.cc index 9296026559..c3faa4b46a 100644 --- a/deal.II/deal.II/source/numerics/mesh_worker_vector_selector.cc +++ b/deal.II/deal.II/source/numerics/mesh_worker_vector_selector.cc @@ -18,6 +18,8 @@ DEAL_II_NAMESPACE_OPEN +#if deal_II_dimension > 1 + namespace MeshWorker { template class VectorDataBase; @@ -25,4 +27,6 @@ namespace MeshWorker #include "mesh_worker_vector_selector.inst" } +#endif + DEAL_II_NAMESPACE_CLOSE