refactor: constant_unit abstraction removed and replaced with regular named_unit

This commit is contained in:
Mateusz Pusz committed 2023-06-05 19:36:22 +02:00
1 parent 6364fcdf7e
commit 7a730fde58
8 files changed
+66 -144

No files matched your search

@@ -42,6 +42,9 @@ inline constexpr struct barn : named_unit<"b", mag_power<10, -28> * square(si::m
inline constexpr struct electron_mass : named_unit<"m_e", mag<ratio{9'109'383'701'528, 1'000'000'000'000}> * mag_power<10, -31> * si::kilogram> {} electron_mass;
inline constexpr struct proton_mass : named_unit<"m_p", mag<ratio{1'672'621'923'695, 1'000'000'000'000}> * mag_power<10, -27> * si::kilogram> {} proton_mass;
inline constexpr struct neutron_mass : named_unit<"m_n", mag<ratio{1'674'927'498'049, 1'000'000'000'000}> * mag_power<10, -27> * si::kilogram> {} neutron_mass;
// speed
inline constexpr struct speed_of_light : decltype(si::si2019::speed_of_light_in_vacuum) {} speed_of_light;
// clang-format on
namespace unit_symbols {
@@ -89,8 +92,8 @@ inline constexpr auto m_e = electron_mass;
inline constexpr auto m_p = proton_mass;
inline constexpr auto m_n = neutron_mass;
inline constexpr auto c = si::si2019::speed_of_light_in_vacuum_unit;
inline constexpr auto c2 = square(si::si2019::speed_of_light_in_vacuum_unit);
inline constexpr auto c = speed_of_light;
inline constexpr auto c2 = square(speed_of_light);
} // namespace unit_symbols
@@ -56,7 +56,7 @@ inline constexpr struct knot : named_unit<"kn", nautical_mile / si::hour> {} kno
inline constexpr struct poundal : named_unit<"pdl", pound * foot / square(si::second)> {} poundal;
// https://en.wikipedia.org/wiki/Pound_(force)
inline constexpr struct pound_force : named_unit<"lbf", pound * si::standard_gravity_unit> {} pound_force;
inline constexpr struct pound_force : named_unit<"lbf", pound * si::standard_gravity> {} pound_force;
// https://en.wikipedia.org/wiki/Kip_(unit),
inline constexpr struct kip : decltype(si::kilo<pound_force>) {} kip;
@@ -23,7 +23,6 @@
#pragma once
#include <mp-units/quantity.h>
#include <mp-units/systems/isq/isq.h>
#include <mp-units/systems/si/units.h>
namespace mp_units::si {
@@ -31,42 +30,29 @@ namespace mp_units::si {
namespace si2019 {
// clang-format off
inline constexpr struct hyperfine_structure_transition_frequency_of_cs_unit :
constant_unit<basic_symbol_text{"ΔνCs", "dvCs"}, mag<9'192'631'770> * hertz> {} hyperfine_structure_transition_frequency_of_cs_unit;
inline constexpr struct speed_of_light_in_vacuum_unit :
constant_unit<"c", mag<299'792'458> * metre / second> {} speed_of_light_in_vacuum_unit;
inline constexpr struct planck_constant_unit :
constant_unit<"h", mag<ratio{662'607'015, 100'000'000}> * mag_power<10, -34> * joule * second> {} planck_constant_unit;
inline constexpr struct elementary_charge_unit :
constant_unit<"e", mag<ratio{1'602'176'634, 1'000'000'000}> * mag_power<10, -19> * coulomb> {} elementary_charge_unit;
inline constexpr struct boltzmann_constant_unit :
constant_unit<"k", mag<ratio{1'380'649, 1'000'000}> * mag_power<10, -23> * joule / kelvin> {} boltzmann_constant_unit;
inline constexpr struct avogadro_constant_unit :
constant_unit<"NA", mag<ratio{602'214'076, 100'000'000}> * mag_power<10, 23> * (1 / mole)> {} avogadro_constant_unit;
inline constexpr struct luminous_efficacy_unit :
constant_unit<"Kcd", mag<683> * lumen / watt> {} luminous_efficacy_unit;
inline constexpr struct hyperfine_structure_transition_frequency_of_cs :
named_unit<basic_symbol_text{"Δν_Cs", "dv_Cs"}, mag<9'192'631'770> * hertz> {} hyperfine_structure_transition_frequency_of_cs;
inline constexpr struct speed_of_light_in_vacuum :
named_unit<"c", mag<299'792'458> * metre / second> {} speed_of_light_in_vacuum;
inline constexpr struct planck_constant :
named_unit<"h", mag<ratio{662'607'015, 100'000'000}> * mag_power<10, -34> * joule * second> {} planck_constant;
inline constexpr struct elementary_charge :
named_unit<"e", mag<ratio{1'602'176'634, 1'000'000'000}> * mag_power<10, -19> * coulomb> {} elementary_charge;
inline constexpr struct boltzmann_constant :
named_unit<"k", mag<ratio{1'380'649, 1'000'000}> * mag_power<10, -23> * joule / kelvin> {} boltzmann_constant;
inline constexpr struct avogadro_constant :
named_unit<"N_A", mag<ratio{602'214'076, 100'000'000}> * mag_power<10, 23> * (1 / mole)> {} avogadro_constant;
inline constexpr struct luminous_efficacy :
named_unit<"K_cd", mag<683> * lumen / watt> {} luminous_efficacy;
// clang-format on
inline constexpr auto hyperfine_structure_transition_frequency_of_cs =
isq::frequency[hyperfine_structure_transition_frequency_of_cs_unit];
inline constexpr auto speed_of_light_in_vacuum = isq::speed_of_light[speed_of_light_in_vacuum_unit];
inline constexpr auto planck_constant = isq::action[planck_constant_unit];
inline constexpr auto elementary_charge = isq::electric_charge[elementary_charge_unit];
inline constexpr auto boltzmann_constant = isq::entropy[boltzmann_constant_unit];
inline constexpr auto avogadro_constant = (1 / isq::amount_of_substance)[avogadro_constant_unit];
// TODO uncomment the below when all the ISQ is provided
// inline constexpr auto luminous_efficacy = isq::luminous_efficacy_of_radiation[luminous_efficacy_unit];
} // namespace si2019
// clang-format off
inline constexpr struct standard_gravity_unit :
constant_unit<basic_symbol_text{"g₀", "g_0"}, mag<ratio{980'665, 100'000}> * metre / square(second)> {} standard_gravity_unit;
inline constexpr struct magnetic_constant_unit :
constant_unit<basic_symbol_text{"μ₀", "u_0"}, mag<4> * mag_pi * mag_power<10, -7> * henry / metre> {} magnetic_constant_unit;
inline constexpr struct standard_gravity :
named_unit<basic_symbol_text{"g₀", "g_0"}, mag<ratio{980'665, 100'000}> * metre / square(second)> {} standard_gravity;
inline constexpr struct magnetic_constant :
named_unit<basic_symbol_text{"μ₀", "u_0"}, mag<4> * mag_pi * mag_power<10, -7> * henry / metre> {} magnetic_constant;
// clang-format on
inline constexpr auto standard_gravity = isq::acceleration_of_free_fall[standard_gravity_unit];
inline constexpr auto magnetic_constant = isq::magnetic_constant[magnetic_constant_unit];
} // namespace mp_units::si