Improve formatting for prefix * Ah

LLNL · Feb 5, 2021 · 4d65b6b · 4d65b6b
1 parent 61a0120
commit 4d65b6b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/test/test_unit_strings.cpp b/test/test_unit_strings.cpp
@@ -207,6 +207,23 @@ TEST(unitStrings, crazyunits)
     EXPECT_EQ(to_string(precise_unit(10, precise::pu)), "10*pu");
 }
 
+TEST(unitStrings, charge)
+{
+    // A * s = C
+    EXPECT_EQ(to_string(precise::A * precise::s), "C");
+    // A * h = 3600 C, better use A * h
+    EXPECT_EQ(to_string(precise::A * precise::hr), "Ahr");
+    EXPECT_EQ(to_string(precise::femto * precise::A * precise::hr), "fAhr");
+    EXPECT_EQ(to_string(precise::pico * precise::A * precise::hr), "pAhr");
+    EXPECT_EQ(to_string(precise::nano * precise::A * precise::hr), "nAhr");
+    EXPECT_EQ(to_string(precise::micro * precise::A * precise::hr), "uAhr");
+    EXPECT_EQ(to_string(precise::milli * precise::A * precise::hr), "mAhr");
+    EXPECT_EQ(to_string(precise::kilo * precise::A * precise::hr), "kAhr");
+    EXPECT_EQ(to_string(precise::mega * precise::A * precise::hr), "MAhr");
+    EXPECT_EQ(to_string(precise::giga * precise::A * precise::hr), "GAhr");
+    EXPECT_EQ(to_string(precise::tera * precise::A * precise::hr), "TAhr");
+}
+
 TEST(unitStrings, electronVolt)
 {
     EXPECT_EQ(to_string(precise::energy::eV), "eV");

diff --git a/units/units.cpp b/units/units.cpp
@@ -145,6 +145,16 @@ static const umap base_unit_names{
     {kg, "kg"},
     {mol, "mol"},
     {A, "A"},
+    {A * hr, "Ahr"},
+    {femto * A * hr, "fAhr"},
+    {pico * A * hr, "pAhr"},
+    {nano * A * hr, "nAhr"},
+    {micro * A * hr, "uAhr"},
+    {milli * A * hr, "mAhr"},
+    {kilo * A * hr, "kAhr"},
+    {mega * A * hr, "MAhr"},
+    {giga * A * hr, "GAhr"},
+    {tera * A * hr, "TAhr"},
     {V, "V"},
     {s, "s"},
     // this is so Gs doesn't get used which can cause issues