Skip to content

Commit 4fb6d8f

Browse files
committed
clang-format
1 parent e7b844d commit 4fb6d8f

9 files changed

+23
-12
lines changed

src/openturbine.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "types.hpp"
43
#include "beams/beams.hpp"
54
#include "constraints/constraints.hpp"
65
#include "solver/solver.hpp"
76
#include "state/state.hpp"
87
#include "step/step.hpp"
98
#include "step/step_parameters.hpp"
9+
#include "types.hpp"

src/step/assemble_constraints_matrix.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ void AssembleConstraintsMatrix(Solver& solver, const Constraints& constraints) {
2424
CopyConstraintsToSparseMatrix<Solver::CrsMatrixType>{
2525
constraints.row_range, constraints.base_node_col_range,
2626
constraints.target_node_col_range, solver.B, constraints.base_gradient_terms,
27-
constraints.target_gradient_terms}
27+
constraints.target_gradient_terms
28+
}
2829
);
2930
}
3031

src/step/assemble_constraints_residual.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ void AssembleConstraintsResidual(const Solver& solver, const Constraints& constr
1818
Kokkos::parallel_for(
1919
"ContributeConstraintsSystemResidualToVector", constraints.num,
2020
ContributeConstraintsSystemResidualToVector{
21-
constraints.target_node_index, solver.R, constraints.system_residual_terms}
21+
constraints.target_node_index, solver.R, constraints.system_residual_terms
22+
}
2223
);
2324

2425
auto R = Solver::ValuesType(
@@ -42,7 +43,8 @@ void AssembleConstraintsResidual(const Solver& solver, const Constraints& constr
4243
CopyConstraintsResidualToVector{
4344
constraints.row_range,
4445
Kokkos::subview(solver.R, Kokkos::make_pair(solver.num_system_dofs, solver.num_dofs)),
45-
constraints.residual_terms}
46+
constraints.residual_terms
47+
}
4648
);
4749
}
4850

src/step/assemble_inertia_matrix.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ void AssembleInertiaMatrix(const Beams& beams, double beta_prime, double gamma_p
1818
IntegrateInertiaMatrix{
1919
beams.num_nodes_per_element, beams.num_qps_per_element, beams.qp_weight,
2020
beams.qp_jacobian, beams.shape_interp, beams.qp_Muu, beams.qp_Guu, beta_prime,
21-
gamma_prime, beams.inertia_matrix_terms}
21+
gamma_prime, beams.inertia_matrix_terms
22+
}
2223
);
2324
}
2425

src/step/assemble_residual_vector.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ void AssembleResidualVector(const Beams& beams) {
2323
IntegrateResidualVector{
2424
beams.num_nodes_per_element, beams.num_qps_per_element, beams.qp_weight,
2525
beams.qp_jacobian, beams.shape_interp, beams.shape_deriv, beams.node_FX, beams.qp_Fc,
26-
beams.qp_Fd, beams.qp_Fi, beams.qp_Fe, beams.qp_Fg, beams.residual_vector_terms}
26+
beams.qp_Fd, beams.qp_Fi, beams.qp_Fe, beams.qp_Fg, beams.residual_vector_terms
27+
}
2728
);
2829
}
2930

src/step/assemble_system_matrix.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ void AssembleSystemMatrix(Solver& solver, const Beams& beams) {
3030
Kokkos::parallel_for(
3131
"ContributeElementsToSparseMatrix", sparse_matrix_policy,
3232
ContributeElementsToSparseMatrix<Solver::CrsMatrixType>{
33-
solver.K, beams.stiffness_matrix_terms}
33+
solver.K, beams.stiffness_matrix_terms
34+
}
3435
);
3536

3637
Kokkos::fence();

src/step/assemble_system_residual.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ void AssembleSystemResidual(const Solver& solver, const Beams& beams) {
1818
"ContributeElementsToVector", vector_policy,
1919
ContributeElementsToVector{
2020
beams.num_nodes_per_element, beams.node_state_indices, beams.residual_vector_terms,
21-
solver.R}
21+
solver.R
22+
}
2223
);
2324
}
2425

src/step/update_constraint_variables.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@ void UpdateConstraintVariables(const State& state, Constraints& constraints) {
2121
"CalculateConstraintForce", constraints.num,
2222
CalculateConstraintForce{
2323
constraints.type, constraints.target_node_index, constraints.axes, constraints.input,
24-
state.q, constraints.system_residual_terms}
24+
state.q, constraints.system_residual_terms
25+
}
2526
);
2627

2728
Kokkos::parallel_for(
2829
"CalculateConstraintResidualGradient", constraints.num,
2930
CalculateConstraintResidualGradient{
3031
constraints.type, constraints.base_node_index, constraints.target_node_index,
3132
constraints.X0, constraints.axes, constraints.input, state.q, constraints.residual_terms,
32-
constraints.base_gradient_terms, constraints.target_gradient_terms}
33+
constraints.base_gradient_terms, constraints.target_gradient_terms
34+
}
3335
);
3436
}
3537

src/step/update_system_variables.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ void UpdateSystemVariables(
3939
beams.num_nodes_per_element, beams.num_qps_per_element, beams.shape_interp,
4040
beams.shape_deriv, beams.qp_jacobian, beams.node_u, beams.node_u_dot, beams.node_u_ddot,
4141
beams.qp_x0, beams.qp_r0, beams.qp_u, beams.qp_u_prime, beams.qp_r, beams.qp_r_prime,
42-
beams.qp_u_dot, beams.qp_omega, beams.qp_u_ddot, beams.qp_omega_dot, beams.qp_x}
42+
beams.qp_u_dot, beams.qp_omega, beams.qp_u_ddot, beams.qp_omega_dot, beams.qp_x
43+
}
4344
);
4445

4546
Kokkos::parallel_for(
@@ -81,7 +82,8 @@ void UpdateSystemVariables(
8182
beams.qp_Puu,
8283
beams.qp_Quu,
8384
beams.qp_Guu,
84-
beams.qp_Kuu}
85+
beams.qp_Kuu
86+
}
8587
);
8688

8789
AssembleResidualVector(beams);

0 commit comments

Comments
 (0)