Improve utility of verbose logging, expand capabilities of automatic friction calculation

Author: SteelFill

Source/Documentation/Manual/physics.rst

@@ -85,10 +85,10 @@ or the 1992 CN equation (for roller and low bearings). If given a supported
 vehicle weight and number of axles. Likewise, if the C coefficient is missing it
 is automatically calculated from the ``ORTSWagonFrontalArea`` and
 ``ORTSDavisDragConstant`` values (or defaults, if those are missing).
-While the auto-calculated results will be reasonable in many cases, manual
-entry of ORTSDavis coefficients is still preferred for rolling stock that
-was not studied in the original Davis or CN experiments, such as steam
-locomotives, multiple units, and high speed trains.
+While the auto-calculated results will be reasonable for standard rolling stock,
+manual entry of ORTSDavis coefficients is still preferred for more complicated
+rolling stock such as steam locomotives, multiple units, high speed trains,
+articulated units, and anything studied in experiments other than Davis.
 
 .. index::
    single: ORTSMergeSpeed

Source/Orts.Common/Conversions.cs

@@ -260,23 +260,23 @@ public static class NpM
     /// <summary>
     /// Resistance conversions from and to Newtons/metre/sec
     /// </summary>
-    public static class NpMpS
+    public static class NSpM
     {
         /// <summary>Convert from pounds per mph to newtons per meter per second</summary>
-        public static float FromLbpMpH(float lbfPerMpH) { return lbfPerMpH * 9.9503884f; }
+        public static float FromLbfpMpH(float lbfPerMpH) { return lbfPerMpH * 9.9503884f; }
         /// <summary>Convert from newtons per meter per second to pounds per mph</summary>
-        public static float ToLbpMpH(float nPerMpS) { return nPerMpS / 9.9503884f; }
+        public static float ToLbfpMpH(float nPerMpS) { return nPerMpS / 9.9503884f; }
     }
 
     /// <summary>
     /// Resistance conversions from and to Newtons/metre^2/sec^2
     /// </summary>
-    public static class NpMpS2
+    public static class NSSpMM
     {
         /// <summary>Convert from pounds per mph^2 to newtons per mps^2</summary>
-        public static float FromLbpMpH2(float lbfPerMpH2) { return lbfPerMpH2 * 22.2583849f; }
+        public static float FromLbfpMpH2(float lbfPerMpH2) { return lbfPerMpH2 * 22.2583849f; }
         /// <summary>Convert from newtons per mps^2 to pounds per mph^2</summary>
-        public static float ToLbpMpH2(float nPerMpS2) { return nPerMpS2 / 22.2583849f; }
+        public static float ToLbfpMpH2(float nPerMpS2) { return nPerMpS2 / 22.2583849f; }
     }
 
     /// <summary>
@@ -591,8 +591,12 @@ public static class FormatStrings
         public static string f = Catalog.GetString("°F");
         public static string n = Catalog.GetString("N");
         public static string kN = Catalog.GetString("kN");
+        public static string nspm = Catalog.GetString("N/m/s");
+        public static string nsspmm = Catalog.GetString("N/(m/s)²");
         public static string lbf = Catalog.GetString("lbf");
         public static string klbf = Catalog.GetString("klbf");
+        public static string lbfpmph = Catalog.GetString("lbf/mph");
+        public static string lbfpmph2 = Catalog.GetString("lbf/mph²");
         public static string deg = Catalog.GetString("°");
 
         /// <summary>
@@ -804,6 +808,18 @@ public static string FormatLargeForce(float forceN, bool isMetric)
             return String.Format(CultureInfo.CurrentCulture, "{0:F1} {1}", force * 1e-3f, unit);
         }
 
+        public static string FormatLinearResistance(float resistanceNSpM, bool isMetric)
+        {
+            var resistance = isMetric ? resistanceNSpM : NSpM.ToLbfpMpH(resistanceNSpM);
+            return String.Format(CultureInfo.CurrentCulture, isMetric ? "{0:F1} {1}" : "{0:F2} {2}", resistance, nspm, lbfpmph);
+        }
+
+        public static string FormatQuadraticResistance(float resistanceNSSpMM, bool isMetric)
+        {
+            var resistance = isMetric ? resistanceNSSpMM : NSSpMM.ToLbfpMpH2(resistanceNSSpMM);
+            return String.Format(CultureInfo.CurrentCulture, isMetric ? "{0:F3} {1}" : "{0:F4} {2}", resistance, nsspmm, lbfpmph2);
+        }
+
         public static string FormatTemperature(float temperatureC, bool isMetric, bool isDelta)
         {
             var temperature = isMetric ? temperatureC : isDelta ? C.ToDeltaF(temperatureC) : C.ToF(temperatureC);