Automatic merge of T1.5.1-1080-g433d161cdb and 21 pull requests

- Pull request #891 at 9a1d6b2: Auto save
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #969 at 9d53199: Bugfix refocus to the main window when opening  the map window
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #882 at 8f695a4: Blueprint/train car operations UI window
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #922 at a3bc9e7: Autopilot for timetable mode
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #965 at 4725f3d: style: Renormalize line endings
- Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 9dabe97: Downloading route content (Github, zip)
- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #885 at e267870: feat: Add notifications to Menu
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #946 at 91a03af: Advanced track sounds
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #954 at f837ffd: Multiple Track Profiles & Superelevation Improvements
- Pull request #968 at a88cb26: Initial build of adding track section identifier for rack railway

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -173,6 +173,7 @@ public class MSTSSteamLocomotive : MSTSLocomotive
         int BoosterEngineNumber;
 
         bool CounterPressureBrakingFitted = false;
+        float CounterPressureMEP;
 
         /// <summary>
         /// Grate limit of locomotive exceedeed?
@@ -1480,7 +1481,6 @@ public override void Initialize()
                     Trace.TraceWarning("Boiler Volume not found in ENG file, or doesn't appear to be a valid figure, and has been set to {0} Ft^3", BoilerVolumeFT3);
             }
 
-
             // Assign default steam table values if table not in ENG file
             if (BoilerEfficiencyGrateAreaLBpFT2toX == null)
             {
@@ -1678,6 +1678,13 @@ public override void Initialize()
 
             for (int i = 0; i < SteamEngines.Count; i++)
             {
+
+                // Check that this is across all steam engines
+                if (LocomotiveRailDriveType == LocomotiveRailDriveTypes.Rack && SteamEngines[i].AttachedAxle.CogWheelRadiusM == 0)
+                {
+                    SteamEngines[i].AttachedAxle.CogWheelRadiusM = CogWheelRadiusM;
+                }
+
                 if (SteamEngines[i].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
                 {
                     if (SteamEngineType == SteamEngineTypes.Compound)
@@ -6018,8 +6025,9 @@ private void UpdateCylinders(float elapsedClockSeconds, float throttle, float cu
                     float CylinderRatio_compression = CylinderVolumePoint_compression / CylinderClearancePC;
                     float CylinderRatio_release = CylinderVolumePoint_compression / (Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) + 2 * CylinderClearancePC);
 
-                    float CompMeanPressure_compressionAtmPSI = OneAtmospherePSI * CylinderRatio_compression * ((float)Math.Log(CylinderRatio_compression, 10) / (CylinderRatio_compression - 1.0f));
-                    float CompMeanPressure_releaseAtmPSI = CompMeanPressure_compressionAtmPSI * CylinderRatio_release * ((float)Math.Log(CylinderRatio_release) / (CylinderRatio_release - 1.0f));
+                // Note to convert to hyperbolic log, value needs to be multiplied by 2
+                    float CompMeanPressure_compressionAtmPSI = OneAtmospherePSI * CylinderRatio_compression * (2.0f * (float)Math.Log(CylinderRatio_compression, 10) / (CylinderRatio_compression - 1.0f));
+                    float CompMeanPressure_releaseAtmPSI = CompMeanPressure_compressionAtmPSI * CylinderRatio_release * (2.0f * (float)Math.Log(CylinderRatio_release) / (CylinderRatio_release - 1.0f));
 
                     //                Trace.TraceInformation("MEPcomp {0} Log {1} CompRatio {2}", CompMeanPressure_compressionAtmPSI, (float)Math.Log(CylinderRatio_compression), CylinderRatio_compression);
 
@@ -6030,18 +6038,21 @@ private void UpdateCylinders(float elapsedClockSeconds, float throttle, float cu
 
                     float TotalWorkCounterPressure = CylinderWork_compression_InLbs + CylinderWork_release_InLbs;
 
-                    float CounterPressureMEP = TotalWorkCounterPressure / Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM);
+                    CounterPressureMEP = TotalWorkCounterPressure / Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM);
 
                 // Assume no impact of "return" stroke as air is being drawn into cylinder
 
+                float CounterBalanceWheelDiamM = 2 * SteamEngines[numberofengine].AttachedAxle.CogWheelRadiusM;
+
                 // Calculate tractive retarding force
-                SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN = N.FromLbf(CounterPressureMEP * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) / Me.ToIn(SteamEngines[numberofengine].AttachedAxle.CogWheelRadiusM));
+                SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN = N.FromLbf(CounterPressureMEP * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) / Me.ToIn(CounterBalanceWheelDiamM));
 
-                    //                Trace.TraceInformation("CogRetardForce {0} throttle {1} MEP {2} Ratio-Comp {3} Ratio-Rel {4}", N.ToLbf(SteamLocomotiveRetardingDynamicBrakeForceN), throttle, CounterPressureMEP, CylinderRatio_compression, CylinderRatio_release);
-                }
-                else
+//                Trace.TraceInformation("CogRetardForce {0} throttle {1} MEP {2} Ratio-Comp {3} Ratio-Rel {4} Pc {5} Pr {6} ", N.ToLbf(SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN), throttle, CounterPressureMEP, CylinderRatio_compression, CylinderRatio_release, CompMeanPressure_compressionAtmPSI, CompMeanPressure_releaseAtmPSI);
+            }
+            else
                 {
                 SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN = 0;
+                CounterPressureMEP = 0;
                 }
         }
 
