mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-01 19:34:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

physical/si/density : change UDL from kg_per_m3 to kgpm3 (and then fix example/box_example)

Browse Source
This commit is contained in:
Andy Little
2020-01-10 16:21:49 +00:00
committed by Mateusz Pusz
parent 6ba2362af9
commit c93136e81b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
example/box_example.cpp
View File

@@ -23,10 +23,10 @@ namespace{
namespace acceleration{
template <typename Rep = double>
using m_per_s2 = units::si::acceleration<units::si::metre_per_second_sq,Rep>;
using mps2 = units::si::acceleration<units::si::metre_per_second_sq,Rep>;
template <typename Rep = double>
constexpr m_per_s2<> g{static_cast<Rep>(9.80665)};
constexpr mps2<> g{static_cast<Rep>(9.80665)};
}
namespace force{
@@ -44,7 +44,7 @@ namespace{
namespace density {
template <typename Rep = double>
using kg_per_m3 = units::si::density<units::si::kilogram_per_metre_cub,Rep>;
using kgpm3 = units::si::density<units::si::kilogram_per_metre_cub,Rep>;
}
namespace volume {
@@ -82,16 +82,16 @@ struct Box{
struct contents{
contents():density{air_density}{}
density::kg_per_m3<> density;
density::kgpm3<> density;
}contents;
void set_contents_density(density::kg_per_m3<> const & density_in)
void set_contents_density(density::kgpm3<> const & density_in)
{
assert( density_in > air_density );
contents.density = density_in;
}
static constexpr density::kg_per_m3<> air_density{1.225};
static constexpr density::kgpm3<> air_density{1.225};
length::m<> length;
length::m<> width;
@@ -104,7 +104,7 @@ using namespace units::si::literals;
int main()
{
auto box = Box{1000.0mm, 500.0mm, 200.0mm};
box.set_contents_density(1000.0kg_per_m3);
box.set_contents_density(1000.0kgpm3);
auto fill_time = 200.0s; // time since starting fill
auto measured_mass = 20.0kg; // measured mass at fill_time

4
src/include/units/physical/si/density.h
View File

@@ -39,8 +39,8 @@ using density = quantity<dim_density, U, Rep>;
inline namespace literals {
constexpr auto operator"" kg_per_m3(unsigned long long l) { return density<kilogram_per_metre_cub, std::int64_t>(l); }
constexpr auto operator"" kg_per_m3(long double l) { return density<kilogram_per_metre_cub, long double>(l); }
constexpr auto operator"" kgpm3(unsigned long long l) { return density<kilogram_per_metre_cub, std::int64_t>(l); }
constexpr auto operator"" kgpm3(long double l) { return density<kilogram_per_metre_cub, long double>(l); }
} // namespace literals