Skip to content

Commit

Permalink
clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
ddement committed Jan 18, 2025
1 parent f733875 commit 8df8596
Show file tree
Hide file tree
Showing 77 changed files with 75 additions and 143 deletions.
1 change: 0 additions & 1 deletion src/constraints/calculate_constraint_force.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "calculate_revolute_joint_force.hpp"
#include "constraint_type.hpp"

#include "types.hpp"

namespace openturbine {
Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_constraint_residual_gradient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "calculate_rigid_joint_constraint.hpp"
#include "calculate_rotation_control_constraint.hpp"
#include "constraints.hpp"

#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_fixed_bc_constraint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/matrix_operations.hpp"
#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_prescribed_bc_constraint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/matrix_operations.hpp"
#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_revolute_joint_constraint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_revolute_joint_force.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"
#include "types.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_rigid_joint_constraint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/matrix_operations.hpp"
#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/constraints/calculate_rotation_control_constraint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "constraints.hpp"

#include "math/matrix_operations.hpp"
#include "math/quaternion_operations.hpp"
#include "math/vector_operations.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/constraints/constraint.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "constraint_type.hpp"

#include "math/vector_operations.hpp"
#include "model/node.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/constraints/constraints.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <Kokkos_Core.hpp>

#include "constraint.hpp"

#include "dof_management/freedom_signature.hpp"

namespace openturbine {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

#include <Kokkos_Core.hpp>

#include "freedom_signature.hpp"

#include "constraints/constraints.hpp"
#include "elements/elements.hpp"
#include "freedom_signature.hpp"
#include "state/state.hpp"

namespace openturbine {
Expand Down
1 change: 0 additions & 1 deletion src/dof_management/compute_node_freedom_map_table.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <Kokkos_Core.hpp>

#include "freedom_signature.hpp"

#include "state/state.hpp"

namespace openturbine {
Expand Down
3 changes: 1 addition & 2 deletions src/dof_management/create_constraint_freedom_table.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

#include <Kokkos_Core.hpp>

#include "freedom_signature.hpp"

#include "constraints/constraints.hpp"
#include "freedom_signature.hpp"
#include "state/state.hpp"

namespace openturbine {
Expand Down
3 changes: 1 addition & 2 deletions src/dof_management/create_element_freedom_table.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

#include <Kokkos_Core.hpp>

#include "freedom_signature.hpp"

#include "elements/elements.hpp"
#include "freedom_signature.hpp"
#include "state/state.hpp"

namespace openturbine {
Expand Down
1 change: 0 additions & 1 deletion src/elements/beams/beam_element.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <vector>

#include "beam_section.hpp"

#include "types.hpp"

namespace openturbine {
Expand Down
3 changes: 1 addition & 2 deletions src/elements/masses/create_masses.hpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#pragma once

#include "elements/beams/calculate_QP_position.hpp"
#include "masses.hpp"
#include "masses_input.hpp"

#include "elements/beams/calculate_QP_position.hpp"

namespace openturbine {

inline Masses CreateMasses(const MassesInput& masses_input, const std::vector<Node>& nodes) {
Expand Down
6 changes: 3 additions & 3 deletions src/interfaces/cfd/interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

#include "floating_platform.hpp"
#include "floating_platform_input.hpp"
#include "model/model.hpp"
#include "mooring_line_input.hpp"
#include "node_data.hpp"
#include "turbine.hpp"
#include "turbine_input.hpp"
#include "model/model.hpp"
#include "state/clone_state.hpp"
#include "state/copy_state_data.hpp"
#include "state/set_node_external_loads.hpp"
#include "state/state.hpp"
#include "step/step.hpp"
#include "turbine.hpp"
#include "turbine_input.hpp"

namespace openturbine::cfd {

Expand Down
1 change: 0 additions & 1 deletion src/model/copy_nodes_to_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <vector>

#include "node.hpp"

#include "state/state.hpp"
#include "state/update_global_position.hpp"

Expand Down
5 changes: 2 additions & 3 deletions src/model/model.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
#include <functional>
#include <tuple>

#include "copy_nodes_to_state.hpp"
#include "node.hpp"

#include "constraints/constraint.hpp"
#include "constraints/constraints.hpp"
#include "copy_nodes_to_state.hpp"
#include "dof_management/assemble_node_freedom_allocation_table.hpp"
#include "dof_management/compute_node_freedom_map_table.hpp"
#include "dof_management/create_constraint_freedom_table.hpp"
Expand All @@ -19,6 +17,7 @@
#include "elements/masses/masses_input.hpp"
#include "elements/springs/create_springs.hpp"
#include "elements/springs/springs_input.hpp"
#include "node.hpp"
#include "solver/solver.hpp"
#include "state/state.hpp"
#include "step/step_parameters.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/solver/create_k_matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "compute_k_col_inds.hpp"
#include "compute_k_num_non_zero.hpp"
#include "compute_k_row_ptrs.hpp"

#include "dof_management/freedom_signature.hpp"

namespace openturbine {
Expand Down
1 change: 0 additions & 1 deletion src/solver/create_t_matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "compute_t_col_inds.hpp"
#include "compute_t_num_non_zero.hpp"
#include "compute_t_row_ptrs.hpp"

#include "dof_management/freedom_signature.hpp"

namespace openturbine {
Expand Down
3 changes: 1 addition & 2 deletions src/solver/solver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <Kokkos_Core.hpp>

#include "compute_num_system_dofs.hpp"
#include "constraints/constraint_type.hpp"
#include "create_b_matrix.hpp"
#include "create_b_t_matrix.hpp"
#include "create_constraints_matrix_full.hpp"
Expand All @@ -22,8 +23,6 @@
#include "create_transpose_matrix_full.hpp"
#include "fill_unshifted_row_ptrs.hpp"

#include "constraints/constraint_type.hpp"

namespace openturbine {

/** @brief A linear systems solver for assembling and solving system matrices and constraints in
Expand Down
3 changes: 1 addition & 2 deletions src/step/predict_next_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>

#include "step_parameters.hpp"

#include "solver/solver.hpp"
#include "state/calculate_displacement.hpp"
#include "state/calculate_next_state.hpp"
#include "state/state.hpp"
#include "step_parameters.hpp"

namespace openturbine {

Expand Down
3 changes: 1 addition & 2 deletions src/step/solve_system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>

#include "step_parameters.hpp"

#include "solver/condition_system.hpp"
#include "solver/solver.hpp"
#include "step_parameters.hpp"

namespace openturbine {

Expand Down
15 changes: 7 additions & 8 deletions src/step/step.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,23 @@
#include "assemble_system_residual.hpp"
#include "assemble_tangent_operator.hpp"
#include "calculate_convergence_error.hpp"
#include "constraints/calculate_constraint_output.hpp"
#include "constraints/constraints.hpp"
#include "elements/elements.hpp"
#include "predict_next_state.hpp"
#include "reset_constraints.hpp"
#include "solve_system.hpp"
#include "solver/solver.hpp"
#include "state/state.hpp"
#include "state/update_algorithmic_acceleration.hpp"
#include "state/update_global_position.hpp"
#include "step_parameters.hpp"
#include "update_constraint_prediction.hpp"
#include "update_constraint_variables.hpp"
#include "update_state_prediction.hpp"
#include "update_system_variables.hpp"
#include "update_tangent_operator.hpp"

#include "constraints/calculate_constraint_output.hpp"
#include "constraints/constraints.hpp"
#include "elements/elements.hpp"
#include "solver/solver.hpp"
#include "state/state.hpp"
#include "state/update_algorithmic_acceleration.hpp"
#include "state/update_global_position.hpp"

namespace openturbine {

/**
Expand Down
3 changes: 1 addition & 2 deletions src/step/update_state_prediction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>

#include "step_parameters.hpp"

#include "solver/solver.hpp"
#include "state/calculate_displacement.hpp"
#include "state/state.hpp"
#include "state/update_dynamic_prediction.hpp"
#include "state/update_static_prediction.hpp"
#include "step_parameters.hpp"

namespace openturbine {

Expand Down
5 changes: 2 additions & 3 deletions src/step/update_system_variables.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>

#include "elements/elements.hpp"
#include "state/state.hpp"
#include "update_system_variables_beams.hpp"
#include "update_system_variables_masses.hpp"
#include "update_system_variables_springs.hpp"

#include "elements/elements.hpp"
#include "state/state.hpp"

namespace openturbine {

inline void UpdateSystemVariables(
Expand Down
3 changes: 1 addition & 2 deletions src/step/update_system_variables_beams.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
#include "assemble_inertia_matrix_beams.hpp"
#include "assemble_residual_vector_beams.hpp"
#include "assemble_stiffness_matrix_beams.hpp"
#include "step_parameters.hpp"

#include "elements/beams/beams.hpp"
#include "elements/beams/interpolate_to_quadrature_points.hpp"
#include "state/state.hpp"
#include "step_parameters.hpp"
#include "system/beams/calculate_quadrature_point_values.hpp"
#include "system/beams/update_node_state.hpp"

Expand Down
3 changes: 1 addition & 2 deletions src/step/update_system_variables_masses.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
#include "assemble_inertia_matrix_masses.hpp"
#include "assemble_residual_vector_masses.hpp"
#include "assemble_stiffness_matrix_masses.hpp"
#include "step_parameters.hpp"

#include "elements/masses/masses.hpp"
#include "math/vector_operations.hpp"
#include "state/state.hpp"
#include "step_parameters.hpp"
#include "system/masses/calculate_QP_position.hpp"
#include "system/masses/calculate_RR0.hpp"
#include "system/masses/calculate_gravity_force.hpp"
Expand Down
3 changes: 1 addition & 2 deletions src/step/update_system_variables_springs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

#include "assemble_residual_vector_springs.hpp"
#include "assemble_stiffness_matrix_springs.hpp"
#include "step_parameters.hpp"

#include "elements/springs/springs.hpp"
#include "state/state.hpp"
#include "step_parameters.hpp"
#include "system/springs/calculate_distance_components.hpp"
#include "system/springs/calculate_force_coefficients.hpp"
#include "system/springs/calculate_force_vectors.hpp"
Expand Down
3 changes: 1 addition & 2 deletions src/step/update_tangent_operator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
#include <Kokkos_Core.hpp>
#include <Kokkos_Profiling_ScopedRegion.hpp>

#include "step_parameters.hpp"

#include "state/state.hpp"
#include "step_parameters.hpp"
#include "system/calculate_tangent_operator.hpp"

namespace openturbine {
Expand Down
2 changes: 1 addition & 1 deletion tests/regression_tests/external/test_aerodyn_inflow.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

#include <gtest/gtest.h>

#include "utilities/aerodynamics/aerodyn_inflow.hpp"
#include "regression/test_utilities.hpp"
#include "utilities/aerodynamics/aerodyn_inflow.hpp"

namespace openturbine::tests {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <gtest/gtest.h>

#include "model/model.hpp"
#include "regression/iea15_rotor_data.hpp"
#include "regression/test_utilities.hpp"
#include "solver/solver.hpp"
#include "state/state.hpp"
#include "step/step.hpp"
Expand All @@ -17,8 +19,6 @@
#include "utilities/controllers/discon.hpp"
#include "utilities/controllers/turbine_controller.hpp"
#include "vendor/dylib/dylib.hpp"
#include "regression/iea15_rotor_data.hpp"
#include "regression/test_utilities.hpp"

#ifdef OpenTurbine_ENABLE_VTK
#include "regression/vtkout.hpp"
Expand Down
2 changes: 1 addition & 1 deletion tests/regression_tests/interfaces/test_cfd_interface.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <gtest/gtest.h>

#include "interfaces/cfd/interface.hpp"
#include "viz/vtk_lines.hpp"
#include "regression/test_utilities.hpp"
#include "viz/vtk_lines.hpp"

namespace openturbine::tests {

Expand Down
Loading

0 comments on commit 8df8596

Please sign in to comment.