Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Core] Unify SearchUtilities #11710

Merged
merged 13 commits into from
Nov 8, 2023
Merged

[Core] Unify SearchUtilities #11710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
de1f6be
[Core] Unify SearchUtilities
loumalouomega Oct 23, 2023
d169428
Serial fine tune
loumalouomega Oct 23, 2023
f142fe4
Merge branch 'master' into Core/unify-search-utilities
loumalouomega Oct 24, 2023
82955c8
Improve checks
loumalouomega Oct 24, 2023
ae5b5b1
Fix CentOS compilation
loumalouomega Oct 25, 2023
a44f507
Changes
loumalouomega Oct 25, 2023
6d77d8c
Merge branch 'master' into Core/unify-search-utilities
loumalouomega Oct 25, 2023
8c11fd0
Merge branch 'master' into Core/unify-search-utilities
loumalouomega Oct 27, 2023
d79dcf5
Moving some methods to search utilities
loumalouomega Oct 26, 2023
1d9af51
More refactor
loumalouomega Oct 26, 2023
13a208c
Minor refactor
loumalouomega Oct 27, 2023
1e7a788
Moving to header fir templating
loumalouomega Oct 31, 2023
c9af8d7
Merge branch 'master' into Core/unify-search-utilities
loumalouomega Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions ...s/utilities/test_mpi_search_utilities.cpp → ...tests/utilities/test_search_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,12 @@
// Project includes
#include "testing/testing.h"
#include "geometries/point.h"
#include "mpi/utilities/mpi_search_utilities.h"
#include "utilities/search_utilities.h"

namespace Kratos::Testing
{

KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationAllPointsAreTheSame, KratosMPICoreFastSuite)
{
// The data communicator
const DataCommunicator& r_data_comm = Testing::GetDefaultDataCommunicator();

// Define test data
std::vector<Point> points = {Point(0.0, 0.0, 0.0), Point(1.0, 1.0, 1.0), Point(2.0, 2.0, 2.0)};
std::vector<double> expected_coordinates = {0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 2.0, 2.0, 2.0};

// Call the function
std::vector<double> all_points_coordinates;
MPISearchUtilities::MPISynchronousPointSynchronization(points.begin(), points.end(), all_points_coordinates, r_data_comm);

// Check the results
KRATOS_EXPECT_EQ(all_points_coordinates.size(), 9);
KRATOS_EXPECT_EQ(all_points_coordinates, expected_coordinates);
}

KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationAllPointsAreDifferent, KratosMPICoreFastSuite)
KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronization, KratosMPICoreFastSuite)
{
// The data communicator
const DataCommunicator& r_data_comm = Testing::GetDefaultDataCommunicator();
Expand All @@ -57,21 +39,25 @@ KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationAllPoint

// Call the function
std::vector<double> all_points_coordinates;
MPISearchUtilities::MPISynchronousPointSynchronization(points.begin(), points.end(), all_points_coordinates, r_data_comm);
std::vector<std::size_t> all_points_ids;
SearchUtilities::SynchronousPointSynchronization(points.begin(), points.end(), all_points_coordinates, all_points_ids, r_data_comm);

// Check the results
KRATOS_EXPECT_EQ(static_cast<int>(all_points_coordinates.size()), 2 * 3 * world_size);
KRATOS_EXPECT_EQ(static_cast<int>(all_points_ids.size()), 2 * world_size);
for (int i_rank = 0; i_rank < world_size; ++i_rank) {
value = static_cast<double>(i_rank);
value2 = 2 * value;
KRATOS_EXPECT_EQ(all_points_ids[i_rank * 2 ], static_cast<std::size_t>(i_rank * 2));
KRATOS_EXPECT_EQ(all_points_ids[i_rank * 2 + 1], static_cast<std::size_t>(i_rank * 2 + 1));
for (int j = 0; j < 3; ++j) {
KRATOS_EXPECT_DOUBLE_EQ(all_points_coordinates[i_rank * 6 + j ], value );
KRATOS_EXPECT_DOUBLE_EQ(all_points_coordinates[i_rank * 6 + j + 3], value2);
}
}
}

KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationAllPointsAreDifferentWithRadius, KratosMPICoreFastSuite)
KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationWithRadius, KratosMPICoreFastSuite)
{
// The data communicator
const DataCommunicator& r_data_comm = Testing::GetDefaultDataCommunicator();
Expand All @@ -88,15 +74,19 @@ KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(MPISynchronousPointSynchronizationAllPoint

// Call the function
std::vector<double> all_points_coordinates;
auto radius = MPISearchUtilities::MPISynchronousPointSynchronizationWithRadius(points.begin(), points.end(), all_points_coordinates, local_radius, r_data_comm);
std::vector<std::size_t> all_points_ids;
auto radius = SearchUtilities::SynchronousPointSynchronizationWithRadius(points.begin(), points.end(), all_points_coordinates, all_points_ids, local_radius, r_data_comm);

// Check the results
KRATOS_EXPECT_EQ(static_cast<int>(all_points_coordinates.size()), 2 * 3 * world_size);
KRATOS_EXPECT_EQ(static_cast<int>(all_points_ids.size()), 2 * world_size);
for (int i_rank = 0; i_rank < world_size; ++i_rank) {
value = static_cast<double>(i_rank);
value2 = 2 * value;
KRATOS_EXPECT_DOUBLE_EQ(radius[i_rank * 2 ], value );
KRATOS_EXPECT_DOUBLE_EQ(radius[i_rank * 2 + 1], value2);
KRATOS_EXPECT_EQ(all_points_ids[i_rank * 2 ], static_cast<std::size_t>(i_rank * 2));
KRATOS_EXPECT_EQ(all_points_ids[i_rank * 2 + 1], static_cast<std::size_t>(i_rank * 2 + 1));
for (int j = 0; j < 3; ++j) {
KRATOS_EXPECT_DOUBLE_EQ(all_points_coordinates[i_rank * 6 + j ], value );
KRATOS_EXPECT_DOUBLE_EQ(all_points_coordinates[i_rank * 6 + j + 3], value2);
Expand Down
Loading