diff --git a/src/constraints/calculate_constraint_force.hpp b/src/constraints/calculate_constraint_force.hpp index 53543e4d..82cb15fc 100644 --- a/src/constraints/calculate_constraint_force.hpp +++ b/src/constraints/calculate_constraint_force.hpp @@ -4,7 +4,6 @@ #include "calculate_revolute_joint_force.hpp" #include "constraint_type.hpp" - #include "types.hpp" namespace openturbine { diff --git a/src/constraints/calculate_constraint_residual_gradient.hpp b/src/constraints/calculate_constraint_residual_gradient.hpp index ad023851..fb1fa206 100644 --- a/src/constraints/calculate_constraint_residual_gradient.hpp +++ b/src/constraints/calculate_constraint_residual_gradient.hpp @@ -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" diff --git a/src/constraints/calculate_fixed_bc_constraint.hpp b/src/constraints/calculate_fixed_bc_constraint.hpp index 79e8371f..afd4645e 100644 --- a/src/constraints/calculate_fixed_bc_constraint.hpp +++ b/src/constraints/calculate_fixed_bc_constraint.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/matrix_operations.hpp" #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" diff --git a/src/constraints/calculate_prescribed_bc_constraint.hpp b/src/constraints/calculate_prescribed_bc_constraint.hpp index 5ef2f0a7..b57ec626 100644 --- a/src/constraints/calculate_prescribed_bc_constraint.hpp +++ b/src/constraints/calculate_prescribed_bc_constraint.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/matrix_operations.hpp" #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" diff --git a/src/constraints/calculate_revolute_joint_constraint.hpp b/src/constraints/calculate_revolute_joint_constraint.hpp index e7426d8d..42e55973 100644 --- a/src/constraints/calculate_revolute_joint_constraint.hpp +++ b/src/constraints/calculate_revolute_joint_constraint.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" diff --git a/src/constraints/calculate_revolute_joint_force.hpp b/src/constraints/calculate_revolute_joint_force.hpp index d4755d01..72b272d4 100644 --- a/src/constraints/calculate_revolute_joint_force.hpp +++ b/src/constraints/calculate_revolute_joint_force.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" #include "types.hpp" diff --git a/src/constraints/calculate_rigid_joint_constraint.hpp b/src/constraints/calculate_rigid_joint_constraint.hpp index e78996fe..5e08313f 100644 --- a/src/constraints/calculate_rigid_joint_constraint.hpp +++ b/src/constraints/calculate_rigid_joint_constraint.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/matrix_operations.hpp" #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" diff --git a/src/constraints/calculate_rotation_control_constraint.hpp b/src/constraints/calculate_rotation_control_constraint.hpp index 8c0f5dc2..f6b4435d 100644 --- a/src/constraints/calculate_rotation_control_constraint.hpp +++ b/src/constraints/calculate_rotation_control_constraint.hpp @@ -3,7 +3,6 @@ #include #include "constraints.hpp" - #include "math/matrix_operations.hpp" #include "math/quaternion_operations.hpp" #include "math/vector_operations.hpp" diff --git a/src/constraints/constraint.hpp b/src/constraints/constraint.hpp index 3de74124..6f27cbce 100644 --- a/src/constraints/constraint.hpp +++ b/src/constraints/constraint.hpp @@ -1,7 +1,6 @@ #pragma once #include "constraint_type.hpp" - #include "math/vector_operations.hpp" #include "model/node.hpp" diff --git a/src/constraints/constraints.hpp b/src/constraints/constraints.hpp index 41d5945d..2cbb0fd0 100644 --- a/src/constraints/constraints.hpp +++ b/src/constraints/constraints.hpp @@ -7,7 +7,6 @@ #include #include "constraint.hpp" - #include "dof_management/freedom_signature.hpp" namespace openturbine { diff --git a/src/dof_management/assemble_node_freedom_allocation_table.hpp b/src/dof_management/assemble_node_freedom_allocation_table.hpp index ff768ad1..035d5662 100644 --- a/src/dof_management/assemble_node_freedom_allocation_table.hpp +++ b/src/dof_management/assemble_node_freedom_allocation_table.hpp @@ -2,10 +2,9 @@ #include -#include "freedom_signature.hpp" - #include "constraints/constraints.hpp" #include "elements/elements.hpp" +#include "freedom_signature.hpp" #include "state/state.hpp" namespace openturbine { diff --git a/src/dof_management/compute_node_freedom_map_table.hpp b/src/dof_management/compute_node_freedom_map_table.hpp index 1ef93d27..e7814fe2 100644 --- a/src/dof_management/compute_node_freedom_map_table.hpp +++ b/src/dof_management/compute_node_freedom_map_table.hpp @@ -3,7 +3,6 @@ #include #include "freedom_signature.hpp" - #include "state/state.hpp" namespace openturbine { diff --git a/src/dof_management/create_constraint_freedom_table.hpp b/src/dof_management/create_constraint_freedom_table.hpp index 175d49a9..2fba20ae 100644 --- a/src/dof_management/create_constraint_freedom_table.hpp +++ b/src/dof_management/create_constraint_freedom_table.hpp @@ -2,9 +2,8 @@ #include -#include "freedom_signature.hpp" - #include "constraints/constraints.hpp" +#include "freedom_signature.hpp" #include "state/state.hpp" namespace openturbine { diff --git a/src/dof_management/create_element_freedom_table.hpp b/src/dof_management/create_element_freedom_table.hpp index f2f0fc86..cb6490af 100644 --- a/src/dof_management/create_element_freedom_table.hpp +++ b/src/dof_management/create_element_freedom_table.hpp @@ -2,9 +2,8 @@ #include -#include "freedom_signature.hpp" - #include "elements/elements.hpp" +#include "freedom_signature.hpp" #include "state/state.hpp" namespace openturbine { diff --git a/src/elements/beams/beam_element.hpp b/src/elements/beams/beam_element.hpp index 091f2345..8709aaf3 100644 --- a/src/elements/beams/beam_element.hpp +++ b/src/elements/beams/beam_element.hpp @@ -4,7 +4,6 @@ #include #include "beam_section.hpp" - #include "types.hpp" namespace openturbine { diff --git a/src/elements/masses/create_masses.hpp b/src/elements/masses/create_masses.hpp index e7aa4ced..ed5d579e 100644 --- a/src/elements/masses/create_masses.hpp +++ b/src/elements/masses/create_masses.hpp @@ -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& nodes) { diff --git a/src/interfaces/cfd/interface.cpp b/src/interfaces/cfd/interface.cpp index b4620b57..1fef9c81 100644 --- a/src/interfaces/cfd/interface.cpp +++ b/src/interfaces/cfd/interface.cpp @@ -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 { diff --git a/src/model/copy_nodes_to_state.hpp b/src/model/copy_nodes_to_state.hpp index 7288b004..b79cb82a 100644 --- a/src/model/copy_nodes_to_state.hpp +++ b/src/model/copy_nodes_to_state.hpp @@ -4,7 +4,6 @@ #include #include "node.hpp" - #include "state/state.hpp" #include "state/update_global_position.hpp" diff --git a/src/model/model.hpp b/src/model/model.hpp index 02081e60..a683bb4c 100644 --- a/src/model/model.hpp +++ b/src/model/model.hpp @@ -3,11 +3,9 @@ #include #include -#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" @@ -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" diff --git a/src/solver/create_k_matrix.hpp b/src/solver/create_k_matrix.hpp index 4f238605..e436b622 100644 --- a/src/solver/create_k_matrix.hpp +++ b/src/solver/create_k_matrix.hpp @@ -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 { diff --git a/src/solver/create_t_matrix.hpp b/src/solver/create_t_matrix.hpp index ccb53f2b..e580b974 100644 --- a/src/solver/create_t_matrix.hpp +++ b/src/solver/create_t_matrix.hpp @@ -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 { diff --git a/src/solver/solver.hpp b/src/solver/solver.hpp index d5e9ddc7..4ff00c1b 100644 --- a/src/solver/solver.hpp +++ b/src/solver/solver.hpp @@ -9,6 +9,7 @@ #include #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" @@ -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 diff --git a/src/step/predict_next_state.hpp b/src/step/predict_next_state.hpp index 67fb3e1b..371b5c4b 100644 --- a/src/step/predict_next_state.hpp +++ b/src/step/predict_next_state.hpp @@ -3,12 +3,11 @@ #include #include -#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 { diff --git a/src/step/solve_system.hpp b/src/step/solve_system.hpp index a61429ee..b80e2602 100644 --- a/src/step/solve_system.hpp +++ b/src/step/solve_system.hpp @@ -3,10 +3,9 @@ #include #include -#include "step_parameters.hpp" - #include "solver/condition_system.hpp" #include "solver/solver.hpp" +#include "step_parameters.hpp" namespace openturbine { diff --git a/src/step/step.hpp b/src/step/step.hpp index 33759f76..168685b9 100644 --- a/src/step/step.hpp +++ b/src/step/step.hpp @@ -10,9 +10,16 @@ #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" @@ -20,14 +27,6 @@ #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 { /** diff --git a/src/step/update_state_prediction.hpp b/src/step/update_state_prediction.hpp index c67e18a8..e4a49f1c 100644 --- a/src/step/update_state_prediction.hpp +++ b/src/step/update_state_prediction.hpp @@ -3,13 +3,12 @@ #include #include -#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 { diff --git a/src/step/update_system_variables.hpp b/src/step/update_system_variables.hpp index 2ed65a6d..68afd20b 100644 --- a/src/step/update_system_variables.hpp +++ b/src/step/update_system_variables.hpp @@ -3,13 +3,12 @@ #include #include +#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( diff --git a/src/step/update_system_variables_beams.hpp b/src/step/update_system_variables_beams.hpp index dab6dc88..308a31fa 100644 --- a/src/step/update_system_variables_beams.hpp +++ b/src/step/update_system_variables_beams.hpp @@ -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" diff --git a/src/step/update_system_variables_masses.hpp b/src/step/update_system_variables_masses.hpp index 8cc0b74b..c1913951 100644 --- a/src/step/update_system_variables_masses.hpp +++ b/src/step/update_system_variables_masses.hpp @@ -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" diff --git a/src/step/update_system_variables_springs.hpp b/src/step/update_system_variables_springs.hpp index e573853e..bb882617 100644 --- a/src/step/update_system_variables_springs.hpp +++ b/src/step/update_system_variables_springs.hpp @@ -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" diff --git a/src/step/update_tangent_operator.hpp b/src/step/update_tangent_operator.hpp index e8bc682a..a31a057d 100644 --- a/src/step/update_tangent_operator.hpp +++ b/src/step/update_tangent_operator.hpp @@ -3,9 +3,8 @@ #include #include -#include "step_parameters.hpp" - #include "state/state.hpp" +#include "step_parameters.hpp" #include "system/calculate_tangent_operator.hpp" namespace openturbine { diff --git a/tests/regression_tests/external/test_aerodyn_inflow.cpp b/tests/regression_tests/external/test_aerodyn_inflow.cpp index e91a8935..52e10845 100644 --- a/tests/regression_tests/external/test_aerodyn_inflow.cpp +++ b/tests/regression_tests/external/test_aerodyn_inflow.cpp @@ -1,8 +1,8 @@ #include -#include "utilities/aerodynamics/aerodyn_inflow.hpp" #include "regression/test_utilities.hpp" +#include "utilities/aerodynamics/aerodyn_inflow.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/external/test_rotor_aero_controller.cpp b/tests/regression_tests/external/test_rotor_aero_controller.cpp index 4ad746f3..a8d96818 100644 --- a/tests/regression_tests/external/test_rotor_aero_controller.cpp +++ b/tests/regression_tests/external/test_rotor_aero_controller.cpp @@ -9,6 +9,8 @@ #include #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" @@ -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" diff --git a/tests/regression_tests/interfaces/test_cfd_interface.cpp b/tests/regression_tests/interfaces/test_cfd_interface.cpp index 553473d1..a5bd3d90 100644 --- a/tests/regression_tests/interfaces/test_cfd_interface.cpp +++ b/tests/regression_tests/interfaces/test_cfd_interface.cpp @@ -1,8 +1,8 @@ #include #include "interfaces/cfd/interface.hpp" -#include "viz/vtk_lines.hpp" #include "regression/test_utilities.hpp" +#include "viz/vtk_lines.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_beams.cpp b/tests/regression_tests/regression/test_beams.cpp index 01e54a6d..18fa1632 100644 --- a/tests/regression_tests/regression/test_beams.cpp +++ b/tests/regression_tests/regression/test_beams.cpp @@ -2,11 +2,10 @@ #include -#include "test_utilities.hpp" - #include "model/model.hpp" #include "state/state.hpp" #include "step/update_system_variables_beams.hpp" +#include "test_utilities.hpp" #include "types.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_cantilever_beam.cpp b/tests/regression_tests/regression/test_cantilever_beam.cpp index 3f885ea9..8bbfba0d 100644 --- a/tests/regression_tests/regression/test_cantilever_beam.cpp +++ b/tests/regression_tests/regression/test_cantilever_beam.cpp @@ -4,8 +4,6 @@ #include -#include "test_utilities.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" @@ -14,6 +12,7 @@ #include "solver/solver.hpp" #include "state/state.hpp" #include "step/step.hpp" +#include "test_utilities.hpp" #include "types.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_controller.cpp b/tests/regression_tests/regression/test_controller.cpp index 01f19773..86982767 100644 --- a/tests/regression_tests/regression/test_controller.cpp +++ b/tests/regression_tests/regression/test_controller.cpp @@ -1,7 +1,6 @@ #include #include "test_utilities.hpp" - #include "utilities/controllers/controller_io.hpp" #include "utilities/controllers/discon.hpp" #include "utilities/controllers/turbine_controller.hpp" diff --git a/tests/regression_tests/regression/test_heavy_top.cpp b/tests/regression_tests/regression/test_heavy_top.cpp index 5ccadc5d..c89f7c70 100644 --- a/tests/regression_tests/regression/test_heavy_top.cpp +++ b/tests/regression_tests/regression/test_heavy_top.cpp @@ -1,9 +1,8 @@ #include -#include "test_utilities.hpp" - #include "model/model.hpp" #include "step/step.hpp" +#include "test_utilities.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_masses.cpp b/tests/regression_tests/regression/test_masses.cpp index a255b4df..65bc88d0 100644 --- a/tests/regression_tests/regression/test_masses.cpp +++ b/tests/regression_tests/regression/test_masses.cpp @@ -1,7 +1,5 @@ #include -#include "test_utilities.hpp" - #include "elements/elements.hpp" #include "elements/masses/create_masses.hpp" #include "model/model.hpp" @@ -9,6 +7,7 @@ #include "state/state.hpp" #include "step/step.hpp" #include "step/update_system_variables.hpp" +#include "test_utilities.hpp" #include "types.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_precession.cpp b/tests/regression_tests/regression/test_precession.cpp index 7e9b3b62..454b3420 100644 --- a/tests/regression_tests/regression/test_precession.cpp +++ b/tests/regression_tests/regression/test_precession.cpp @@ -1,7 +1,5 @@ #include -#include "test_utilities.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" @@ -16,6 +14,7 @@ #include "state/state.hpp" #include "step/step.hpp" #include "step/update_system_variables.hpp" +#include "test_utilities.hpp" #include "types.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_rotor.cpp b/tests/regression_tests/regression/test_rotor.cpp index e924623f..5e0e82ff 100644 --- a/tests/regression_tests/regression/test_rotor.cpp +++ b/tests/regression_tests/regression/test_rotor.cpp @@ -6,12 +6,11 @@ #include #include "iea15_rotor_data.hpp" -#include "test_utilities.hpp" - #include "model/model.hpp" #include "solver/solver.hpp" #include "state/state.hpp" #include "step/step.hpp" +#include "test_utilities.hpp" #include "types.hpp" #include "utilities/controllers/discon.hpp" #include "utilities/controllers/turbine_controller.hpp" diff --git a/tests/regression_tests/regression/test_solver.cpp b/tests/regression_tests/regression/test_solver.cpp index 06a012a4..adcd79dd 100644 --- a/tests/regression_tests/regression/test_solver.cpp +++ b/tests/regression_tests/regression/test_solver.cpp @@ -2,8 +2,6 @@ #include -#include "test_utilities.hpp" - #include "model/model.hpp" #include "solver/solver.hpp" #include "state/state.hpp" @@ -11,6 +9,7 @@ #include "step/step.hpp" #include "step/step_parameters.hpp" #include "step/update_constraint_variables.hpp" +#include "test_utilities.hpp" #include "types.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_spring_mass_system.cpp b/tests/regression_tests/regression/test_spring_mass_system.cpp index 7f2337e1..1796e730 100644 --- a/tests/regression_tests/regression/test_spring_mass_system.cpp +++ b/tests/regression_tests/regression/test_spring_mass_system.cpp @@ -1,7 +1,5 @@ #include -#include "test_utilities.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" @@ -14,6 +12,7 @@ #include "model/model.hpp" #include "solver/solver.hpp" #include "step/step.hpp" +#include "test_utilities.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/test_springs.cpp b/tests/regression_tests/regression/test_springs.cpp index f720b7d4..33b10f33 100644 --- a/tests/regression_tests/regression/test_springs.cpp +++ b/tests/regression_tests/regression/test_springs.cpp @@ -1,11 +1,10 @@ #include -#include "test_utilities.hpp" - #include "elements/springs/create_springs.hpp" #include "elements/springs/springs.hpp" #include "model/model.hpp" #include "step/update_system_variables_springs.hpp" +#include "test_utilities.hpp" namespace openturbine::tests { diff --git a/tests/regression_tests/regression/vtkout.hpp b/tests/regression_tests/regression/vtkout.hpp index 14343f6f..406cfa07 100644 --- a/tests/regression_tests/regression/vtkout.hpp +++ b/tests/regression_tests/regression/vtkout.hpp @@ -13,11 +13,10 @@ #include #include -#include "test_utilities.hpp" - #include "elements/beams/beams.hpp" #include "elements/beams/calculate_QP_deformation.hpp" #include "math/quaternion_operations.hpp" +#include "test_utilities.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/elements/beams/test_interpolate_QP_state.cpp b/tests/unit_tests/elements/beams/test_interpolate_QP_state.cpp index a07bf2d1..f3967956 100644 --- a/tests/unit_tests/elements/beams/test_interpolate_QP_state.cpp +++ b/tests/unit_tests/elements/beams/test_interpolate_QP_state.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_interpolate_QP.hpp" - #include "elements/beams/interpolate_QP_state.hpp" +#include "test_interpolate_QP.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/elements/beams/test_interpolate_QP_vector.cpp b/tests/unit_tests/elements/beams/test_interpolate_QP_vector.cpp index bd5b626d..6435dcde 100644 --- a/tests/unit_tests/elements/beams/test_interpolate_QP_vector.cpp +++ b/tests/unit_tests/elements/beams/test_interpolate_QP_vector.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_interpolate_QP.hpp" - #include "elements/beams/interpolate_QP_vector.hpp" +#include "test_interpolate_QP.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_Ouu.cpp b/tests/unit_tests/system/beams/test_calculate_Ouu.cpp index 674c1629..63c9cd36 100644 --- a/tests/unit_tests/system/beams/test_calculate_Ouu.cpp +++ b/tests/unit_tests/system/beams/test_calculate_Ouu.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_Ouu.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_Puu.cpp b/tests/unit_tests/system/beams/test_calculate_Puu.cpp index e93a16e6..0b14a0a7 100644 --- a/tests/unit_tests/system/beams/test_calculate_Puu.cpp +++ b/tests/unit_tests/system/beams/test_calculate_Puu.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_Puu.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_Quu.cpp b/tests/unit_tests/system/beams/test_calculate_Quu.cpp index c0d120d7..fb6d5438 100644 --- a/tests/unit_tests/system/beams/test_calculate_Quu.cpp +++ b/tests/unit_tests/system/beams/test_calculate_Quu.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_Quu.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_RR0.cpp b/tests/unit_tests/system/beams/test_calculate_RR0.cpp index 1965f2e3..e0b2bec1 100644 --- a/tests/unit_tests/system/beams/test_calculate_RR0.cpp +++ b/tests/unit_tests/system/beams/test_calculate_RR0.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_RR0.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_force_FC.cpp b/tests/unit_tests/system/beams/test_calculate_force_FC.cpp index d850be70..2e195b27 100644 --- a/tests/unit_tests/system/beams/test_calculate_force_FC.cpp +++ b/tests/unit_tests/system/beams/test_calculate_force_FC.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_force_FC.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_force_FD.cpp b/tests/unit_tests/system/beams/test_calculate_force_FD.cpp index 663895f3..0ef9bce2 100644 --- a/tests/unit_tests/system/beams/test_calculate_force_FD.cpp +++ b/tests/unit_tests/system/beams/test_calculate_force_FD.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_force_FD.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_gravity_force.cpp b/tests/unit_tests/system/beams/test_calculate_gravity_force.cpp index 33eb1f31..6f6fcfbd 100644 --- a/tests/unit_tests/system/beams/test_calculate_gravity_force.cpp +++ b/tests/unit_tests/system/beams/test_calculate_gravity_force.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_gravity_force.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_gyroscopic_matrix.cpp b/tests/unit_tests/system/beams/test_calculate_gyroscopic_matrix.cpp index 77134297..e4425626 100644 --- a/tests/unit_tests/system/beams/test_calculate_gyroscopic_matrix.cpp +++ b/tests/unit_tests/system/beams/test_calculate_gyroscopic_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_gyroscopic_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_inertia_stiffness_matrix.cpp b/tests/unit_tests/system/beams/test_calculate_inertia_stiffness_matrix.cpp index 97b7a3c0..7f25b6a2 100644 --- a/tests/unit_tests/system/beams/test_calculate_inertia_stiffness_matrix.cpp +++ b/tests/unit_tests/system/beams/test_calculate_inertia_stiffness_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_inertia_stiffness_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_inertial_forces.cpp b/tests/unit_tests/system/beams/test_calculate_inertial_forces.cpp index 4d06578d..a224fb93 100644 --- a/tests/unit_tests/system/beams/test_calculate_inertial_forces.cpp +++ b/tests/unit_tests/system/beams/test_calculate_inertial_forces.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_inertial_force.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_mass_matrix_components.cpp b/tests/unit_tests/system/beams/test_calculate_mass_matrix_components.cpp index fd7b0469..883511e7 100644 --- a/tests/unit_tests/system/beams/test_calculate_mass_matrix_components.cpp +++ b/tests/unit_tests/system/beams/test_calculate_mass_matrix_components.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_mass_matrix_components.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_strain.cpp b/tests/unit_tests/system/beams/test_calculate_strain.cpp index 1168dab0..3c234156 100644 --- a/tests/unit_tests/system/beams/test_calculate_strain.cpp +++ b/tests/unit_tests/system/beams/test_calculate_strain.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_strain.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_calculate_temporary_variables.cpp b/tests/unit_tests/system/beams/test_calculate_temporary_variables.cpp index 312d29a6..469166bc 100644 --- a/tests/unit_tests/system/beams/test_calculate_temporary_variables.cpp +++ b/tests/unit_tests/system/beams/test_calculate_temporary_variables.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/calculate_temporary_variables.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_integrate_inertia_matrix.cpp b/tests/unit_tests/system/beams/test_integrate_inertia_matrix.cpp index 35359eeb..f4c50735 100644 --- a/tests/unit_tests/system/beams/test_integrate_inertia_matrix.cpp +++ b/tests/unit_tests/system/beams/test_integrate_inertia_matrix.cpp @@ -1,11 +1,10 @@ #include #include -#include "test_calculate.hpp" -#include "test_integrate_matrix.hpp" - #include "elements/beams/beams.hpp" #include "system/beams/integrate_inertia_matrix.hpp" +#include "test_calculate.hpp" +#include "test_integrate_matrix.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_integrate_residual_vector.cpp b/tests/unit_tests/system/beams/test_integrate_residual_vector.cpp index e98af22a..741de594 100644 --- a/tests/unit_tests/system/beams/test_integrate_residual_vector.cpp +++ b/tests/unit_tests/system/beams/test_integrate_residual_vector.cpp @@ -1,11 +1,10 @@ #include #include -#include "test_calculate.hpp" -#include "test_integrate_matrix.hpp" - #include "elements/beams/beams.hpp" #include "system/beams/integrate_residual_vector.hpp" +#include "test_calculate.hpp" +#include "test_integrate_matrix.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_integrate_stiffness_matrix.cpp b/tests/unit_tests/system/beams/test_integrate_stiffness_matrix.cpp index e9533c79..d16d31ca 100644 --- a/tests/unit_tests/system/beams/test_integrate_stiffness_matrix.cpp +++ b/tests/unit_tests/system/beams/test_integrate_stiffness_matrix.cpp @@ -1,11 +1,10 @@ #include #include -#include "test_calculate.hpp" -#include "test_integrate_matrix.hpp" - #include "elements/beams/beams.hpp" #include "system/beams/integrate_stiffness_matrix.hpp" +#include "test_calculate.hpp" +#include "test_integrate_matrix.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/beams/test_rotate_section_matrix.cpp b/tests/unit_tests/system/beams/test_rotate_section_matrix.cpp index 38245042..11d0231d 100644 --- a/tests/unit_tests/system/beams/test_rotate_section_matrix.cpp +++ b/tests/unit_tests/system/beams/test_rotate_section_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/beams/rotate_section_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_RR0.cpp b/tests/unit_tests/system/masses/test_calculate_RR0.cpp index 648d5f42..790c8e02 100644 --- a/tests/unit_tests/system/masses/test_calculate_RR0.cpp +++ b/tests/unit_tests/system/masses/test_calculate_RR0.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_RR0.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_gravity_force.cpp b/tests/unit_tests/system/masses/test_calculate_gravity_force.cpp index f6c55e0e..bdea710a 100644 --- a/tests/unit_tests/system/masses/test_calculate_gravity_force.cpp +++ b/tests/unit_tests/system/masses/test_calculate_gravity_force.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_gravity_force.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_gyroscopic_matrix.cpp b/tests/unit_tests/system/masses/test_calculate_gyroscopic_matrix.cpp index 67b3f91c..43d12768 100644 --- a/tests/unit_tests/system/masses/test_calculate_gyroscopic_matrix.cpp +++ b/tests/unit_tests/system/masses/test_calculate_gyroscopic_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_gyroscopic_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_inertia_stiffness_matrix.cpp b/tests/unit_tests/system/masses/test_calculate_inertia_stiffness_matrix.cpp index 1bb858bf..8e6c0745 100644 --- a/tests/unit_tests/system/masses/test_calculate_inertia_stiffness_matrix.cpp +++ b/tests/unit_tests/system/masses/test_calculate_inertia_stiffness_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_inertia_stiffness_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_inertial_forces.cpp b/tests/unit_tests/system/masses/test_calculate_inertial_forces.cpp index b4467eb1..d05dc027 100644 --- a/tests/unit_tests/system/masses/test_calculate_inertial_forces.cpp +++ b/tests/unit_tests/system/masses/test_calculate_inertial_forces.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_inertial_force.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_calculate_mass_matrix_components.cpp b/tests/unit_tests/system/masses/test_calculate_mass_matrix_components.cpp index f54a6067..3e90f5e5 100644 --- a/tests/unit_tests/system/masses/test_calculate_mass_matrix_components.cpp +++ b/tests/unit_tests/system/masses/test_calculate_mass_matrix_components.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/calculate_mass_matrix_components.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_rotate_section_matrix.cpp b/tests/unit_tests/system/masses/test_rotate_section_matrix.cpp index 711ac56c..f9148434 100644 --- a/tests/unit_tests/system/masses/test_rotate_section_matrix.cpp +++ b/tests/unit_tests/system/masses/test_rotate_section_matrix.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/rotate_section_matrix.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/masses/test_update_node_state.cpp b/tests/unit_tests/system/masses/test_update_node_state.cpp index 250bfdec..c4ddde23 100644 --- a/tests/unit_tests/system/masses/test_update_node_state.cpp +++ b/tests/unit_tests/system/masses/test_update_node_state.cpp @@ -1,9 +1,8 @@ #include #include -#include "test_calculate.hpp" - #include "system/masses/update_node_state.hpp" +#include "test_calculate.hpp" namespace openturbine::tests { diff --git a/tests/unit_tests/system/springs/test_calculate_distance_components.cpp b/tests/unit_tests/system/springs/test_calculate_distance_components.cpp index 9c8bc289..b8b06c62 100644 --- a/tests/unit_tests/system/springs/test_calculate_distance_components.cpp +++ b/tests/unit_tests/system/springs/test_calculate_distance_components.cpp @@ -1,8 +1,8 @@ #include #include -#include "system/springs/calculate_distance_components.hpp" #include "system/beams/test_calculate.hpp" +#include "system/springs/calculate_distance_components.hpp" namespace { diff --git a/tests/unit_tests/system/springs/test_calculate_force_coefficients.cpp b/tests/unit_tests/system/springs/test_calculate_force_coefficients.cpp index 377a9b5a..dd66b0cd 100644 --- a/tests/unit_tests/system/springs/test_calculate_force_coefficients.cpp +++ b/tests/unit_tests/system/springs/test_calculate_force_coefficients.cpp @@ -1,8 +1,8 @@ #include #include -#include "system/springs/calculate_force_coefficients.hpp" #include "system/beams/test_calculate.hpp" +#include "system/springs/calculate_force_coefficients.hpp" namespace { diff --git a/tests/unit_tests/system/springs/test_calculate_force_vectors.cpp b/tests/unit_tests/system/springs/test_calculate_force_vectors.cpp index 623a8bad..7194e45c 100644 --- a/tests/unit_tests/system/springs/test_calculate_force_vectors.cpp +++ b/tests/unit_tests/system/springs/test_calculate_force_vectors.cpp @@ -1,8 +1,8 @@ #include #include -#include "system/springs/calculate_force_vectors.hpp" #include "system/beams/test_calculate.hpp" +#include "system/springs/calculate_force_vectors.hpp" namespace { diff --git a/tests/unit_tests/system/springs/test_calculate_length.cpp b/tests/unit_tests/system/springs/test_calculate_length.cpp index fe7d1340..609b8b1f 100644 --- a/tests/unit_tests/system/springs/test_calculate_length.cpp +++ b/tests/unit_tests/system/springs/test_calculate_length.cpp @@ -1,8 +1,8 @@ #include #include -#include "system/springs/calculate_length.hpp" #include "system/beams/test_calculate.hpp" +#include "system/springs/calculate_length.hpp" void TestCalclateLengthTests_ThreeElements() { const auto r = Kokkos::View("r"); diff --git a/tests/unit_tests/system/springs/test_calculate_stiffness_matrix.cpp b/tests/unit_tests/system/springs/test_calculate_stiffness_matrix.cpp index 3ca2f2e5..d7b94979 100644 --- a/tests/unit_tests/system/springs/test_calculate_stiffness_matrix.cpp +++ b/tests/unit_tests/system/springs/test_calculate_stiffness_matrix.cpp @@ -1,8 +1,8 @@ #include #include -#include "system/springs/calculate_stiffness_matrix.hpp" #include "system/beams/test_calculate.hpp" +#include "system/springs/calculate_stiffness_matrix.hpp" void TestCalculateStiffnessMatrixTests_OneElement() { const auto c1 = Kokkos::View("c1");