diff --git a/Src/Adaptive/FNode.hpp b/Src/Adaptive/FNode.hpp index 41d676e2a9a500827b6e8c23b33841d21e55cec6..900319256ccddf35544fca11dee4d07704e0b81e 100644 --- a/Src/Adaptive/FNode.hpp +++ b/Src/Adaptive/FNode.hpp @@ -215,33 +215,12 @@ public: * \brief Node structural data * Keeps data about the node that may be read by kernels or algorithms. */ - using symbolic_data_t = typename extract_symbolic_data_t_or_fallback_to_default<FSymbolicData,data_t>::type; static_assert(models_symbolic_data<symbolic_data_t>::value, "The symbolic_data_t type does not model the required symbolic data interface."); - // struct symbolic_data_t { - // /// Node depth in its tree - // std::size_t depth; - // /// Node index in parent child array - // std::size_t m_idx; - - // std::size_t getLevel() const { - // return this->depth; - // } - // std::size_t getMortonIndex() const { - // return this->m_idx; - // } - // FTreeCoordinate getCoordinate() const noexcept { - // return FTreeCoordinate(this->m_idx); - // } - // friend std::ostream& operator<<(std::ostream& os, const symbolic_data_t& d) { - // return (os << '{' << "\"depth\":" <<d.depth << ',' << "\"index\":" << d.m_idx << '}'); - // } - // }; - private: friend struct scalfmm::tests::test_Node; @@ -590,16 +569,6 @@ public: template<typename... Args> void insert(const position_t& position, Args&&... args) { this->insert(particle_t(position, std::forward<Args>(args)...)); - - // if(! is_leaf()) { - // std::size_t child_index = box_t::space_filling_curve_t::index(position, getBox().center()); - // getChild(child_index)->insert(position, std::forward<Args>(args)...); - // } else { - // getParticleContainer()->push(particle_t(position, std::forward<Args>(args)...)); - // if(getParticleContainer()->size() > getTree().leaf_max_particle_count()) { - // split(); - // } - // } } @@ -1029,7 +998,7 @@ private: // Node data and recurrence auto index_width = std::setw(static_cast<int>( - std::log10(1 << (Dim * (this->getDepth()+1))))); + std::log10(1 << (Dim * (this->getDepth()+1))))); if(! this->is_leaf()) { // Internal node os << "node " << index_width << this->getIndex() << ":\n"; @@ -1041,7 +1010,7 @@ private: const auto& p_container = *(this->getParticleContainer()); auto count_width = std::setw(static_cast<int>( - std::log10(this->getTree().leaf_max_particle_count()))); + std::log10(this->getTree().leaf_max_particle_count()))); os << count_width << p_container.size() << " particle"; os << (p_container.size() > 1 ? "s" : "");