diff --git a/checks/check_2d.cpp b/checks/check_2d.cpp index 4d277744137a095bde8997f85841bf93559fc8ff..97030f1a22269ae363747e987329dfc824f9c2c9 100644 --- a/checks/check_2d.cpp +++ b/checks/check_2d.cpp @@ -263,8 +263,6 @@ auto run(const int& tree_height, const int& group_size, const std::size_t order, << cpp_tools::colors::reset; FMM_OPERATOR_TYPE fmm_operator(near_field, far_field); - group_tree_type tree(tree_height, order, box, group_size, group_size, container, sorted); - // // Build interaction lists int const& separation_criterion = fmm_operator.near_field().separation_criterion(); diff --git a/include/scalfmm/algorithms/omp/transfer.hpp b/include/scalfmm/algorithms/omp/transfer.hpp index 9d164cbef1414eb3d50bf5d3e755dbe0a6dff96a..bb4b5d7698999671877438ca2d87cd2d60e041b3 100644 --- a/include/scalfmm/algorithms/omp/transfer.hpp +++ b/include/scalfmm/algorithms/omp/transfer.hpp @@ -71,7 +71,6 @@ namespace scalfmm::algorithms::omp::pass auto ptr_local_raw = &(group_ptr->ccomponent(0).clocals(0)); static constexpr auto prio{priorities::m2l}; - auto prio{priorities::m2l}; #ifdef SCALFMM_USE_MPI // Increase th priority on the last group (For L2L in MPI) if(cell_target_level_it == (end_cell_target_level_it - 1)) diff --git a/include/scalfmm/tools/fma_loader.hpp b/include/scalfmm/tools/fma_loader.hpp index d7a8fe50cc0158ee35bf82c6bef866e60794325c..56c48917237969a4e515c851e79db0bd00b5e1e1 100644 --- a/include/scalfmm/tools/fma_loader.hpp +++ b/include/scalfmm/tools/fma_loader.hpp @@ -76,60 +76,16 @@ namespace scalfmm::io class FFmaGenericLoader { protected: - /** - * @brief the stream used to read the file. - * - */ - std::fstream* m_file; - - /** - * @brief if true the file to read is in binary mode. - * - */ - bool m_binaryFile; - - /** - * @brief the center of box (read from file). - * - */ - container::point<FReal, Dimension> m_centerOfBox; - - /** - * @brief the center of box (read from file). - * - */ - std::vector<FReal> m_center{}; - - /** - * @brief the box width (read from file). - * - */ - FReal m_boxWidth; - - /** - * @brief the number of particles (read from file) - * - */ - std::size_t m_nbParticles; - - /** - * @brief Size of the data to read, number of data on 1 line, - * dimension of space and number of input values - * - */ - std::array<unsigned int, 4> m_typeData; - - /** - * @brief file name containung the data. - * - */ - std::string m_filename; - - /** - * @brief Verbose mode. - * - */ - bool m_verbose; + std::fstream* m_file; ///< the stream used to read the file + bool m_binaryFile; ///< if true the file to read is in binary mode + container::point<FReal, Dimension> m_centerOfBox; ///< The center of box (read from file) + std::vector<FReal> m_center{}; ///< The center of box (read from file) + FReal m_boxWidth; ///< the box width (read from file) + std::size_t m_nbParticles; ///< the number of particles (read from file) + std::array<unsigned int, 4> m_typeData; ///< Size of the data to read, number of data on 1 line, dimension + ///< of space and number of input values + std::string m_filename; ///< file name containung the data + bool m_verbose; ///< Verbose mode private: /** @@ -255,56 +211,26 @@ namespace scalfmm::io bool isOpen() const { return this->m_file->is_open() && !this->m_file->eof(); } /** - * To get the number of particles from this loader + * @brief To get the number of particles from this loader */ std::size_t getNumberOfParticles() const { return this->getParticleCount(); } /** - * To get the number of particles from this loader + * @brief To get the number of particles from this loader */ std::size_t getMyNumberOfParticles() const { return this->getParticleCount(); } - /** - * The center of the box from the simulation file opened by the loader - * @return box center - */ - auto /*container::point<FReal, Dimension> */ getCenterOfBox() const -> container::point<FReal, Dimension> - { - return this->getBoxCenter(); - } /** - * The center of the box from the simulation file opened by the loader - * @return box center - */ - /// - /// \brief getPointerCenterOfBox return a pointer on the element of the Box center - /// - auto getPointerCenterOfBox() const -> FReal* { return this->m_center.data(); } - - /** - * \brief Get the distribution particle count - * \return The distribution particle count - */ - std::size_t getParticleCount() const { return this->m_nbParticles; } - - /** - * \brief Get the center of the box contining the particles - * - * @return true - * @return false - */ - inline auto isOpen() const -> bool { return this->m_file->is_open() && !this->m_file->eof(); } /** - * @brief To get the number of particles from this loader + * @brief To get the center of the box from the simulation file opened by the loader. * - * @return std::size_t + * @return box center (type Point) */ - inline auto getNumberOfParticles() const -> std::size_t { return this->getParticleCount(); } - + inline auto getCenterOfBox() const -> container::point<FReal, Dimension> { return this->getBoxCenter(); } /** - * @brief To get the center of the box from the simulation file opened by the loader. + * @brief Get the center of the box contining the particles * + * @return A point (ontainer::point<FReal>) representing the box center */ - inline auto getCenterOfBox() const -> container::point<FReal, Dimension> { return this->getBoxCenter(); } - + inline auto getBoxCenter() const { return this->m_centerOfBox; } /** * @brief Returns a pointer on the element of the Box center. * @@ -319,13 +245,6 @@ namespace scalfmm::io */ inline auto getParticleCount() const -> std::size_t { return this->m_nbParticles; } - /** - * @brief Get the center of the box contining the particles - * - * @return A point (ontainer::point<FReal>) representing the box center - */ - inline auto getBoxCenter() const { return this->m_centerOfBox; } - /** * @brief box width from the simulation file opened by the loader * @@ -919,7 +838,7 @@ namespace scalfmm::io { auto& particles_elem = particles[pos++]; const auto& p = - typename TREE_T::leaf_type::particle_type(it_p); + typename TreeType::leaf_type::particle_type(it_p); // int i = 0; const auto points = p.position(); diff --git a/include/scalfmm/tree/group_tree_view.hpp b/include/scalfmm/tree/group_tree_view.hpp index 66309f344f983e4c6cf813a30c3924ebbb857f35..b5d0c1a5b604571632c7ea48a9431d11d8bd054e 100644 --- a/include/scalfmm/tree/group_tree_view.hpp +++ b/include/scalfmm/tree/group_tree_view.hpp @@ -970,7 +970,7 @@ namespace scalfmm::component /// @return inline auto reset_particles() { - for(auto pg: m_group_of_leaf) + for(auto pg: m_group_of_leaves) { // loop on leaves for(auto& leaf: pg->block()) @@ -979,17 +979,6 @@ namespace scalfmm::component } } } - /// @brief reset all - /// - /// @return - inline auto reset_outputs() - { - // loop on group of leaves - for(auto pg: m_group_of_leaves) - { - pg->storage().reset_particles(); - } - } /** * @brief Resets all the positions of the particles.