From 08f645c8b3fbd18b01e1f6701f6d744f9e4ca550 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Fri, 18 Jan 2013 13:58:41 +0000 Subject: [PATCH] Replace a few deprecated functions. git-svn-id: https://svn.dealii.org/trunk@28127 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fe/derivatives.cc | 2 +- tests/fe/derivatives_face.cc | 2 +- tests/fe/mapping_q1_eulerian.cc | 2 +- tests/fe/shapes.h | 24 ++++++++++++------------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/fe/derivatives.cc b/tests/fe/derivatives.cc index ac9639c1c5..dbe296ccb3 100644 --- a/tests/fe/derivatives.cc +++ b/tests/fe/derivatives.cc @@ -55,7 +55,7 @@ plot_derivatives(Mapping& mapping, for (unsigned int i=0;i& mapping, for (unsigned int i=0;i& fe, { deallog << "Values: " << fe_values.shape_value(i,k); deallog << ", Grad: " << fe_values.shape_grad(i,k); - deallog << ", 2nd: " << fe_values.shape_2nd_derivative(i,k); + deallog << ", 2nd: " << fe_values.shape_hessian(i,k); deallog << std::endl; } } diff --git a/tests/fe/shapes.h b/tests/fe/shapes.h index e93c166733..68127c9151 100644 --- a/tests/fe/shapes.h +++ b/tests/fe/shapes.h @@ -76,13 +76,13 @@ plot_shape_functions(Mapping& mapping, (fe.shape_grad(i,k) == fe.shape_grad_component(i,k,c)) && - (fe.shape_2nd_derivative(i,k) == - fe.shape_2nd_derivative_component(i,k,c)), + (fe.shape_hessian(i,k) == + fe.shape_hessian_component(i,k,c)), ExcInternalError()) else Assert ((fe.shape_value_component(i,k,c) == 0) && (fe.shape_grad_component(i,k,c) == Tensor<1,dim>()) && - (fe.shape_2nd_derivative_component(i,k,c) == Tensor<2,dim>()), + (fe.shape_hessian_component(i,k,c) == Tensor<2,dim>()), ExcInternalError()); }; } @@ -161,7 +161,7 @@ plot_face_shape_functions( Assert((fe.shape_grad(i,k) == fe.shape_grad_component(i,k,c)), ExcInternalError()); if (uflags & update_hessians) - Assert((fe.shape_2nd_derivative(i,k) == fe.shape_2nd_derivative_component(i,k,c)), + Assert((fe.shape_hessian(i,k) == fe.shape_hessian_component(i,k,c)), ExcInternalError()); } else @@ -173,7 +173,7 @@ plot_face_shape_functions( Assert ((fe.shape_grad_component(i,k,c) == Tensor<1,dim>()), ExcInternalError()); if (uflags & update_hessians) - Assert ((fe.shape_2nd_derivative_component(i,k,c) == Tensor<2,dim>()), + Assert ((fe.shape_hessian_component(i,k,c) == Tensor<2,dim>()), ExcInternalError()); } } @@ -221,8 +221,8 @@ plot_face_shape_functions( } if (uflags & update_hessians) { - const Tensor<2,dim> s1 = sub.shape_2nd_derivative(i,k), - s2 = sub.shape_2nd_derivative_component(i,k,c); + const Tensor<2,dim> s1 = sub.shape_hessian(i,k), + s2 = sub.shape_hessian_component(i,k,c); Assert (s1 == s2, ExcInternalError()); } } @@ -235,7 +235,7 @@ plot_face_shape_functions( Assert ((sub.shape_grad_component(i,k,c) == Tensor<1,dim>()), ExcInternalError()); if (uflags & update_hessians) - Assert ((sub.shape_2nd_derivative_component(i,k,c) == Tensor<2,dim>()), + Assert ((sub.shape_hessian_component(i,k,c) == Tensor<2,dim>()), ExcInternalError()); } }; @@ -326,7 +326,7 @@ check_values_and_derivatives (const FiniteElement &fe, { for (unsigned int c=0; c tmp=fe_values.shape_2nd_derivative_component(i,x,c); + Tensor<2,dim> tmp=fe_values.shape_hessian_component(i,x,c); tmp -= fe.shape_grad_grad_component(i,q.point(x),c); for (unsigned int j=0; j &fe, if (fe.is_primitive(i)) for (unsigned int c=0; c())), + (fe_values.shape_hessian_component(i,x,c) == Tensor<2,dim>())), ExcInternalError()); } } -- 2.39.5