From d661812e9fa1d3cebd406273a3473f06b98c587e Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 13 May 2017 20:23:20 -0400 Subject: [PATCH] Add missing FEValues IndexSet instantiations. --- source/fe/fe_values.inst.in | 299 ++++++++---------------------------- 1 file changed, 68 insertions(+), 231 deletions(-) diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in index 07dd02f7f7..4526591997 100644 --- a/source/fe/fe_values.inst.in +++ b/source/fe/fe_values.inst.in @@ -240,133 +240,63 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimensi // instantiations for VEC=IndexSet -for (deal_II_dimension : DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { +#if deal_II_dimension <= deal_II_space_dimension template - void FEValuesViews::Scalar::get_function_values + void FEValuesViews::Scalar::get_function_values (const dealii::IndexSet&, std::vector::type> &) const; template - void FEValuesViews::Scalar::get_function_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Scalar::get_function_gradients + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Scalar::get_function_hessians - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Scalar::get_function_hessians + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Scalar::get_function_laplacians + void FEValuesViews::Scalar::get_function_laplacians (const dealii::IndexSet&, std::vector::type>&) const; template - void FEValuesViews::Scalar::get_function_third_derivatives - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Scalar::get_function_third_derivatives + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Vector::get_function_values + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector::get_function_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Vector::get_function_gradients + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector::get_function_symmetric_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Vector::get_function_symmetric_gradients + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector::get_function_curls + void FEValuesViews::Vector::get_function_curls (const dealii::IndexSet&, std::vector::type>&) const; template - void FEValuesViews::Vector::get_function_divergences + void FEValuesViews::Vector::get_function_divergences (const dealii::IndexSet&, std::vector::type>&) const; template - void FEValuesViews::Vector::get_function_hessians - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector::get_function_laplacians - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector::get_function_third_derivatives - (const dealii::IndexSet&, std::vector >::type>&) const; - - template - void FEValuesViews::SymmetricTensor<2,deal_II_dimension,deal_II_dimension>::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::SymmetricTensor<2,deal_II_dimension,deal_II_dimension>::get_function_divergences - (const dealii::IndexSet&, std::vector >::type>&) const; - - template - void FEValuesViews::Tensor<2,deal_II_dimension,deal_II_dimension>::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Tensor<2,deal_II_dimension,deal_II_dimension>::get_function_divergences - (const dealii::IndexSet&, std::vector >::type>&) const; - - -#if deal_II_dimension != 3 - template - void FEValuesViews::Scalar - ::get_function_values - (const dealii::IndexSet&, std::vector::type>&) const; - template - void FEValuesViews::Scalar - ::get_function_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Scalar - ::get_function_hessians - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Vector::get_function_hessians + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Scalar - ::get_function_laplacians - (const dealii::IndexSet&, std::vector::type>&) const; + void FEValuesViews::Vector::get_function_laplacians + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Scalar - ::get_function_third_derivatives - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Vector::get_function_third_derivatives + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector - ::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector - ::get_function_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector - ::get_function_symmetric_gradients - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::SymmetricTensor<2,deal_II_dimension,deal_II_space_dimension>::get_function_values + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::Vector - ::get_function_divergences - (const dealii::IndexSet&, std::vector::type>&) const; - template - void FEValuesViews::Vector - ::get_function_hessians - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector - ::get_function_laplacians - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Vector - ::get_function_third_derivatives - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::SymmetricTensor<2,deal_II_dimension,deal_II_space_dimension>::get_function_divergences + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::SymmetricTensor<2, deal_II_dimension, deal_II_dimension+1> - ::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; + void FEValuesViews::Tensor<2,deal_II_dimension,deal_II_space_dimension>::get_function_values + (const dealii::IndexSet&, std::vector >::type>&) const; template - void FEValuesViews::SymmetricTensor<2, deal_II_dimension, deal_II_dimension+1> - ::get_function_divergences - (const dealii::IndexSet&, std::vector >::type>&) const; - - template - void FEValuesViews::Tensor<2, deal_II_dimension, deal_II_dimension+1> - ::get_function_values - (const dealii::IndexSet&, std::vector >::type>&) const; - template - void FEValuesViews::Tensor<2, deal_II_dimension, deal_II_dimension+1> - ::get_function_divergences - (const dealii::IndexSet&, std::vector >::type>&) const; - + void FEValuesViews::Tensor<2,deal_II_dimension,deal_II_space_dimension>::get_function_divergences + (const dealii::IndexSet&, std::vector >::type>&) const; #endif } @@ -374,190 +304,97 @@ for (deal_II_dimension : DIMENSIONS) // Instantiations of functions in FEValuesBase and IndexSet=IndexSet -for (deal_II_dimension : DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { +#if deal_II_dimension <= deal_II_space_dimension template - void FEValuesBase::get_function_values - (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&, 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 >&, - VectorSlice > >, bool) const; - - template - void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_gradients - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - - template - void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > > &) const; - template - void FEValuesBase::get_function_gradients - (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; - - template - void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_hessians - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - - template - void FEValuesBase::get_function_hessians - (const IndexSet&, std::vector > > &, bool) const; - template - void FEValuesBase::get_function_hessians - (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) 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&, 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 > &, bool) const; - - template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, std::vector > &) const; - template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, const VectorSlice >&, - std::vector > &) const; - - template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, std::vector > > &, bool) const; - template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; - - -#if deal_II_dimension != 3 - - template - void FEValuesBase::get_function_values + void FEValuesBase::get_function_values (const IndexSet&, std::vector&) const; template - void FEValuesBase::get_function_values + void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, std::vector&) const; template - void FEValuesBase::get_function_values + void FEValuesBase::get_function_values (const IndexSet&, std::vector > &) const; template - void FEValuesBase::get_function_values + void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, std::vector > &) const; template - void FEValuesBase::get_function_values + void FEValuesBase::get_function_values (const IndexSet&, const VectorSlice >&, VectorSlice > >, bool) const; template - void FEValuesBase::get_function_gradients - (const IndexSet&, std::vector > &) const; + void FEValuesBase::get_function_gradients + (const IndexSet&, std::vector > &) const; template - void FEValuesBase::get_function_gradients + 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; + void FEValuesBase::get_function_gradients + (const IndexSet&, std::vector > > &) const; template - void FEValuesBase::get_function_gradients + 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; + void FEValuesBase::get_function_hessians + (const IndexSet&, std::vector > &) const; template - void FEValuesBase::get_function_hessians + 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; + void FEValuesBase::get_function_hessians + (const IndexSet&, std::vector > > &, bool) const; template - void FEValuesBase::get_function_hessians + void FEValuesBase::get_function_hessians (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; + VectorSlice > > >, bool) const; template - void FEValuesBase::get_function_laplacians + void FEValuesBase::get_function_laplacians (const IndexSet&, std::vector&) const; template - void FEValuesBase::get_function_laplacians + void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, std::vector&) const; template - void FEValuesBase::get_function_laplacians + void FEValuesBase::get_function_laplacians (const IndexSet&, std::vector > &) const; template - void FEValuesBase::get_function_laplacians + void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, std::vector > &) const; template - void FEValuesBase::get_function_laplacians + void FEValuesBase::get_function_laplacians (const IndexSet&, const VectorSlice >&, std::vector > &, bool) const; template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, std::vector > &) const; + void FEValuesBase::get_function_third_derivatives + (const IndexSet&, std::vector > &) const; template - void FEValuesBase::get_function_third_derivatives + void FEValuesBase::get_function_third_derivatives (const IndexSet&, const VectorSlice >&, - std::vector > &) const; + std::vector > &) const; template - void FEValuesBase::get_function_third_derivatives - (const IndexSet&, std::vector > > &, bool) const; + void FEValuesBase::get_function_third_derivatives + (const IndexSet&, std::vector > > &, bool) const; template - void FEValuesBase::get_function_third_derivatives + void FEValuesBase::get_function_third_derivatives (const IndexSet&, const VectorSlice >&, - VectorSlice > > >, bool) const; - + VectorSlice > > >, bool) const; #endif } -- 2.39.5