From 0cf2737ea26333b860b5b1cdd27f6887579cb1d7 Mon Sep 17 00:00:00 2001
From: Olivier Coulaud <olivier.coulaud@inria.fr>
Date: Wed, 19 Feb 2025 14:40:02 +0100
Subject: [PATCH] Header modifications
---
include/scalfmm/tools/tree_io.hpp | 10 +++-------
include/scalfmm/tree/group_tree_view.hpp | 16 +++++++---------
include/scalfmm/tree/io.hpp | 5 +++--
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/include/scalfmm/tools/tree_io.hpp b/include/scalfmm/tools/tree_io.hpp
index 2fd7054b..c8f64de7 100644
--- a/include/scalfmm/tools/tree_io.hpp
+++ b/include/scalfmm/tools/tree_io.hpp
@@ -4,13 +4,11 @@
// --------------------------------
#pragma once
-#include "scalfmm/tree/box.hpp"
-#include "scalfmm/tree/group_tree_view.hpp"
#include "scalfmm/tree/utils.hpp"
#include "scalfmm/utils/io_helpers.hpp"
+#include "scalfmm/tree/tree.hpp"
#ifdef SCALFMM_USE_MPI
-#include "scalfmm/tree/dist_group_tree.hpp"
#include <cpp_tools/parallel_manager/parallel_manager.hpp>
#endif
@@ -145,7 +143,6 @@ namespace scalfmm::tools::io
std::cout << "box: " << box << std::endl;
return TreeType(in[0], in[1], in[2], in[3], box);
}
-
/**
* @brief save a tree in binary format in a file (only the cells).
*
@@ -159,8 +156,8 @@ namespace scalfmm::tools::io
*/
template<typename CellType, typename LeafType, typename BoxType>
inline auto save_bin(std::string const& filename,
- component::group_tree_view<CellType, LeafType, BoxType> const& tree, std::string const& header,
- const int options = 0) -> void
+ scalfmm::component::group_tree_view<CellType, LeafType, BoxType> const& tree,
+ std::string const& header, const int options = 0) -> void
{
std::cout << "save tree (binary mode) in filename " << filename << std::endl;
std::fstream out(filename, std::ifstream::out | std::ios::binary);
@@ -345,7 +342,6 @@ namespace scalfmm::tools::io
std::exit(EXIT_FAILURE);
}
}
-
/**
* @brief Read a tree (only the cells) and set a tree from a file
*
diff --git a/include/scalfmm/tree/group_tree_view.hpp b/include/scalfmm/tree/group_tree_view.hpp
index b5d0c1a5..2ebb850c 100644
--- a/include/scalfmm/tree/group_tree_view.hpp
+++ b/include/scalfmm/tree/group_tree_view.hpp
@@ -5,8 +5,7 @@
#ifndef SCALFMM_TREE_GROUP_TREE_VIEW_HPP
#define SCALFMM_TREE_GROUP_TREE_VIEW_HPP
-#include "scalfmm/lists/policies.hpp"
-#include "scalfmm/lists/sequential.hpp"
+#include "scalfmm/lists/lists.hpp"
#include "scalfmm/meta/utils.hpp"
#include "scalfmm/operators/tags.hpp"
#include "scalfmm/tools/bench.hpp"
@@ -14,9 +13,6 @@
#include "scalfmm/tree/for_each.hpp"
#include "scalfmm/tree/group.hpp"
#include "scalfmm/tree/group_of_views.hpp"
-#ifdef _OpenMP
-#include "scalfmm/lists/omp.hpp"
-#endif
#include "scalfmm/tree/io.hpp"
#include "scalfmm/tree/utils.hpp"
#include "scalfmm/utils/io_helpers.hpp"
@@ -934,8 +930,8 @@ namespace scalfmm::component
*/
template<typename SourceTreeType>
inline auto build_interaction_lists(SourceTreeType const& source_tree, const int& neighbour_separation,
- const bool mutual,
- const int& policy = scalfmm::list::policies::sequential) -> void
+ const bool mutual, const int& policy = scalfmm::list::policies::sequential)
+ -> void
{
switch(policy)
{
@@ -1078,7 +1074,8 @@ namespace scalfmm::component
auto group_of_cell_begin = std::cbegin(*(cell_level_it));
auto group_of_cell_end = std::cend(*(cell_level_it));
std::for_each(group_of_cell_begin, group_of_cell_end,
- [](auto const& ptr_group) {
+ [](auto const& ptr_group)
+ {
component::for_each(std::begin(*ptr_group), std::end(*ptr_group),
[](auto& cell) { cell.reset_multipoles(); });
});
@@ -1100,7 +1097,8 @@ namespace scalfmm::component
auto group_of_cell_begin = std::cbegin(*(cell_level_it));
auto group_of_cell_end = std::cend(*(cell_level_it));
std::for_each(group_of_cell_begin, group_of_cell_end,
- [](auto const& ptr_group) {
+ [](auto const& ptr_group)
+ {
component::for_each(std::begin(*ptr_group), std::end(*ptr_group),
[](auto& cell) { cell.reset_locals(); });
});
diff --git a/include/scalfmm/tree/io.hpp b/include/scalfmm/tree/io.hpp
index 2a555856..6d16e0ee 100644
--- a/include/scalfmm/tree/io.hpp
+++ b/include/scalfmm/tree/io.hpp
@@ -4,6 +4,7 @@
// --------------------------------
#pragma once
+#include "scalfmm/tree/utils.hpp"
#include "scalfmm/utils/io_helpers.hpp"
#include <fstream>
@@ -440,8 +441,8 @@ namespace scalfmm::io
* @param target_tree
*/
template<typename SourceTreeType, typename TargetTreeType>
- inline auto trace_group_dependencies(std::ostream& os, SourceTreeType& source_tree,
- TargetTreeType& target_tree) -> void
+ inline auto trace_group_dependencies(std::ostream& os, SourceTreeType& source_tree, TargetTreeType& target_tree)
+ -> void
{
std::cout << "Trace of the group dependencies\n";
bool same_tree{false};
--
GitLab