From 5dbae313343f66f4ed20b889cc6f30ddd6f20b01 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 31 Jul 2021 12:46:10 +0200 Subject: [PATCH] Update examples --- examples/step-12/step-12.cc | 2 +- examples/step-47/step-47.cc | 22 ++++++++++++++-------- examples/step-74/step-74.cc | 28 +++++++++++++++------------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/examples/step-12/step-12.cc b/examples/step-12/step-12.cc index f91e94999e..06d43b8642 100644 --- a/examples/step-12/step-12.cc +++ b/examples/step-12/step-12.cc @@ -406,7 +406,7 @@ namespace Step12 for (unsigned int i = 0; i < n_dofs; ++i) for (unsigned int j = 0; j < n_dofs; ++j) copy_data_face.cell_matrix(i, j) += - fe_iv.jump(i, qpoint) // [\phi_i] + fe_iv.jump_in_shape_values(i, qpoint) // [\phi_i] * fe_iv.shape_value((beta_dot_n > 0), j, qpoint) // phi_j^{upwind} * beta_dot_n // (\beta . n) diff --git a/examples/step-47/step-47.cc b/examples/step-47/step-47.cc index 53a03a1fea..c63afdd9b0 100644 --- a/examples/step-47/step-47.cc +++ b/examples/step-47/step-47.cc @@ -549,16 +549,19 @@ namespace Step47 for (unsigned int i = 0; i < n_interface_dofs; ++i) { const double av_hessian_i_dot_n_dot_n = - (fe_interface_values.average_hessian(i, qpoint) * n * n); + (fe_interface_values.average_of_shape_hessians(i, qpoint) * n * + n); const double jump_grad_i_dot_n = - (fe_interface_values.jump_gradient(i, qpoint) * n); + (fe_interface_values.jump_in_shape_gradients(i, qpoint) * n); for (unsigned int j = 0; j < n_interface_dofs; ++j) { const double av_hessian_j_dot_n_dot_n = - (fe_interface_values.average_hessian(j, qpoint) * n * n); + (fe_interface_values.average_of_shape_hessians(j, qpoint) * + n * n); const double jump_grad_j_dot_n = - (fe_interface_values.jump_gradient(j, qpoint) * n); + (fe_interface_values.jump_in_shape_gradients(j, qpoint) * + n); copy_data_face.cell_matrix(i, j) += (-av_hessian_i_dot_n_dot_n // - {grad^2 v n n } @@ -641,16 +644,19 @@ namespace Step47 for (unsigned int i = 0; i < n_dofs; ++i) { const double av_hessian_i_dot_n_dot_n = - (fe_interface_values.average_hessian(i, qpoint) * n * n); + (fe_interface_values.average_of_shape_hessians(i, qpoint) * n * + n); const double jump_grad_i_dot_n = - (fe_interface_values.jump_gradient(i, qpoint) * n); + (fe_interface_values.jump_in_shape_gradients(i, qpoint) * n); for (unsigned int j = 0; j < n_dofs; ++j) { const double av_hessian_j_dot_n_dot_n = - (fe_interface_values.average_hessian(j, qpoint) * n * n); + (fe_interface_values.average_of_shape_hessians(j, qpoint) * + n * n); const double jump_grad_j_dot_n = - (fe_interface_values.jump_gradient(j, qpoint) * n); + (fe_interface_values.jump_in_shape_gradients(j, qpoint) * + n); copy_data_face.cell_matrix(i, j) += (-av_hessian_i_dot_n_dot_n // - {grad^2 v n n} diff --git a/examples/step-74/step-74.cc b/examples/step-74/step-74.cc index e82c462596..8a0ee148af 100644 --- a/examples/step-74/step-74.cc +++ b/examples/step-74/step-74.cc @@ -509,19 +509,21 @@ namespace Step74 for (unsigned int i = 0; i < n_dofs_face; ++i) for (unsigned int j = 0; j < n_dofs_face; ++j) copy_data_face.cell_matrix(i, j) += - (-diffusion_coefficient * // - nu - fe_iv.jump(i, point) * // [v_h] - (fe_iv.average_gradient(j, point) * // ({grad u_h} . - normals[point]) // n) - - - diffusion_coefficient * // - nu - (fe_iv.average_gradient(i, point) * // (grad v_h . - normals[point]) * // n) - fe_iv.jump(j, point) // [u_h] - - + diffusion_coefficient * penalty * // + nu sigma - fe_iv.jump(i, point) * // [v_h] - fe_iv.jump(j, point) // [u_h] + (-diffusion_coefficient * // - nu + fe_iv.jump_in_shape_values(i, point) * // [v_h] + (fe_iv.average_of_shape_gradients(j, // + point) * // ({grad u_h} . + normals[point]) // n) + + - + diffusion_coefficient * // - nu + (fe_iv.average_of_shape_gradients(i, point) * // (grad v_h . + normals[point]) * // n) + fe_iv.jump_in_shape_values(j, point) // [u_h] + + + diffusion_coefficient * penalty * // + nu sigma + fe_iv.jump_in_shape_values(i, point) * // [v_h] + fe_iv.jump_in_shape_values(j, point) // [u_h] ) * JxW[point]; // dx -- 2.39.5