From 272a89635e51021ce0699f0ba4cc0d9013661a98 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 15 Sep 2015 00:11:22 -0500 Subject: [PATCH] Update library to use new signature of outer_product --- source/grid/tria_boundary.cc | 7 +++---- source/numerics/derivative_approximation.cc | 8 ++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source/grid/tria_boundary.cc b/source/grid/tria_boundary.cc index 132c33381d..27336e9bbf 100644 --- a/source/grid/tria_boundary.cc +++ b/source/grid/tria_boundary.cc @@ -804,10 +804,9 @@ namespace internal for (unsigned int i=0; i::vertices_per_cell; ++i) for (unsigned int j=0; j::vertices_per_cell; ++j) { - Tensor<2,dim> tmp; - outer_product (tmp, - GeometryInfo::d_linear_shape_function_gradient (xi, i), - GeometryInfo::d_linear_shape_function_gradient (xi, j)); + Tensor<2, dim> tmp = outer_product( + GeometryInfo::d_linear_shape_function_gradient(xi, i), + GeometryInfo::d_linear_shape_function_gradient(xi, j)); H_k += (object->vertex(i) * object->vertex(j)) * tmp; } diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index a9bca498b8..d9a7867ef7 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -87,7 +87,7 @@ namespace DerivativeApproximation * Likewise declare the data type that holds the derivative projected to a * certain directions. */ - typedef double ProjectedDerivative; + typedef Tensor<0,dim> ProjectedDerivative; /** * Given an FEValues object initialized to a cell, and a solution vector, @@ -891,11 +891,7 @@ namespace DerivativeApproximation this_midpoint_value); projected_finite_difference /= distance; - typename DerivativeDescription::Derivative projected_derivative_update; - outer_product (projected_derivative_update, - y, - projected_finite_difference); - projected_derivative += projected_derivative_update; + projected_derivative += outer_product(y, projected_finite_difference); }; // can we determine an -- 2.39.5