Further adjustments to derail

Author: peternewell

Source/Orts.Parsers.Msts/STFReader.cs

@@ -813,7 +813,7 @@ public enum UNITS
             /// Valid Units: deg, rad
             /// <para>Scaled to Radians</para>
             /// </summary>            
-            Angle = 1 << 28,    // "Temperature", note above TemperatureDifference, is different
+            Angle = 1 << 28,
 
             // "Any" is used where units cannot easily be specified, such as generic routines for interpolating continuous data from point values.
             // or interpreting locomotive cab attributes from the ORTSExtendedCVF experimental mechanism.

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -509,17 +509,12 @@ public virtual void LoadFromWagFile(string wagFilePath)
             // Set wheel flange parameters to default values.
             if (MaximumWheelFlangeAngleRad == 0)
             {
-                MaximumWheelFlangeAngleRad = 1.09956f; // Default = 63.36 deg.
-            }
-            else
-            {
-                const float convertDegtoRad = 0.01745329252f;
-                MaximumWheelFlangeAngleRad = convertDegtoRad * MaximumWheelFlangeAngleRad; // Assume that input has been in degrees - TO ADD - appropriate input parameters
+                MaximumWheelFlangeAngleRad = 1.22173f; // Default = 70 deg - Pre 1990 AAR 1:20 wheel
             }
 
             if (WheelFlangeLengthM == 0)
             {
-                WheelFlangeLengthM = 0.026194f; // Height = 1.031in
+                WheelFlangeLengthM = 0.0254f; // Height = 1.00in - Pre 1990 AAR 1:20 wheel
             }
 
             // Initialise steam heat parameters

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -1513,6 +1513,18 @@ public void UpdateTrainDerailmentRisk(float elapsedClockSeconds)
                     {
                         DerailElapsedTimeS = 0; // Reset timer if derail is not possible
                     }
+
+                    if (AbsSpeedMpS < 0.01)
+                    {
+                        DerailExpected = false;
+                        DerailPossible = false;
+                    }
+
+//                    if (CarID == "0 - 84" || CarID == "0 - 83" || CarID == "0 - 82" || CarID == "0 - 81" || CarID == "0 - 80" || CarID == "0 - 79")
+//                    {
+//                        Trace.TraceInformation("Nadal - {0}, Adhesion {1} Flange Angle {2}", NadalDerailmentCoefficient, wagonAdhesion, MaximumWheelFlangeAngleRad);
+//                        Trace.TraceInformation("Derailment - CarID {0}, Nadal {1}, Derail {2} Possible {3} Expected {4} Derail Distance {5} ElapsedTime {6} DerailTime {7}", CarID, NadalDerailmentCoefficient, DerailmentCoefficient, DerailPossible, DerailExpected, DerailClimbDistanceM, DerailElapsedTimeS, derailTimeS);
+//                    }
                 }
                 else
                 {