Merge branch 'r20_update' of https://github.com/LLNL/units into r20_u…

…pdate
LLNL · Oct 22, 2023 · 6c60d21 · 6c60d21
2 parents 871c5eb + 3ce619b
commit 6c60d21
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/units/unit_definitions.hpp b/units/unit_definitions.hpp
@@ -719,7 +719,7 @@ namespace precise {
         constexpr precise_unit psi{6894.757293168, Pa};
         constexpr precise_unit psig = psi * eflag;
         constexpr precise_unit mmHg{133.322387415, Pa};  // at 0 deg C
-        constexpr precise_unit inHg{ 25.4, mmHg };  // at 32 degF
+        constexpr precise_unit inHg{25.4, mmHg};  // at 32 degF
         constexpr precise_unit torr{
             1.0 / 760.0,
             atm* iflag};  // this is really
@@ -730,20 +730,22 @@ namespace precise {
 
         constexpr precise_unit att = gm::at;  //!< technical atmosphere same as
                                               //!< gravitational metric system
-
-        namespace bases
-        {
-            constexpr precise_unit water{inH2O / in };
-            constexpr precise_unit Hg{mmHg/mm};
-            constexpr precise_unit Hg_0=Hg;
-            constexpr precise_unit Hg_4=precise_unit(98.0637795, Pa) / precise::cm;
-            constexpr precise_unit water_39=precise_unit(2988.98400, Pa) / precise::ft;
-            constexpr precise_unit water_4=water_39;
-            constexpr precise_unit Hg_32=precise_unit(3383.93102, Pa) / precise::in;
-            constexpr precise_unit Hg_60=
+
+        namespace bases {
+            constexpr precise_unit water{inH2O / in};
+            constexpr precise_unit Hg{mmHg / mm};
+            constexpr precise_unit Hg_0 = Hg;
+            constexpr precise_unit Hg_4 =
+                precise_unit(98.0637795, Pa) / precise::cm;
+            constexpr precise_unit water_39 =
+                precise_unit(2988.98400, Pa) / precise::ft;
+            constexpr precise_unit water_4 = water_39;
+            constexpr precise_unit Hg_32 =
+                precise_unit(3383.93102, Pa) / precise::in;
+            constexpr precise_unit Hg_60 =
                 precise_unit(3376.84789, Pa) / precise::in;
-            constexpr precise_unit water_60=water;
-        }
+            constexpr precise_unit water_60 = water;
+        }  // namespace bases
     }  // namespace pressure
 
     // Power system units