Skip to content

Commit

Permalink
Fixes namespaces in tests to no longer include restruct_poc
Browse files Browse the repository at this point in the history
This reflects a change we made a long time ago in the source files
  • Loading branch information
ddement committed Aug 1, 2024
1 parent 62a5677 commit 8ba3bce
Show file tree
Hide file tree
Showing 39 changed files with 78 additions and 78 deletions.
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/beams/test_interpolate_QP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <Kokkos_Core.hpp>
#include <gtest/gtest.h>

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

inline auto create_shape_interp_OneNodeOneQP() {
constexpr auto num_qp = 1;
Expand Down Expand Up @@ -121,4 +121,4 @@ inline auto create_shape_deriv_TwoNodeTwoQP() {
return shape_deriv;
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "src/restruct_poc/beams/interpolate_QP_state.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

inline auto create_node_u_OneNode() {
constexpr auto num_nodes = 1;
Expand Down Expand Up @@ -322,4 +322,4 @@ TEST(InterpolateQPStateTests, rprime_TwoNodeTwoQP) {
EXPECT_NEAR(qp_rprime_mirror(1, 3), 91., tolerance);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "src/restruct_poc/beams/interpolate_QP_vector.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

inline auto create_node_u_dot_OneNode() {
constexpr auto num_nodes = 1;
Expand Down Expand Up @@ -108,4 +108,4 @@ TEST(InterpolateQPVectorTests, TwoNodeTwoQP) {
EXPECT_NEAR(qp_u_dot_mirror(1, 2), 54., tolerance);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/iea15_rotor_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "src/restruct_poc/beams/beam_section.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

// Node location from [-1, 1]
static constexpr auto node_xi = std::array{
Expand Down Expand Up @@ -792,4 +792,4 @@ static const std::vector<BeamSection> material_sections = {
},
};

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "src/restruct_poc/solver/compute_number_of_non_zeros.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(ComputeNumberOfNonZeros, SingleElement) {
auto elem_indices_host =
Expand Down Expand Up @@ -35,4 +35,4 @@ TEST(ComputeNumberOfNonZeros, TwoElements) {
num_dof_elem1 * num_dof_elem1 + num_dof_elem2 * num_dof_elem2;
EXPECT_EQ(num_non_zero, expected_num_non_zero);
}
} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "src/restruct_poc/solver/copy_into_sparse_matrix.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

auto createDenseMatrix_1x1() {
auto dense = Kokkos::View<double[1][1]>("dense");
Expand Down Expand Up @@ -187,4 +187,4 @@ TEST(CopyIntoSparseMatrix, Block) {
ASSERT_EQ(values_mirror(12), 13.);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "src/restruct_poc/solver/populate_sparse_indices.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(PopulateSparseIndices, SingleElement) {
constexpr auto num_nodes = 5;
Expand Down Expand Up @@ -76,4 +76,4 @@ TEST(PopulateSparseIndices, TwoElements) {
}
}
}
} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "src/restruct_poc/solver/populate_sparse_row_ptrs.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(PopulateSparseRowPtrs, SingleElement) {
auto elem_indices_host =
Expand Down Expand Up @@ -52,4 +52,4 @@ TEST(PopulateSparseRowPtrs, TwoElements) {
}
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/system/test_calculate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <Kokkos_Core.hpp>
#include <gtest/gtest.h>

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

inline void CompareWithExpected(
const Kokkos::View<const double**>::host_mirror_type& result,
Expand All @@ -29,4 +29,4 @@ inline void CompareWithExpected(
}
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/system/test_calculate_Ouu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_Ouu.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateOuuTests, OneNode) {
const auto Cuu = Kokkos::View<double[1][6][6]>("Cuu");
Expand Down Expand Up @@ -58,4 +58,4 @@ TEST(CalculateOuuTests, OneNode) {
CompareWithExpected(Ouu_mirror, Ouu_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/system/test_calculate_Puu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_Puu.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculatePuuTests, OneNode) {
const auto Cuu = Kokkos::View<double[1][6][6]>("Cuu");
Expand Down Expand Up @@ -58,4 +58,4 @@ TEST(CalculatePuuTests, OneNode) {
CompareWithExpected(Puu_mirror, Puu_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/system/test_calculate_Quu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_Quu.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateQuuTests, OneNode) {
const auto Cuu = Kokkos::View<double[1][6][6]>("Cuu");
Expand Down Expand Up @@ -58,4 +58,4 @@ TEST(CalculateQuuTests, OneNode) {
CompareWithExpected(Quu_mirror, Quu_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
4 changes: 2 additions & 2 deletions tests/unit_tests/restruct_poc/system/test_calculate_RR0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_RR0.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateRR0Tests, OneNode) {
const auto r0 = Kokkos::View<double[1][4]>("r0");
Expand Down Expand Up @@ -85,4 +85,4 @@ TEST(CalculateRR0Tests, TwoNodes) {
}
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_force_FC.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateForceFCTests, OneNode) {
const auto Cuu = Kokkos::View<double[1][6][6]>("Cuu");
Expand Down Expand Up @@ -58,4 +58,4 @@ TEST(CalculateForceFCTests, OneNode) {
CompareWithExpected(N_tilde_mirror, N_tilde_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_force_FD.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateForceFDTests, OneNode) {
const auto x0pupSS = Kokkos::View<double[1][3][3]>("x0pupSS");
Expand Down Expand Up @@ -36,4 +36,4 @@ TEST(CalculateForceFDTests, OneNode) {
CompareWithExpected(FD_mirror, FD_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_gravity_force.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateGravityForceTests, OneNode) {
const auto Muu = Kokkos::View<double[1][6][6]>("Muu");
Expand Down Expand Up @@ -47,4 +47,4 @@ TEST(CalculateGravityForceTests, OneNode) {
CompareWithExpected(FG_mirror, FG_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_gyroscopic_matrix.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateGyroscopicMatrixTests, OneNode) {
const auto Muu = Kokkos::View<double[1][6][6]>("Muu");
Expand Down Expand Up @@ -66,4 +66,4 @@ TEST(CalculateGyroscopicMatrixTests, OneNode) {
CompareWithExpected(Guu_mirror, Guu_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_inertia_stiffness_matrix.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateInertiaStiffnessMatrixTests, OneNode) {
const auto Muu = Kokkos::View<double[1][6][6]>("Muu");
Expand Down Expand Up @@ -98,4 +98,4 @@ TEST(CalculateInertiaStiffnessMatrixTests, OneNode) {
CompareWithExpected(Kuu_mirror, Kuu_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_inertial_forces.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateInertialForcesTests, OneNode) {
const auto Muu = Kokkos::View<double[1][6][6]>("Muu");
Expand Down Expand Up @@ -97,4 +97,4 @@ TEST(CalculateInertialForcesTests, OneNode) {
CompareWithExpected(FI_mirror, FI_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_mass_matrix_components.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateMassMatrixComponentsTests, OneQuadPoint) {
const auto Muu = Kokkos::View<double[1][6][6]>("Muu");
Expand Down Expand Up @@ -51,4 +51,4 @@ TEST(CalculateMassMatrixComponentsTests, OneQuadPoint) {
CompareWithExpected(eta_tilde_mirror, eta_tilde_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_node_forces.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateNodeForcesTests, FE_OneNodeOneQP) {
constexpr auto first_node = 0;
Expand Down Expand Up @@ -272,4 +272,4 @@ TEST(CalculateNodeForcesTests, FI_FG_TwoNodesTwoQP) {
CompareWithExpected(FIG_mirror, FIG_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_strain.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateStrainTests, OneNode) {
const auto x0_prime = Kokkos::View<double[1][3]>("x0_prime");
Expand Down Expand Up @@ -55,4 +55,4 @@ TEST(CalculateStrainTests, OneNode) {
CompareWithExpected(strain_mirror, strain_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "src/restruct_poc/system/calculate_temporary_variables.hpp"
#include "src/restruct_poc/types.hpp"

namespace openturbine::restruct_poc::tests {
namespace openturbine::tests {

TEST(CalculateTemporaryVariablesTests, OneNode) {
const auto x0_prime = Kokkos::View<double[1][3]>("x0_prime");
Expand Down Expand Up @@ -40,4 +40,4 @@ TEST(CalculateTemporaryVariablesTests, OneNode) {
CompareWithExpected(x0pupSS_mirror, x0pupSS_exact);
}

} // namespace openturbine::restruct_poc::tests
} // namespace openturbine::tests
Loading

0 comments on commit 8ba3bce

Please sign in to comment.