Skip to content

Commit

Permalink
run clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
jh66637 committed Jun 6, 2023
1 parent ab56bab commit 3e74bac
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 47 deletions.
10 changes: 4 additions & 6 deletions examples/step-59/step-59.cc
Original file line number Diff line number Diff line change
Expand Up @@ -680,9 +680,8 @@ namespace Step59
EvaluationFlags::values |
EvaluationFlags::gradients);

const VectorizedArray<number> inverse_length_normal_to_face =
std::abs((phi_inner.normal_vector(0) *
phi_inner.inverse_jacobian(0))[dim - 1]);
const VectorizedArray<number> inverse_length_normal_to_face = std::abs((
phi_inner.normal_vector(0) * phi_inner.inverse_jacobian(0))[dim - 1]);
const VectorizedArray<number> sigma =
inverse_length_normal_to_face * get_penalty_factor();

Expand Down Expand Up @@ -1134,9 +1133,8 @@ namespace Step59
{
phi_face.reinit(face);

const VectorizedArray<double> inverse_length_normal_to_face =
std::abs((phi_face.normal_vector(0) *
phi_face.inverse_jacobian(0))[dim - 1]);
const VectorizedArray<double> inverse_length_normal_to_face = std::abs(
(phi_face.normal_vector(0) * phi_face.inverse_jacobian(0))[dim - 1]);
const VectorizedArray<double> sigma =
inverse_length_normal_to_face * system_matrix.get_penalty_factor();

Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/matrix_free/fe_evaluation_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class FEEvaluationData
* @warning This function will be deprecated!
*/
DEAL_II_DEPRECATED_EARLY Tensor<1, dim, Number>
get_normal_vector(const unsigned int q_point) const;
get_normal_vector(const unsigned int q_point) const;

/** @} */

Expand Down
10 changes: 4 additions & 6 deletions tests/matrix_free/compare_faces_by_cells.cc
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ class LaplaceOperator : public Subscriptor
// penalty parameter because the cell-based method cannot read the
// sigma parameter on the neighbor
VectorizedArray<number> sigmaF =
std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(fe_degree, 1) * (fe_degree + 1.0)) * 2.0;

// Compute phi part
Expand Down Expand Up @@ -229,8 +228,7 @@ class LaplaceOperator : public Subscriptor

VectorizedArray<number> local_diagonal_vector[phi.static_dofs_per_cell];
VectorizedArray<number> sigmaF =
std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;