@@ -6573,6 +6584,7 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             MaxPowerW = 0;
             MaxForceN = 0;
             DisplayTractiveForceN = 0;
+            float CounterPressureRetardingForceN = 0;
 
             if (WheelSlip && AdvancedAdhesionModel)
             {
@@ -6588,30 +6600,44 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             {
                 ApplyDirectionToTractiveForce(ref SteamEngines[i].RealTractiveForceN, i);
 
-                TractiveForceN += SteamEngines[i].RealTractiveForceN + DynamicBrakeForceN;
-
                 if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics)
                 {
-                    SteamEngines[i].AttachedAxle.DriveForceN = SteamEngines[i].RealTractiveForceN;
-
-                    // Counter Pressure braking system
-
+                    // Riggenbach Counter Pressure braking system
+                    // Note valve motion needs to be reversed, ie if travelling forward reverser needs to be set in reverse, similarly if travelling in reverse,
+                    // needs to be set in forward.
                     if (DynamicBrakePercent > 0 && CounterPressureBrakingFitted && absSpeedMpS > 0.1)
-                    {
-                        DynamicBrakeForceN += SteamEngines[i].CylinderCounterPressureBrakeForceN;
-                        TractiveForceN -= (SpeedMpS > 0 ? 1 : SpeedMpS < 0 ? -1 : Direction == Direction.Reverse ? -1 : 1) * DynamicBrakeForceN;
-                        SteamEngines[i].AttachedAxle.DriveForceN = SteamEngines[i].RealTractiveForceN;
-                    }
-                    else
-                    {
-                        DynamicBrakeForceN = 0;
+                    {                        
+                        if (SpeedMpS > 0)
+                        {
+                            if (Direction == Direction.Reverse)
+                            {
+                                CounterPressureRetardingForceN = -1 * SteamEngines[i].CylinderCounterPressureBrakeForceN;
+                            }
+                            else
+                            {
+                                CounterPressureRetardingForceN = 0;
+                            }
+                        }
+                        else if (SpeedMpS < 0)
+                        {
+                            if (Direction == Direction.Forward)
+                            {
+                                CounterPressureRetardingForceN = SteamEngines[i].CylinderCounterPressureBrakeForceN;
+                            }
+                            else
+                            {
+                                CounterPressureRetardingForceN = 0;
+                            }
+                        }
+                        else
+                        {
+                            CounterPressureRetardingForceN = 0;
+                        }
                     }
 
-                    if (DynamicBrakeForceN > 0)
-                    {
-
-                        SteamEngines[i].AttachedAxle.DriveForceN = DynamicBrakeForceN;
-                    }
+                    SteamEngines[i].AttachedAxle.DriveForceN = SteamEngines[i].RealTractiveForceN + CounterPressureRetardingForceN;
+                    TractiveForceN += SteamEngines[i].RealTractiveForceN + CounterPressureRetardingForceN;
+                    DynamicBrakeForceN += SteamEngines[i].CylinderCounterPressureBrakeForceN;
 
                     UpdateAxleDriveForce();
 
@@ -6624,7 +6650,6 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
                     SteamEngines[i].DisplayTractiveForceN = SteamEngines[i].RealTractiveForceN;
                     MotiveForceN += SteamEngines[i].RealTractiveForceN;
                     DisplayTractiveForceN += SteamEngines[i].RealTractiveForceN;
-
                 }
 
                 // Set Max Power equal to max IHP
@@ -8699,6 +8724,36 @@ public override string GetDebugStatus()
                     }
                 }
 
