From 80deace4d4b2c93945feeec42a8269f3ba2443d2 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Tue, 4 Aug 2026 19:52:08 +0200 Subject: Asking myself how I had a stable implementation before --- modules/core/c++/fplbm.hpp | 126 +++++++++++++++++++++++++++++++++++++++------ modules/core/c++/psm.hpp | 61 +++++++++++++++++++++- 2 files changed, 170 insertions(+), 17 deletions(-) (limited to 'modules/core/c++') diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index cfb0062..4acdd36 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -10,6 +10,7 @@ namespace cmpt { struct FpLbmReset{}; struct FpLbm {}; struct FpLbmOneParticle {}; +struct FpLbmOneParticleImplicit {}; struct FpLbmOneParticleNoVelocity{}; } namespace method { @@ -36,18 +37,20 @@ public: for(uint64_t i{0u}; i < Descriptor::D; ++i){ force.at({{i}}) = 0.0; } + auto info = field.template get<"info">().at(index).get(); + if(info == 2u){ + bool is_even = ((time_step.get() % 2) == 0); - bool is_even = ((time_step.get() % 2) == 0); - - auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); - auto& dfs = dfs_old_f.at(index); + auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); + auto& dfs = dfs_old_f.at(index); - auto& rho_f = macros.template get<"density">(); - auto& rho = rho_f.at(index); - auto& vel_f = macros.template get<"velocity">(); - auto& vel = vel_f.at(index); + auto& rho_f = macros.template get<"density">(); + auto& rho = rho_f.at(index); + auto& vel_f = macros.template get<"velocity">(); + auto& vel = vel_f.at(index); - compute_rho_u(dfs,rho,vel); + compute_rho_u(dfs,rho,vel); + } } }; @@ -83,7 +86,7 @@ public: auto& vel_f = macros.template get<"velocity">(); saw::data>& vel = vel_f.at(index); - compute_rho_u(dfs,rho,vel); + // compute_rho_u(dfs,rho,vel); auto eq = equilibrium(rho,vel); using dfi = df_info; @@ -158,10 +161,94 @@ public: auto& pirb_pos = pirb.template get<"position">(); auto& pirb_pos_old = pirb.template get<"position_old">(); + + auto& p_coll = pg.template get<"collision">().at({}); + auto& p_rad = p_coll.template get<"radius">(); + + auto eo_aabb = particle_aabb::calculate(pg,{{0u}},vel_f.meta()); + if(eo_aabb.is_error()){ + return; + } + auto& aabb = eo_aabb.get_value(); + + saw::data> two; + two.at({}).set(2.0f); + + saw::data> one; + one.at({}) = 1.0; + + saw::data> eps; + eps.at({}) = 1.5f; + saw::data> sss; - sss.at({}) = sub_steps.template cast_to(); + sss.at({}) = one.at({}) / sub_steps.template cast_to(); auto vel_s = (pirb_pos-pirb_pos_old) / sss; + saw::data> force_p{}; + + iterator::apply([&](const auto& index_f) -> void { + auto& force = force_f.at(index_f); + auto& vel = vel_f.at(index_f); + auto& por = por_f.at(index_f); + auto& rho = rho_f.at(index_f); + + saw::data> rel_dist = saw::math::vectorize_data(index_f).template cast_to() - pirb_pos; + + por = particle_porosity>::calculate(rel_dist,p_rad,eps); + auto flip_por = one - por; + + // vel_s is technically time the density of the particle? + + force = ( vel_s * rho - vel * rho ) * two * flip_por; + + force_p = force_p - force; + }, aabb.template get<"a">(), aabb.template get<"b">()); + + auto& pirb_acc = pirb.template get<"acceleration">(); + pirb_acc = force_p / pg.template get<"total_mass">().at({}); + + for(saw::data i{0u}; i < sub_steps; ++i){ + //verlet_step_lambda(pi,sss); + } + } +}; + +template +class component final { +public: + using Component = cmpt::FpLbmOneParticle; +private: +public: + component() = default; + + template + void apply(const saw::data& field, const saw::data& macros, const saw::data& pg, saw::data> index, saw::data time_step, saw::data sub_steps) const { + // void apply(saw::data& field, saw::data> index, saw::data time_step){ + bool is_even = ((time_step.get() % 2) == 0); + + //auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); + // auto& dfs = dfs_old_f.at(index); + + auto& rho_f = macros.template get<"density">(); + auto& vel_f = macros.template get<"velocity">(); + auto& por_f = macros.template get<"porosity">(); + auto& force_f = macros.template get<"force">(); + + /** + * The other methods all work with a flipped porosity. + * For compat reasons this is also flipped + */ + // TODO - Change to tuple later + auto parts = pg.template get<"particles">(); + + auto parts_size = parts.meta().at({0u}); + auto& pi = parts.at(index); + + auto& pirb = pi.template get<"rigid_body">(); + auto& pirb_pos = pirb.template get<"position">(); + auto& pirb_pos_old = pirb.template get<"position_old">(); + + auto& p_coll = pg.template get<"collision">().at({}); auto& p_rad = p_coll.template get<"radius">(); @@ -172,15 +259,19 @@ public: auto& aabb = eo_aabb.get_value(); saw::data> two; - two.at({}).set(2); + two.at({}).set(2.0f); saw::data> one; one.at({}) = 1.0; saw::data> eps; eps.at({}) = 1.5f; + + saw::data> sss; + sss.at({}) = one.at({}) / sub_steps.template cast_to(); + auto vel_s = (pirb_pos-pirb_pos_old) / sss; - saw::data> force_p; + saw::data> force_p{}; iterator::apply([&](const auto& index_f) -> void { auto& force = force_f.at(index_f); @@ -193,13 +284,16 @@ public: por = particle_porosity>::calculate(rel_dist,p_rad,eps); auto flip_por = one - por; - force = ( vel_s * rho - vel * rho ) * two * flip_por; + // vel_s is technically time the density of the particle? + + force = ( vel_s * rho - vel * rho ) * flip_por / (one + flip_por / two); + // force = ( vel_s * rho - vel * rho ) * two * flip_por; - force_p = force_p + force; + force_p = force_p - force; }, aabb.template get<"a">(), aabb.template get<"b">()); auto& pirb_acc = pirb.template get<"acceleration">(); - pirb_acc = - force_p / pg.template get<"total_mass">().at({}); + pirb_acc = force_p / pg.template get<"total_mass">().at({}); for(saw::data i{0u}; i < sub_steps; ++i){ verlet_step_lambda(pi,sss); diff --git a/modules/core/c++/psm.hpp b/modules/core/c++/psm.hpp index 02db1e1..c53dbf9 100644 --- a/modules/core/c++/psm.hpp +++ b/modules/core/c++/psm.hpp @@ -86,8 +86,18 @@ public: template class component final { private: + saw::data relaxation_; + saw::data frequency_; public: - component() = default; + component( + typename saw::native_data_type::type relaxation__ + ): + relaxation_{relaxation__} + { + saw::data one; + one = 1.0; + frequency_ = one / relaxation_; + } template void apply(const saw::data& field, const saw::data& macros, const saw::data& particles, saw::data> index, saw::data time_step) const { @@ -101,6 +111,55 @@ public: auto& rho_f = macros.template get<"density">(); auto& vel_f = macros.template get<"velocity">(); + saw::data>& rho = rho_f.at(index); + saw::data>& vel = vel_f.at(index); + + compute_rho_u(dfs_old_f.at(index),rho,vel); + + auto eq = equilibrium(rho,vel); + + saw::data one{1.0}; + auto& porous = porous_f.at(index); + auto flip_porous = one - porous.at({}); + + auto& dfs = dfs_old_f.at(index); + + auto dfs_cpy = dfs; + + for(uint64_t i = 0u; i < Descriptor::Q; ++i){ + uint64_t i_opp = dfi::opposite_index[i]; + dfs.at({i}) = dfs_cpy.at({i}) + frequency_ * (eq.at(i) - dfs_cpy.at({i})) * porous.at({}) + (dfs_cpy.at({i_opp}) - dfs_cpy.at({i}) ) * flip_porous; + } + + auto& force_f = macros.template get<"force">(); + auto& force = force_f.at(index); + for(uint64_t k{0u}; k < Descriptor::D; ++k){ + force.at({{k}}).set(0); + } + + ///////// + saw::data> momentum; + for(uint64_t i = 0u; i < Descriptor::Q; ++i){ + + saw::data> e_i; + saw::data> n_ind_i; + for(uint64_t k{0u}; k < Descriptor::D; ++k){ + e_i.at({{k}}) = dfi::directions[i][k]; + n_ind_i.at({k}) = (dfi::directions[i])[k]; + } + + uint64_t i_opp = dfi::opposite_index[i]; + + saw::data dfs_added = dfs.at({i}) - dfs_old_f.at(n_ind_i).at({i_opp}); + saw::data> dfs_added_v; + dfs_added_v.at({}) = dfs_added; + auto ei_dfs = e_i * dfs_added_v; + + momentum = momentum + ei_dfs; + } + + // Set Force + force = momentum * porous_f.at(index); } }; -- cgit v1.2.3 From a0767a86817055744230239284441fdbb024fab5 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Wed, 5 Aug 2026 17:13:19 +0200 Subject: WOrking on psm 2way --- modules/core/c++/fplbm.hpp | 5 +- modules/core/c++/psm.hpp | 172 +++++++++++++++++++++++++++++---------------- 2 files changed, 115 insertions(+), 62 deletions(-) (limited to 'modules/core/c++') diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index 4acdd36..1f38f51 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -208,7 +208,7 @@ public: pirb_acc = force_p / pg.template get<"total_mass">().at({}); for(saw::data i{0u}; i < sub_steps; ++i){ - //verlet_step_lambda(pi,sss); + verlet_step_lambda(pi,sss); } } }; @@ -286,8 +286,7 @@ public: // vel_s is technically time the density of the particle? - force = ( vel_s * rho - vel * rho ) * flip_por / (one + flip_por / two); - // force = ( vel_s * rho - vel * rho ) * two * flip_por; + force = ( vel_s * rho - vel * rho ) * two * flip_por / (one + flip_por); force_p = force_p - force; }, aabb.template get<"a">(), aabb.template get<"b">()); diff --git a/modules/core/c++/psm.hpp b/modules/core/c++/psm.hpp index c53dbf9..15ad0f8 100644 --- a/modules/core/c++/psm.hpp +++ b/modules/core/c++/psm.hpp @@ -7,15 +7,30 @@ namespace kel { namespace lbm { namespace cmpt { -struct PSM {}; +struct PsmReset {}; struct PsmOneParticle {}; +struct Psm {}; } +template +class component final { +public: + component() = default; + + template + void apply(const saw::data& field, const saw::data& macros, saw::data> index, saw::data time_step) const { + auto& porosity_f = macros.template get<"porosity">(); + + auto& por = porosity_f.at(index); + por.at({}) = 1.0; + } +}; + /** * PSM collision operator for LBM */ template -class component { +class component { private: saw::data relaxation_; saw::data frequency_; @@ -86,80 +101,119 @@ public: template class component final { private: - saw::data relaxation_; - saw::data frequency_; public: - component( - typename saw::native_data_type::type relaxation__ - ): - relaxation_{relaxation__} - { - saw::data one; - one = 1.0; - frequency_ = one / relaxation_; - } + component() = default; template - void apply(const saw::data& field, const saw::data& macros, const saw::data& particles, saw::data> index, saw::data time_step) const { + void apply(const saw::data& field, const saw::data& macros, const saw::data& pg, saw::data> index, saw::data time_step, saw::data sub_steps) const { using dfi = df_info; bool is_even = ((time_step.get() % 2) == 0); + + saw::data> one; + one.at({}) = 1.0; auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); - auto& porous_f = macros.template get<"porosity">(); + auto& por_f = macros.template get<"porosity">(); auto& rho_f = macros.template get<"density">(); auto& vel_f = macros.template get<"velocity">(); - - saw::data>& rho = rho_f.at(index); - saw::data>& vel = vel_f.at(index); - - compute_rho_u(dfs_old_f.at(index),rho,vel); - - auto eq = equilibrium(rho,vel); - - saw::data one{1.0}; - auto& porous = porous_f.at(index); - auto flip_porous = one - porous.at({}); - - auto& dfs = dfs_old_f.at(index); - - auto dfs_cpy = dfs; - - for(uint64_t i = 0u; i < Descriptor::Q; ++i){ - uint64_t i_opp = dfi::opposite_index[i]; - dfs.at({i}) = dfs_cpy.at({i}) + frequency_ * (eq.at(i) - dfs_cpy.at({i})) * porous.at({}) + (dfs_cpy.at({i_opp}) - dfs_cpy.at({i}) ) * flip_porous; - } - auto& force_f = macros.template get<"force">(); - auto& force = force_f.at(index); - for(uint64_t k{0u}; k < Descriptor::D; ++k){ - force.at({{k}}).set(0); - } - - ///////// - saw::data> momentum; - for(uint64_t i = 0u; i < Descriptor::Q; ++i){ - - saw::data> e_i; - saw::data> n_ind_i; - for(uint64_t k{0u}; k < Descriptor::D; ++k){ - e_i.at({{k}}) = dfi::directions[i][k]; - n_ind_i.at({k}) = (dfi::directions[i])[k]; + + { + auto parts = pg.template get<"particles">(); + auto parts_size = parts.meta().at({0u}); + + auto& p_coll = pg.template get<"collision">().at({}); + auto& p_rad = p_coll.template get<"radius">(); + + auto& pi = parts.at(index); + auto& pirb = pi.template get<"rigid_body">(); + saw::data>& pirb_pos = pirb.template get<"position">(); + auto& pirb_pos_old = pirb.template get<"position_old">(); + + saw::data> ts; + ts.at({}) = one.at({}) / sub_steps.template cast_to(); + + saw::data> start; + saw::data> stop; + + auto eo_aabb = particle_aabb::calculate(pg,{{0u}},vel_f.meta()); + if(eo_aabb.is_error()){ + return; } + auto& aabb = eo_aabb.get_value(); - uint64_t i_opp = dfi::opposite_index[i]; + /// Ok, I iterate over the space which covers our particle? So lower bounds to upper bounds + start = aabb.template get<"a">(); + stop = aabb.template get<"b">(); - saw::data dfs_added = dfs.at({i}) - dfs_old_f.at(n_ind_i).at({i_opp}); - saw::data> dfs_added_v; - dfs_added_v.at({}) = dfs_added; - auto ei_dfs = e_i * dfs_added_v; + saw::data> force_p; + for(uint64_t i{0u}; i < Descriptor::D; ++i){ + force_p.at({{i}}) = 0.0; + } + auto vel_p_old = (pirb_pos-pirb_pos_old) / ts; - momentum = momentum + ei_dfs; + iterator::apply([&](const auto& index_f) -> void{ + // ask for the d_k value here. + // For every value im iterating over I need sth + // std::cout<<"Pos: "<> rel_dist = saw::math::vectorize_data(index_f).template cast_to() - pirb_pos; + saw::data> eps; + eps.at({}) = 1.5f; + + auto& por = por_f.at(index_f); + por = particle_porosity>::calculate(rel_dist,p_rad,eps); + + if(por.at({}).get() >= 1.0f){ + return; + } + + saw::data> momentum; + for(uint64_t i{0u}; i < Descriptor::D; ++i){ + momentum.at({{i}}) = 0.0; + } + + for(uint64_t i{0u}; i < Descriptor::Q; ++i){ + saw::data> e_i; + saw::data> n_ind_i; + for(uint64_t k{0u}; k < Descriptor::D; ++k){ + e_i.at({{k}}) = (dfi::directions[i])[k]; + n_ind_i.at({k}) = index_f.at({k}) + (dfi::directions[i])[k]; + } + + uint64_t i_opp = dfi::opposite_index[i]; + + auto u_p_e = saw::math::dot(e_i,vel_p_old); + + saw::data dfs_added = dfs.at({i})*(saw::data{1}-u_p_e.at({})) + dfs_old_f.at(n_ind_i).at({i_opp})*(saw::data{1}+u_p_e.at({})); + saw::data> dfs_added_v; + dfs_added_v.at({}) = dfs_added; + auto ei_dfs = e_i * dfs_added_v; + + momentum = momentum + ei_dfs; + } + // technically needs to adjust for rotation as well + + auto& force = force_f.at(index_f); + auto& rho = rho_f.at(index_f); + // To Fluid + + auto flip_por = one - por; + force = momentum * flip_por; + // To Particle + force_p = force_p - force; + },start,stop); + + auto& pirb_acc = pirb.template get<"acceleration">(); + pirb_acc = force_p / pg.template get<"total_mass">().at({}); + + for(saw::data i{0u}; i < sub_steps; ++i){ + verlet_step_lambda(pi,ts); + } } - - // Set Force - force = momentum * porous_f.at(index); } }; -- cgit v1.2.3 From 7d094fe719923db5eb6b30edcc4fa01c6ce2cc2e Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 7 Aug 2026 12:34:22 +0200 Subject: Cleaning up code --- modules/core/c++/abstract/data.hpp | 89 +++++++++++++++++++++++++ modules/core/c++/abstract/error.hpp | 2 +- modules/core/c++/particle/aabb.hpp | 1 - modules/core/c++/particle/cuboid/aabb.hpp | 40 +++++++++++ modules/core/c++/particle/cuboid/common.hpp | 10 +++ modules/core/c++/particle/cuboid/particle.hpp | 9 +++ modules/core/c++/particle/cuboid/porosity.hpp | 10 +++ modules/core/c++/particle/particle.hpp | 4 +- modules/core/c++/particle/spheroid/particle.hpp | 9 +++ 9 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 modules/core/c++/particle/cuboid/aabb.hpp create mode 100644 modules/core/c++/particle/cuboid/common.hpp create mode 100644 modules/core/c++/particle/cuboid/particle.hpp create mode 100644 modules/core/c++/particle/cuboid/porosity.hpp create mode 100644 modules/core/c++/particle/spheroid/particle.hpp (limited to 'modules/core/c++') diff --git a/modules/core/c++/abstract/data.hpp b/modules/core/c++/abstract/data.hpp index f1ae5a7..327fb63 100644 --- a/modules/core/c++/abstract/data.hpp +++ b/modules/core/c++/abstract/data.hpp @@ -10,8 +10,97 @@ class data final {}; template class data,Encode> final { +public: + using Schema = sch::Primitive; + using Encode = Encode; private: + native_data_type::type value_; public: + data(): + value_{} + {} + + data(native_data_type::type value__): + value_{value__} + {} + + constexpr auto get() const { + return value_; + } + + void set(native_data_type value__){ + value_ = value__; + } + + constexpr bool operator==(const data& rhs) const { + return value_ == rhs.value_; + } + + constexpr bool operator!=(const data& rhs) const { + return value_ != rhs.value_; + } + + constexpr bool operator>(const data& rhs) const { + return value_ > rhs.value_; + } + + constexpr bool operator<(const data& rhs) const { + return value_ < rhs.value_; + } + + constexpr bool operator>=(const data& rhs) const { + return value_ >= rhs.value_; + } + + constexpr bool operator<=(const data& rhs) const { + return value_ >= rhs.value_; + } + + constexpr bool equals(const data& rhs) const { + return (*this) == rhs; + } + + data operator+(const data& rhs) const { + return {value_ + rhs.value_}; + } + + data operator-(const data& rhs) const { + return {value_ - rhs.value_}; + } + + data operator*(const data& rhs) const { + return {value_ * rhs.value_}; + } + + data operator/(const data& rhs) const { + return {value_ / rhs.value_}; + } + + data& operator+=(const data& rhs) { + value_ += rhs.value_; + return *this + } + + data& operator-=(const data& rhs) { + value_ -= rhs.value_; + return *this + } + + data& operator*=(const data& rhs) { + value_ *= rhs.value_; + return *this + } + + data& operator/=(const data& rhs) { + value_ /= rhs.value_; + return *this + } + + template + data cast_to() const { + data val{static_cast::type>(value_)}; + return val; + } }; diff --git a/modules/core/c++/abstract/error.hpp b/modules/core/c++/abstract/error.hpp index 19917de..94a2c35 100644 --- a/modules/core/c++/abstract/error.hpp +++ b/modules/core/c++/abstract/error.hpp @@ -305,7 +305,7 @@ public: /** * This tries to catch cases where error starts including itself as a type which can happen in more complicated cases. - * So this acts as a type safe guard. + * So this acts as a type safe guard in case internal handling fails to treat conversion correctly. */ template class error_or> { private: diff --git a/modules/core/c++/particle/aabb.hpp b/modules/core/c++/particle/aabb.hpp index da39ec2..e4c930b 100644 --- a/modules/core/c++/particle/aabb.hpp +++ b/modules/core/c++/particle/aabb.hpp @@ -26,7 +26,6 @@ public: static constexpr saw::error_or> calculate(const saw::data& p_grp, const saw::data>& index, const saw::data>& meta){ static_assert(PC > 0u, "Can't calculate from no particles"); if(not (index.at({{0u}}).get() < PC) ){ - std::cerr.flush(); return saw::make_error("Too large i in particle_aabb"); } diff --git a/modules/core/c++/particle/cuboid/aabb.hpp b/modules/core/c++/particle/cuboid/aabb.hpp new file mode 100644 index 0000000..502132a --- /dev/null +++ b/modules/core/c++/particle/cuboid/aabb.hpp @@ -0,0 +1,40 @@ +#pragma once + +#include "common.hpp" +#include "../aabb.hpp" + +namespace kel { +namespace lbm { + +template +class particle_aabb< + sch::ParticleGroup> +> final { +public: + using Schema = sch::ParticleGroup>; + + using AABB = sch::Struct< + sch::Member, "a">, + sch::Member, "b"> + >; + +public: + template + static constexpr saw::error_or> calculate(const saw::data& pg, const saw::data>& index, const saw::data>& meta){ + static_assert(PC > 0u, "Can't calculate from no particle"); + if(not (index.at({0u}).get() < PC)){ + return saw::make_error("Too large i in particle_aabb coll::Cuboid"); + } + + saw::data aabb; + auto& parts = pg.template get<"particles">(); + auto& pi = parts.at(index); + auto& pirb = pi.template get<"rigid_body">(); + + /// TODO + + return aabb; + } +}; +} +} diff --git a/modules/core/c++/particle/cuboid/common.hpp b/modules/core/c++/particle/cuboid/common.hpp new file mode 100644 index 0000000..a859cbe --- /dev/null +++ b/modules/core/c++/particle/cuboid/common.hpp @@ -0,0 +1,10 @@ +#pragma once + +namespace kel { +namespace lbm { +namespace coll { +template +struct Cuboid {}; +} +} +} diff --git a/modules/core/c++/particle/cuboid/particle.hpp b/modules/core/c++/particle/cuboid/particle.hpp new file mode 100644 index 0000000..e19d543 --- /dev/null +++ b/modules/core/c++/particle/cuboid/particle.hpp @@ -0,0 +1,9 @@ +#pragma once + +#include "common.hpp" +#include "porosity.hpp" + +namespace kel { +namespace lbm { +} +} diff --git a/modules/core/c++/particle/cuboid/porosity.hpp b/modules/core/c++/particle/cuboid/porosity.hpp new file mode 100644 index 0000000..bccfebf --- /dev/null +++ b/modules/core/c++/particle/cuboid/porosity.hpp @@ -0,0 +1,10 @@ +#pragma once + +#include "common.hpp" +#include "../porosity.hpp" + +namespace kel { +namespace lbm { + +} +} diff --git a/modules/core/c++/particle/particle.hpp b/modules/core/c++/particle/particle.hpp index a3669b4..21b4b34 100644 --- a/modules/core/c++/particle/particle.hpp +++ b/modules/core/c++/particle/particle.hpp @@ -82,8 +82,8 @@ saw::data>> create_sphero total_mass.at({}) = rad_d * rad_d * density.at({}) * 3.141592; }else if constexpr ( D == 3u ){ - }else if constexpr ( D== 1u ){ - + }else if constexpr ( D == 1u ){ + total_mass.at({}) = rad_d * 2.0; } std::cout<<"Total Mass: "<