for (unsigned int i = 0; i < phi.dofs_per_cell; ++i)
Expand Down Expand Up @@ -277,8 +275,8 @@ class LaplaceOperator : public Subscriptor
{
phif.reinit(cell, face);
VectorizedArray<number> sigmaF =
std::abs((phif.normal_vector(0) *
phif.inverse_jacobian(0))[dim - 1]) *
std::abs(
(phif.normal_vector(0) * phif.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;

std::array<types::boundary_id, VectorizedArray<number>::size()>
Expand Down
12 changes: 6 additions & 6 deletions tests/matrix_free/ecl.h
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ test(const unsigned int geometry = 0,
phi_p.read_dof_values(src);
phi_p.evaluate(true, true);
VectorizedArrayType sigmaF =
(std::abs((phi_m.normal_vector(0) *
phi_m.inverse_jacobian(0))[dim - 1]) +
std::abs((phi_m.normal_vector(0) *
phi_p.inverse_jacobian(0))[dim - 1])) *
(std::abs(
(phi_m.normal_vector(0) * phi_m.inverse_jacobian(0))[dim - 1]) +
std::abs(
(phi_m.normal_vector(0) * phi_p.inverse_jacobian(0))[dim - 1])) *
(Number)(std::max(fe_degree, 1) * (fe_degree + 1.0));

for (unsigned int q = 0; q < phi_m.n_q_points; ++q)
Expand Down Expand Up @@ -200,8 +200,8 @@ test(const unsigned int geometry = 0,
phi_m.read_dof_values(src);
phi_m.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
VectorizedArrayType sigmaF =
std::abs((phi_m.normal_vector(0) *
phi_m.inverse_jacobian(0))[dim - 1]) *
std::abs(
(phi_m.normal_vector(0) * phi_m.inverse_jacobian(0))[dim - 1]) *
Number(std::max(fe_degree, 1) * (fe_degree + 1.0)) * 2.0;

for (unsigned int q = 0; q < phi_m.n_q_points; ++q)
Expand Down
8 changes: 4 additions & 4 deletions tests/matrix_free/matrix_vector_faces_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ class MatrixFreeTest
fe_eval.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
VectorizedArrayType sigmaF =
2.0 *
std::abs((fe_eval.normal_vector(0) *
fe_eval.inverse_jacobian(0))[dim - 1]) *
std::abs(
(fe_eval.normal_vector(0) * fe_eval.inverse_jacobian(0))[dim - 1]) *
number(std::max(actual_degree, 1) * (actual_degree + 1.0));

for (unsigned int q = 0; q < fe_eval.n_q_points; ++q)
Expand Down Expand Up @@ -423,8 +423,8 @@ class MatrixFreeVariant
EvaluationFlags::values |
EvaluationFlags::gradients);
VectorizedArrayType sigmaF =
std::abs((fe_eval.normal_vector(0) *
fe_eval.inverse_jacobian(0))[dim - 1]) *
std::abs(
(fe_eval.normal_vector(0) * fe_eval.inverse_jacobian(0))[dim - 1]) *
number(std::max(actual_degree, 1) * (actual_degree + 1.0)) * 2.0;

for (unsigned int q = 0; q < fe_eval.n_q_points; ++q)
Expand Down
14 changes: 6 additions & 8 deletions tests/matrix_free/multigrid_dg_periodic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ class LaplaceOperator : public Subscriptor
fe_eval.read_dof_values(src);
fe_eval.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
VectorizedArray<number> sigmaF =
std::abs((fe_eval.normal_vector(0) *
fe_eval.inverse_jacobian(0))[dim - 1]) *
std::abs(
(fe_eval.normal_vector(0) * fe_eval.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;

for (unsigned int q = 0; q < fe_eval.n_q_points; ++q)
Expand Down Expand Up @@ -339,10 +339,9 @@ class LaplaceOperator : public Subscriptor
phi_outer.reinit(face);

VectorizedArray<number> sigmaF =
(std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) +
std::abs((phi.normal_vector(0) *
phi_outer.inverse_jacobian(0))[dim - 1])) *
(std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) +
std::abs(
(phi.normal_vector(0) * phi_outer.inverse_jacobian(0))[dim - 1])) *
(number)(std::max(fe_degree, 1) * (fe_degree + 1.0));

// Compute phi part
Expand Down Expand Up @@ -426,8 +425,7 @@ class LaplaceOperator : public Subscriptor
phi.reinit(face);

VectorizedArray<number> sigmaF =
std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;

for (unsigned int i = 0; i < phi.dofs_per_cell; ++i)
Expand Down
14 changes: 6 additions & 8 deletions tests/matrix_free/multigrid_dg_sip_01.cc
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ class LaplaceOperator : public Subscriptor
fe_eval.read_dof_values(src);
fe_eval.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
VectorizedArray<number> sigmaF =
std::abs((fe_eval.normal_vector(0) *
fe_eval.inverse_jacobian(0))[dim - 1]) *
std::abs(
(fe_eval.normal_vector(0) * fe_eval.inverse_jacobian(0))[dim - 1]) *
number(std::max(fe_degree, 1) * (fe_degree + 1.0)) * 2.0;

for (unsigned int q = 0; q < fe_eval.n_q_points; ++q)
Expand Down Expand Up @@ -346,10 +346,9 @@ class LaplaceOperator : public Subscriptor
phi_outer.reinit(face);

VectorizedArray<number> sigmaF =
(std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) +
std::abs((phi.normal_vector(0) *
phi_outer.inverse_jacobian(0))[dim - 1])) *
(std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) +
std::abs(
(phi.normal_vector(0) * phi_outer.inverse_jacobian(0))[dim - 1])) *
(number)(std::max(fe_degree, 1) * (fe_degree + 1.0));

// Compute phi part
Expand Down Expand Up @@ -433,8 +432,7 @@ class LaplaceOperator : public Subscriptor
phi.reinit(face);

VectorizedArray<number> sigmaF =
std::abs(
(phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
std::abs((phi.normal_vector(0) * phi.inverse_jacobian(0))[dim - 1]) *
number(std::max(fe_degree, 1) * (fe_degree + 1.0)) * 2.0;

for (unsigned int i = 0; i < phi.dofs_per_cell; ++i)
Expand Down
8 changes: 4 additions & 4 deletions tests/matrix_free/multigrid_dg_sip_02.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ class LaplaceOperator : public Subscriptor
fe_eval.read_dof_values(src);
fe_eval.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
VectorizedArray<number> sigmaF =
std::abs((fe_eval.normal_vector(0) *
fe_eval.inverse_jacobian(0))[dim - 1]) *
std::abs(
(fe_eval.normal_vector(0) * fe_eval.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;

for (unsigned int q = 0; q < fe_eval.n_q_points; ++q)
Expand Down Expand Up @@ -328,8 +328,8 @@ class LaplaceOperator : public Subscriptor
{
phif.reinit(cell, face);
VectorizedArray<number> sigmaF =
std::abs((phif.normal_vector(0) *
phif.inverse_jacobian(0))[dim - 1]) *
std::abs(
(phif.normal_vector(0) * phif.inverse_jacobian(0))[dim - 1]) *
(number)(std::max(1, fe_degree) * (fe_degree + 1.0)) * 2.;
std::array<types::boundary_id, VectorizedArray<number>::size()>
boundary_ids = data.get_faces_by_cells_boundary_id(cell, face);
Expand Down
8 changes: 4 additions & 4 deletions tests/simplex/step-12c.cc
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ class Operator
phi.reinit(face);
for (unsigned int q = 0; q < phi.n_q_points; ++q)
{
const auto beta_n = this->beta(phi.quadrature_point(q)) *
phi.normal_vector(q);
const auto beta_n =
this->beta(phi.quadrature_point(q)) * phi.normal_vector(q);
const auto beta_n_m = (-std::abs(beta_n) + beta_n) * 0.5;
phi.submit_value(-beta_n_m * this->boundary_values(
phi.quadrature_point(q)),
Expand Down Expand Up @@ -834,8 +834,8 @@ class Operator
phi.gather_evaluate(src, true, false);
for (unsigned int q = 0; q < phi.n_q_points; ++q)
{
const auto beta_n = this->beta(phi.quadrature_point(q)) *
phi.normal_vector(q);
const auto beta_n =
this->beta(phi.quadrature_point(q)) * phi.normal_vector(q);
const auto beta_n_p = (std::abs(beta_n) + beta_n) * 0.5;
phi.submit_value(beta_n_p * phi.get_value(q), q);
}
Expand Down

0 comments on commit 3e74bac

Please sign in to comment.