+                if (CounterPressureBrakingFitted)
+                {
+                    status.AppendFormat("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14:N0}{15}\t{16}\t{17}\t{18}\t{19}\t{20}\t{21}\n",
+                        Simulator.Catalog.GetString("ForceTot:"),
+                        Simulator.Catalog.GetString("TheorTE"),
+                        FormatStrings.FormatForce(N.FromLbf(MaxTractiveEffortLbf), IsMetric),
+                        Simulator.Catalog.GetString("StartTE"),
+                        FormatStrings.FormatForce(absStartTractiveEffortN, IsMetric),
+                        Simulator.Catalog.GetString("AvTE"),
+                        FormatStrings.FormatForce(DisplayTractiveForceN, IsMetric),
+                        Simulator.Catalog.GetString("Draw"),
+                        FormatStrings.FormatForce(N.FromLbf(DrawBarPullLbsF), IsMetric),
+                        Simulator.Catalog.GetString("CritSpeed"),
+                        FormatStrings.FormatSpeedDisplay(MpS.FromMpH(MaxLocoSpeedMpH), IsMetric),
+                        Simulator.Catalog.GetString("SpdLmt"),
+                        IsCritTELimit ? Simulator.Catalog.GetString("Yes") : Simulator.Catalog.GetString("No"),
+                        Simulator.Catalog.GetString("Hammer"),
+                        FormatStrings.FormatForce(N.FromLbf(SteamEngines[0].HammerForceLbs), IsMetric),
+                        SteamEngines[0].IsWheelHammerForce ? "!!!" : SteamEngines[0].IsWheelHammerForceWarning ? "???" : "",
+                        Simulator.Catalog.GetString("CtPress"),
+                        FormatStrings.FormatPressure(CounterPressureMEP, PressureUnit.PSI, MainPressureUnit, true),
+                        Simulator.Catalog.GetString("CtForce"),
+                        FormatStrings.FormatForce(SteamEngines[0].CylinderCounterPressureBrakeForceN, IsMetric),
+                        Simulator.Catalog.GetString("DyForce"),
+                        FormatStrings.FormatForce(DynamicBrakeForceN, IsMetric)
+
+                        );
+                }
+                else
+                {
                 status.AppendFormat("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13} \t{14:N0}{15}\n",
                     Simulator.Catalog.GetString("ForceTot:"),
                     Simulator.Catalog.GetString("TheorTE"),
@@ -8719,6 +8774,10 @@ public override string GetDebugStatus()
 
                     );
 
+
+
+                }
+
                 status.AppendFormat("{0}\t{1}\t{2:N0} {5}/{6}\t\t{3}\t{4:N0} \t{7} {8:N2}\n",
                     Simulator.Catalog.GetString("Move:"),
                     Simulator.Catalog.GetString("Piston"),
@@ -8729,7 +8788,6 @@ public override string GetDebugStatus()
                     FormatStrings.min,
                     Simulator.Catalog.GetString("Max-SpdF"),
                     DisplaySpeedFactor
-
                     );
             }