From 9c06f996fc57943ca88ba88d97780587c796036c Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 30 Jun 2023 15:51:47 -0400 Subject: [PATCH] Remove deprecated FEValuesViews::OutputType --- .../incompatibilities/20230630DanielArndt-2 | 6 + include/deal.II/fe/fe_values.h | 184 ------------------ 2 files changed, 6 insertions(+), 184 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20230630DanielArndt-2 diff --git a/doc/news/changes/incompatibilities/20230630DanielArndt-2 b/doc/news/changes/incompatibilities/20230630DanielArndt-2 new file mode 100644 index 0000000000..e78121bbad --- /dev/null +++ b/doc/news/changes/incompatibilities/20230630DanielArndt-2 @@ -0,0 +1,6 @@ +Removed: The deprecated classes FEValuesViews::Scalar::OutputType, +FEValuesViews::Vector::OutputType, +FEValuesViews::SymmetricTensor::OutputType, +have been removed. +
+(Daniel Arndt, 2023/06/30) diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index 39eb362fe1..f5b61a1795 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -224,56 +224,6 @@ namespace FEValuesViews using solution_third_derivative_type = typename ProductType::type; - /** - * A struct that provides the output type for the product of the value - * and derivatives of basis functions of the Scalar view and any @p Number type. - * - * @deprecated Use the types defined in the surrounding class instead. - */ - template - struct DEAL_II_DEPRECATED OutputType - { - /** - * An alias for the data type of the product of a @p Number and the - * values of the view the Scalar class. - */ - using value_type = - typename ProductType::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * gradients of the view the Scalar class. - */ - using gradient_type = typename ProductType< - Number, - typename Scalar::gradient_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * laplacians of the view the Scalar class. - */ - using laplacian_type = - typename ProductType::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * hessians of the view the Scalar class. - */ - using hessian_type = typename ProductType< - Number, - typename Scalar::hessian_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * third derivatives of the view the Scalar class. - */ - using third_derivative_type = typename ProductType< - Number, - typename Scalar::third_derivative_type>::type; - }; - /** * A structure where for each shape function we pre-compute a bunch of * data that will make later accesses much cheaper. @@ -811,80 +761,6 @@ namespace FEValuesViews using solution_third_derivative_type = typename ProductType::type; - /** - * A struct that provides the output type for the product of the value - * and derivatives of basis functions of the Vector view and any @p Number type. - * - * @deprecated Use the types defined in the surrounding class instead. - */ - template - struct DEAL_II_DEPRECATED OutputType - { - /** - * An alias for the data type of the product of a @p Number and the - * values of the view the Vector class. - */ - using value_type = - typename ProductType::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * gradients of the view the Vector class. - */ - using gradient_type = typename ProductType< - Number, - typename Vector::gradient_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * symmetric gradients of the view the Vector class. - */ - using symmetric_gradient_type = typename ProductType< - Number, - typename Vector::symmetric_gradient_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * divergences of the view the Vector class. - */ - using divergence_type = typename ProductType< - Number, - typename Vector::divergence_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * laplacians of the view the Vector class. - */ - using laplacian_type = - typename ProductType::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * curls of the view the Vector class. - */ - using curl_type = - typename ProductType::curl_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * hessians of the view the Vector class. - */ - using hessian_type = typename ProductType< - Number, - typename Vector::hessian_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * third derivatives of the view the Vector class. - */ - using third_derivative_type = typename ProductType< - Number, - typename Vector::third_derivative_type>::type; - }; - /** * A structure where for each shape function we pre-compute a bunch of * data that will make later accesses much cheaper. @@ -1516,32 +1392,6 @@ namespace FEValuesViews typename ProductType::type; - /** - * A struct that provides the output type for the product of the value - * and derivatives of basis functions of the SymmetricTensor view and any @p Number type. - * - * @deprecated Use the types defined in the surrounding class instead. - */ - template - struct DEAL_II_DEPRECATED OutputType - { - /** - * An alias for the data type of the product of a @p Number and the - * values of the view the SymmetricTensor class. - */ - using value_type = typename ProductType< - Number, - typename SymmetricTensor<2, dim, spacedim>::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * divergences of the view the SymmetricTensor class. - */ - using divergence_type = typename ProductType< - Number, - typename SymmetricTensor<2, dim, spacedim>::divergence_type>::type; - }; - /** * A structure where for each shape function we pre-compute a bunch of * data that will make later accesses much cheaper. @@ -1862,40 +1712,6 @@ namespace FEValuesViews typename ProductType::type; - /** - * A struct that provides the output type for the product of the value - * and derivatives of basis functions of the Tensor view and any @p Number type. - * - * @deprecated Use the types defined in the surrounding class instead. - */ - template - struct DEAL_II_DEPRECATED OutputType - { - /** - * An alias for the data type of the product of a @p Number and the - * values of the view the Tensor class. - */ - using value_type = typename ProductType< - Number, - typename Tensor<2, dim, spacedim>::value_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * divergences of the view the Tensor class. - */ - using divergence_type = typename ProductType< - Number, - typename Tensor<2, dim, spacedim>::divergence_type>::type; - - /** - * An alias for the data type of the product of a @p Number and the - * gradient of the view the Tensor class. - */ - using gradient_type = typename ProductType< - Number, - typename Tensor<2, dim, spacedim>::gradient_type>::type; - }; - /** * A structure where for each shape function we pre-compute a bunch of * data that will make later accesses much cheaper. -- 2.39.5