From d446ae10deda1de4b66ecd81c8d77c07ea6a988b Mon Sep 17 00:00:00 2001 From: dcdemen Date: Tue, 22 Oct 2024 14:58:39 -0600 Subject: [PATCH] clang-format --- .../math/test_matrix_operations.cpp | 17 +-- .../math/test_quaternion_operations.cpp | 118 ++++++++++-------- .../math/test_vector_operations.cpp | 10 +- .../utilities/test_turbine_parsing.cpp | 10 +- 4 files changed, 90 insertions(+), 65 deletions(-) diff --git a/tests/unit_tests/math/test_matrix_operations.cpp b/tests/unit_tests/math/test_matrix_operations.cpp index 462f0cb3..e9b92030 100644 --- a/tests/unit_tests/math/test_matrix_operations.cpp +++ b/tests/unit_tests/math/test_matrix_operations.cpp @@ -6,7 +6,7 @@ namespace openturbine::tests { template -Kokkos::View Create2DView(const std::array& input) { +Kokkos::View Create2DView(const std::array& input) { auto view = Kokkos::View("view"); auto view_host = Kokkos::View(input.data()); auto view_mirror = Kokkos::create_mirror(view); @@ -23,10 +23,11 @@ inline void test_AX_Matrix() { Kokkos::deep_copy(out_mirror, out); constexpr auto expected_data = std::array{7., -1., -1.5, -2., 5., -3., -3.5, -4., 3.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 3U; ++j) { + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(out_mirror(i, j), expected(i, j), 1.e-15); } } @@ -36,7 +37,6 @@ TEST(MatrixTest, AX_Matrix) { test_AX_Matrix(); } - Kokkos::View TestAxialVectorOfMatrix(const Kokkos::View& m) { auto v = Kokkos::View("v"); Kokkos::parallel_for( @@ -53,11 +53,12 @@ TEST(MatrixTest, AxialVectorOfMatrix) { Kokkos::deep_copy(v_mirror, v); constexpr auto expected_data = std::array{0., 0., 1.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 3U; ++i) { + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_mirror(i), expected(i), 1.e-15); } } -} +} // namespace openturbine::tests diff --git a/tests/unit_tests/math/test_quaternion_operations.cpp b/tests/unit_tests/math/test_quaternion_operations.cpp index 6b72d754..62e7422e 100644 --- a/tests/unit_tests/math/test_quaternion_operations.cpp +++ b/tests/unit_tests/math/test_quaternion_operations.cpp @@ -13,7 +13,9 @@ auto Create1DView(const std::array& input) { return view; } -Kokkos::View TestQuaternionToRotationMatrix(const Kokkos::View::const_type& q) { +Kokkos::View TestQuaternionToRotationMatrix( + const Kokkos::View::const_type& q +) { auto R_from_q = Kokkos::View("R_from_q"); Kokkos::parallel_for( "QuaternionToRotationMatrix", 1, @@ -32,9 +34,9 @@ TEST(QuaternionTest, ConvertQuaternionToRotationMatrix_90DegreeRotationAboutXAxi Kokkos::deep_copy(R_from_q_mirror, R_from_q); constexpr auto expected_data = std::array{1., 0., 0., 0., 0., -1., 0., 1., 0.}; const auto expected = Kokkos::View(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 3U; ++j) { + + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(R_from_q_mirror(i, j), expected(i, j), 1.e-15); } } @@ -50,9 +52,9 @@ TEST(QuaternionTest, ConvertQuaternionToRotationMatrix_90DegreeRotationAboutYAxi Kokkos::deep_copy(R_from_q_mirror, R_from_q); constexpr auto expected_data = std::array{0., 0., 1., 0., 1., 0., -1., 0., 0.}; const auto expected = Kokkos::View(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 3U; ++j) { + + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(R_from_q_mirror(i, j), expected(i, j), 1.e-15); } } @@ -68,15 +70,17 @@ TEST(QuaternionTest, ConvertQuaternionToRotationMatrix_90DegreeRotationAboutZAxi Kokkos::deep_copy(R_from_q_mirror, R_from_q); constexpr auto expected_data = std::array{0., -1., 0., 1., 0., 0., 0., 0., 1.}; const auto expected = Kokkos::View(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 3U; ++j) { + + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(R_from_q_mirror(i, j), expected(i, j), 1.e-15); } } } -Kokkos::View TestRotateVectorByQuaternion(const Kokkos::View::const_type& q, const Kokkos::View::const_type& v) { +Kokkos::View TestRotateVectorByQuaternion( + const Kokkos::View::const_type& q, const Kokkos::View::const_type& v +) { auto v_rot = Kokkos::View("v_rot"); Kokkos::parallel_for( "RotateVectorBoyQuaternion", 1, KOKKOS_LAMBDA(int) { RotateVectorByQuaternion(q, v, v_rot); } @@ -90,13 +94,14 @@ TEST(QuaternionTest, RotateYAxisByIdentity) { const auto v_rot = TestRotateVectorByQuaternion(rotation_identity, y_axis); - const auto v_rot_mirror =Kokkos::create_mirror(v_rot); + const auto v_rot_mirror = Kokkos::create_mirror(v_rot); Kokkos::deep_copy(v_rot_mirror, v_rot); constexpr auto expected_data = std::array{0., 1., 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { + const auto expected = + Kokkos::View::const_type(expected_data.data()); + + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_rot_mirror(i), expected(i), 1.e-15); } } @@ -107,13 +112,14 @@ TEST(QuaternionTest, RotateXAxis90DegreesAboutYAxis) { auto x_axis = Create1DView<3>({1., 0., 0.}); const auto v_rot = TestRotateVectorByQuaternion(rotation_y_axis, x_axis); - const auto v_rot_mirror =Kokkos::create_mirror(v_rot); + const auto v_rot_mirror = Kokkos::create_mirror(v_rot); Kokkos::deep_copy(v_rot_mirror, v_rot); constexpr auto expected_data = std::array{0., 0., -1.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { + const auto expected = + Kokkos::View::const_type(expected_data.data()); + + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_rot_mirror(i), expected(i), 1.e-15); } } @@ -124,13 +130,14 @@ TEST(QuaternionTest, RotateZAxis90DegreesAboutXAxis) { auto z_axis = Create1DView<3>({0., 0., 1.}); const auto v_rot = TestRotateVectorByQuaternion(rotation_x_axis, z_axis); - const auto v_rot_mirror =Kokkos::create_mirror(v_rot); + const auto v_rot_mirror = Kokkos::create_mirror(v_rot); Kokkos::deep_copy(v_rot_mirror, v_rot); constexpr auto expected_data = std::array{0., -1., 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { + const auto expected = + Kokkos::View::const_type(expected_data.data()); + + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_rot_mirror(i), expected(i), 1.e-15); } } @@ -143,13 +150,14 @@ TEST(QuaternionTest, RotateXAxis45DegreesAboutZAxis) { auto x_axis = Create1DView<3>({1., 0., 0.}); const auto v_rot = TestRotateVectorByQuaternion(rotation_z_axis, x_axis); - const auto v_rot_mirror =Kokkos::create_mirror(v_rot); + const auto v_rot_mirror = Kokkos::create_mirror(v_rot); Kokkos::deep_copy(v_rot_mirror, v_rot); const auto expected_data = std::array{inv_sqrt2, inv_sqrt2, 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { + const auto expected = + Kokkos::View::const_type(expected_data.data()); + + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_rot_mirror(i), expected(i), 1.e-15); } } @@ -162,13 +170,14 @@ TEST(QuaternionTest, RotateXAxisNeg45DegreesAboutZAxis) { auto x_axis = Create1DView<3>({1., 0., 0.}); const auto v_rot = TestRotateVectorByQuaternion(rotation_z_axis, x_axis); - const auto v_rot_mirror =Kokkos::create_mirror(v_rot); + const auto v_rot_mirror = Kokkos::create_mirror(v_rot); Kokkos::deep_copy(v_rot_mirror, v_rot); const auto expected_data = std::array{inv_sqrt2, -inv_sqrt2, 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); - - for(auto i = 0U; i < 3U; ++i) { + const auto expected = + Kokkos::View::const_type(expected_data.data()); + + for (auto i = 0U; i < 3U; ++i) { EXPECT_NEAR(v_rot_mirror(i), expected(i), 1.e-15); } } @@ -189,10 +198,11 @@ TEST(QuaternionTest, QuaternionDerivative) { Kokkos::deep_copy(derivative_mirror, derivative); constexpr auto expected_data = std::array{-2., 1., -4., 3., -3., 4., 1., -2., -4., -3., 2., 1.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 4U; ++j) { + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 4U; ++j) { EXPECT_NEAR(derivative_mirror(i, j), expected(i, j), 1.e-15); } } @@ -211,19 +221,22 @@ TEST(QuaternionTest, GetInverse) { const auto q = Create1DView<4>({1. / coeff, 2. / coeff, 3. / coeff, 4. / coeff}); const auto q_inv = TestQuaternionInverse(q); - + const auto q_inv_mirror = Kokkos::create_mirror(q_inv); Kokkos::deep_copy(q_inv_mirror, q_inv); const auto expected_data = std::array{1. / coeff, -2. / coeff, -3. / coeff, -4. / coeff}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4U; ++i) { + for (auto i = 0U; i < 4U; ++i) { EXPECT_NEAR(q_inv_mirror(i), expected(i), 1.e-15); } } -Kokkos::View TestQuaternionCompose(const Kokkos::View::const_type& q1, const Kokkos::View::const_type& q2) { +Kokkos::View TestQuaternionCompose( + const Kokkos::View::const_type& q1, const Kokkos::View::const_type& q2 +) { auto qn = Kokkos::View("qn"); Kokkos::parallel_for( "QuaternionCompose", 1, KOKKOS_LAMBDA(int) { QuaternionCompose(q1, q2, qn); } @@ -240,9 +253,10 @@ TEST(QuaternionTest, MultiplicationOfTwoQuaternions_Set1) { Kokkos::deep_copy(qn_mirror, qn); constexpr auto expected_data = std::array{8., -9., -2., 11.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4; ++i) { + for (auto i = 0U; i < 4; ++i) { EXPECT_NEAR(qn_mirror(i), expected(i), 1.e-15); } } @@ -256,9 +270,10 @@ TEST(QuaternionTest, MultiplicationOfTwoQuaternions_Set2) { Kokkos::deep_copy(qn_mirror, qn); constexpr auto expected_data = std::array{-60., 12., 30., 24.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4; ++i) { + for (auto i = 0U; i < 4; ++i) { EXPECT_NEAR(qn_mirror(i), expected(i), 1.e-15); } } @@ -281,9 +296,10 @@ TEST(QuaternionTest, RotationVectorToQuaternion_Set0) { Kokkos::deep_copy(quaternion_mirror, quaternion); const auto expected_data = std::array{inv_sqrt2, inv_sqrt2, 0., 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4U; ++i) { + for (auto i = 0U; i < 4U; ++i) { EXPECT_NEAR(quaternion_mirror(i), expected(i), 1.e-15); } } @@ -297,9 +313,10 @@ TEST(QuaternionTest, RotationVectorToQuaternion_Set1) { Kokkos::deep_copy(quaternion_mirror, quaternion); const auto expected_data = std::array{inv_sqrt2, 0., inv_sqrt2, 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4U; ++i) { + for (auto i = 0U; i < 4U; ++i) { EXPECT_NEAR(quaternion_mirror(i), expected(i), 1.e-15); } } @@ -313,9 +330,10 @@ TEST(QuaternionTest, RotationVectorToQuaternion_Set2) { Kokkos::deep_copy(quaternion_mirror, quaternion); const auto expected_data = std::array{inv_sqrt2, 0., 0., inv_sqrt2}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 4U; ++i) { + for (auto i = 0U; i < 4U; ++i) { EXPECT_NEAR(quaternion_mirror(i), expected(i), 1.e-15); } } @@ -336,10 +354,10 @@ void test_quaternion_to_rotation_vector_2() { "RotationVectorToQuaternion", 1, KOKKOS_LAMBDA(int) { QuaternionToRotationVector(q, phi2); } ); - + const auto phi2_mirror = Kokkos::create_mirror(phi2); Kokkos::deep_copy(phi2_mirror, phi2); - for(auto j = 0U; j < 3U; ++j) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(phi2_mirror(j), rot_vec[j], 1.e-15); } } diff --git a/tests/unit_tests/math/test_vector_operations.cpp b/tests/unit_tests/math/test_vector_operations.cpp index 42031318..80c3fbd2 100644 --- a/tests/unit_tests/math/test_vector_operations.cpp +++ b/tests/unit_tests/math/test_vector_operations.cpp @@ -8,7 +8,8 @@ namespace openturbine::tests { template Kokkos::View Create1DView(const std::array& input) { auto view = Kokkos::View("view"); - auto view_host = typename Kokkos::View::const_type(input.data()); + auto view_host = + typename Kokkos::View::const_type(input.data()); Kokkos::deep_copy(view, view_host); return view; } @@ -27,10 +28,11 @@ TEST(VectorTest, VecTilde) { Kokkos::deep_copy(m_mirror, m); constexpr auto expected_data = std::array{0., -3., 2., 3., 0., -1., -2., 1., 0.}; - const auto expected = Kokkos::View::const_type(expected_data.data()); + const auto expected = + Kokkos::View::const_type(expected_data.data()); - for(auto i = 0U; i < 3U; ++i) { - for(auto j = 0U; j < 3U; ++j) { + for (auto i = 0U; i < 3U; ++i) { + for (auto j = 0U; j < 3U; ++j) { EXPECT_NEAR(m_mirror(i, j), expected(i, j), 1.e-15); } } diff --git a/tests/unit_tests/utilities/test_turbine_parsing.cpp b/tests/unit_tests/utilities/test_turbine_parsing.cpp index 5ed051c7..120ee634 100644 --- a/tests/unit_tests/utilities/test_turbine_parsing.cpp +++ b/tests/unit_tests/utilities/test_turbine_parsing.cpp @@ -6,7 +6,8 @@ namespace openturbine::tests { TEST(ParserTest, ParseIEA15MWName) { - const std::string input = "name: IEA 15MW Offshore Reference Turbine, with taped chord tip design"; + const std::string input = + "name: IEA 15MW Offshore Reference Turbine, with taped chord tip design"; const YAML::Node config = YAML::Load(input); Turbine turbine; turbine.parse(config); @@ -14,7 +15,10 @@ TEST(ParserTest, ParseIEA15MWName) { } TEST(ParserTest, ParseIEA15MWAssembly) { - const std::string input = "assembly:\n turbine_class: I\n turbulence_class: B\n drivetrain: direct_drive\n rotor_orientation: Upwind\n number_of_blades: 3\n hub_height: 150\n rotor_diameter: 241.94\n rated_power: 15.e+6\n lifetime: 25\n"; + const std::string input = + "assembly:\n turbine_class: I\n turbulence_class: B\n drivetrain: direct_drive\n " + "rotor_orientation: Upwind\n number_of_blades: 3\n hub_height: 150\n rotor_diameter: " + "241.94\n rated_power: 15.e+6\n lifetime: 25\n"; const YAML::Node config = YAML::Load(input); Turbine turbine; turbine.parse(config); @@ -30,7 +34,7 @@ TEST(ParserTest, ParseIEA15MWAssembly) { } TEST(ParserTest, ParseIEA15MWMultipleMaterials) { - const std::string input = "materials:\n [name: first, name: second]"; + const std::string input = "materials:\n [name: first, name: second]"; const YAML::Node config = YAML::Load(input); Turbine turbine; turbine.parse(config);