From f378821aaf8110b9ac39e7eff8703a47a2261fc2 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 28 Feb 2015 19:51:18 +0100 Subject: [PATCH] fixed FEValuesBase instantiations --- source/fe/fe_values.inst.in | 216 ++++++++++-------------------------- 1 file changed, 57 insertions(+), 159 deletions(-) diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in index a74d3984a7..c741cae5bc 100644 --- a/source/fe/fe_values.inst.in +++ b/source/fe/fe_values.inst.in @@ -143,111 +143,77 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimensi template void FEValuesBase::get_function_values - (const VEC&, std::vector&) const; + (const VEC&, std::vector&) const; template void FEValuesBase::get_function_values - (const VEC&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const VEC&, const VectorSlice >&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const VEC&, const VectorSlice >&, std::vector&) const; + (const VEC&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_values - (const VEC&, std::vector > &) const; - template - void FEValuesBase::get_function_values - (const VEC&, std::vector > &) const; + (const VEC&, std::vector > &) const; template void FEValuesBase::get_function_values (const VEC&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_values - (const VEC&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; 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_gradients - (const VEC&, std::vector > &) const; + (const VEC&, std::vector > &) const; template void FEValuesBase::get_function_gradients (const VEC&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_gradients - (const VEC&, std::vector > > &) const; + (const VEC&, std::vector > > &) const; template void FEValuesBase::get_function_gradients (const VEC&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_hessians - (const VEC&, std::vector > &) const; + (const VEC&, std::vector > &) const; template void FEValuesBase::get_function_hessians (const VEC&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_hessians - (const VEC&, std::vector > > &, bool) const; + (const VEC&, std::vector > > &, bool) const; template void FEValuesBase::get_function_hessians (const VEC&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_laplacians - (const VEC&, std::vector&) const; + (const VEC&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const VEC&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const VEC&, const VectorSlice >&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const VEC&, const VectorSlice >&, std::vector&) const; + (const VEC&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const VEC&, std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const VEC&, std::vector > &) const; + (const VEC&, std::vector > &) const; template void FEValuesBase::get_function_laplacians (const VEC&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const VEC&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_laplacians (const VEC&, const VectorSlice >&, - std::vector > &, bool) const; - template - void FEValuesBase::get_function_laplacians - (const VEC&, const VectorSlice >&, - std::vector > &, bool) const; + std::vector > &, bool) const; #endif #endif @@ -313,7 +279,7 @@ for (deal_II_dimension : DIMENSIONS) template void FEValuesViews::Scalar ::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; + (const dealii::IndexSet&, std::vector::type>&) const; template void FEValuesViews::Scalar ::get_function_gradients @@ -334,11 +300,11 @@ for (deal_II_dimension : DIMENSIONS) template void FEValuesViews::Vector ::get_function_gradients - (const dealii::IndexSet&, std::vector >&) const; + (const dealii::IndexSet&, std::vector >::type>&) const; template void FEValuesViews::Vector ::get_function_symmetric_gradients - (const dealii::IndexSet&, std::vector >&) const; + (const dealii::IndexSet&, std::vector >::type>&) const; template void FEValuesViews::Vector ::get_function_divergences @@ -383,222 +349,154 @@ for (deal_II_dimension : DIMENSIONS) #if (deal_II_dimension == DIM_A) || (deal_II_dimension == DIM_B) template void FEValuesBase::get_function_values - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, std::vector&) const; + (const IndexSet&, std::vector&) const; template void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_values - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, - VectorSlice > >, bool) const; -// template -// void FEValuesBase::get_function_values -// (const IndexSet&, const VectorSlice >&, -// VectorSlice > >, bool) const; + VectorSlice > >, bool) const; template void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_gradients (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > > &) const; + (const IndexSet&, std::vector > > &) const; template void FEValuesBase::get_function_gradients (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_hessians (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > > &, bool) const; + (const IndexSet&, std::vector > > &, bool) const; template void FEValuesBase::get_function_hessians (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector&) const; + (const IndexSet&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, - std::vector > &, bool) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, - std::vector > &, bool) const; + std::vector > &, bool) const; #if deal_II_dimension != 3 template void FEValuesBase::get_function_values - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, std::vector&) const; template void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_values - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_values - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, - VectorSlice > >, bool) const; -// template -// void FEValuesBase::get_function_values -// (const IndexSet&, const VectorSlice >&, -// VectorSlice > >, bool) const; + VectorSlice > >, bool) const; template void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_gradients (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > > &) const; + (const IndexSet&, std::vector > > &) const; template void FEValuesBase::get_function_gradients (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_hessians (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > > &, bool) const; + (const IndexSet&, std::vector > > &, bool) const; template void FEValuesBase::get_function_hessians (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector&) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, std::vector&) const; + (const IndexSet&, const VectorSlice >&, std::vector&) const; template void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, std::vector > &) const; + (const IndexSet&, std::vector > &) const; template void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, - std::vector > &, bool) const; - template - void FEValuesBase::get_function_laplacians - (const IndexSet&, const VectorSlice >&, - std::vector > &, bool) const; + std::vector > &, bool) const; #endif #endif -- 2.39.5