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

- Pull request #891 at 9a1d6b2: Auto save
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- 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 7554f02: style: Renormalize line endings
- Pull request #969 at 93424fa: Bugfix refocus to the main window when opening  the map window
- Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage
- Pull request #900 at c27f32d: DMI updates
- 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: Add Support for Multiple Track Profiles
- Pull request #968 at 5310029: Initial build of adding track section identifier for rack railway

Author: openrails-bot

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

@@ -172,7 +172,7 @@ public class MSTSSteamLocomotive : MSTSLocomotive
         bool BoosterAirisLow = false;
         int BoosterEngineNumber;
 
-        float SteamLocomotiveRetardingDynamicBrakeForceN = 0;
+        bool CounterPressureBrakingFitted = false;
 
         /// <summary>
         /// Grate limit of locomotive exceedeed?
@@ -1059,6 +1059,10 @@ public override void Parse(string lowercasetoken, STFReader stf)
                     IsSelectGeared = String.Compare(typeString2, "Select") == 0;
                     break;
 
+                case "engine(ortscounterpressurebraking":
+                    CounterPressureBrakingFitted = stf.ReadBoolBlock(false);
+                    break;
+
                 case "engine(ortsbattery(mode":
                 case "engine(ortsbattery(delay":
                 case "engine(ortsbattery(defaulton":
@@ -1107,6 +1111,7 @@ public override void Copy(MSTSWagon copy)
             EjectorLargeSteamConsumptionLbpS = locoCopy.EjectorLargeSteamConsumptionLbpS;
             ShovelMassKG = locoCopy.ShovelMassKG;
             GearedTractiveEffortFactor = locoCopy.GearedTractiveEffortFactor;
+            CounterPressureBrakingFitted = locoCopy.CounterPressureBrakingFitted;
             TractiveEffortFactor = locoCopy.TractiveEffortFactor;
             MaxTenderFuelMassKG = locoCopy.MaxTenderFuelMassKG;
             MaxLocoTenderWaterMassKG = locoCopy.MaxLocoTenderWaterMassKG;
@@ -2523,7 +2528,6 @@ public override void Update(float elapsedClockSeconds)
 
                 if (SteamEngines[i].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
                 {
-                    UpdateCounterPressure(elapsedClockSeconds, cutoff, i);
                     UpdateCylinders(elapsedClockSeconds, throttle, cutoff, absSpeedMpS, i);
                 }
                 else if (SteamEngines[i].AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)  // Booster Engine
@@ -4876,55 +4880,6 @@ private void UpdateSuperHeat()
             }
 
             SuperheaterSteamUsageFactor = MathHelper.Clamp(SuperheaterSteamUsageFactor, 0.60f, SuperheaterSteamUsageFactor); // ensure factor does not go below 0.6, as this represents base steam consumption by the cylinders.
-
-        }
-
-        /// <summary>
-        /// Calculate the counter pressure to be used by a locomotive as a braking effect
-        /// To do this we first calculate the MEP air pressure of compressed air with each stroke, then we calculate the resulting "resisting" tractive force
-        /// </summary>
-        private void UpdateCounterPressure(float elapsedClockSeconds, float cutoff, int numberofengine)
-        {
-            SteamLocomotiveRetardingDynamicBrakeForceN = 0;
-
-            float currentDynamicBrakeFraction = DynamicBrakePercent / 100;
-
-            if (currentDynamicBrakeFraction > 0 && absSpeedMpS >0)
-            {
-                float CylinderVolumePoint_compression = (currentDynamicBrakeFraction * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM)) + CylinderClearancePC;
-                float CylinderVolumePoint_release = (Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) + 2 * CylinderClearancePC) - CylinderVolumePoint_compression;
-
-//                Trace.TraceInformation("Vol-release {0} Vol-compression {1} Stroke {2}", CylinderVolumePoint_release, CylinderVolumePoint_compression, Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM));
-
-                // Ratio of compression = stroke during compression = stroke @ start of compression / stroke and end of compression
-                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));
-
-//                Trace.TraceInformation("MEPcomp {0} Log {1} CompRatio {2}", CompMeanPressure_compressionAtmPSI, (float)Math.Log(CylinderRatio_compression), CylinderRatio_compression);
-
-                float CylinderWork_compression_InLbs = CompMeanPressure_compressionAtmPSI * CylinderVolumePoint_compression;
-                float CylinderWork_release_InLbs = CompMeanPressure_releaseAtmPSI * CylinderVolumePoint_release;
-
-//                Trace.TraceInformation("Workc {0} Workr {1} Pc {2} Pr {3}", CylinderWork_compression_InLbs, CylinderWork_release_InLbs, CompMeanPressure_compressionAtmPSI, CompMeanPressure_releaseAtmPSI);
-
-                float TotalWorkCounterPressure = CylinderWork_compression_InLbs + CylinderWork_release_InLbs;
-
-                float CounterPressureMEP = TotalWorkCounterPressure / Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM);
-
-                // Calculate tractive retarding force
-                SteamLocomotiveRetardingDynamicBrakeForceN = N.FromLbf(CounterPressureMEP * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) / Me.ToIn(SteamEngines[numberofengine].AttachedAxle.CogWheelRadiusM));
-
-//                Trace.TraceInformation("CogRetardForce {0} throttle {1} MEP {2} Ratio-Comp {3} Ratio-Rel {4}", N.ToLbf(SteamLocomotiveRetardingDynamicBrakeForceN), throttle, CounterPressureMEP, CylinderRatio_compression, CylinderRatio_release);
-            }
-            else
-            {
-                SteamLocomotiveRetardingDynamicBrakeForceN = 0;
-            }
-
-
         }
 
         private void UpdateCylinders(float elapsedClockSeconds, float throttle, float cutoff, float absSpeedMpS, int numberofengine)
@@ -6043,6 +5998,51 @@ private void UpdateCylinders(float elapsedClockSeconds, float throttle, float cu
 
             SteamReleasePressure_AtmPSI = SteamEngines[numberofengine].Pressure_c_AtmPSI; // for steam and smoke effects
 
+
+            // Calculate the counter pressure to be used by a locomotive as a braking effect
+            // To do this we first calculate the MEP air pressure of compressed air with each stroke, then we calculate the resulting "resisting" tractive force
+
+            SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN = 0;
+
+                float currentDynamicBrakeFraction = DynamicBrakePercent / 100;
+
+                if (currentDynamicBrakeFraction > 0 && absSpeedMpS > 0 && cutoff != 0)
+                {
+                    float absCutoff = Math.Abs(cutoff);
+                    float CylinderVolumePoint_compression = (currentDynamicBrakeFraction * absCutoff * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM)) + CylinderClearancePC;
+                    float CylinderVolumePoint_release = (Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) + 2 * CylinderClearancePC) - CylinderVolumePoint_compression;
+
+                    //                Trace.TraceInformation("Vol-release {0} Vol-compression {1} Stroke {2}", CylinderVolumePoint_release, CylinderVolumePoint_compression, Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM));
+
+                    // Ratio of compression = stroke during compression = stroke @ start of compression / stroke and end of compression
+                    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));
+
+                    //                Trace.TraceInformation("MEPcomp {0} Log {1} CompRatio {2}", CompMeanPressure_compressionAtmPSI, (float)Math.Log(CylinderRatio_compression), CylinderRatio_compression);
+
+                    float CylinderWork_compression_InLbs = CompMeanPressure_compressionAtmPSI * CylinderVolumePoint_compression;
+                    float CylinderWork_release_InLbs = CompMeanPressure_releaseAtmPSI * CylinderVolumePoint_release;
+
+                    //                Trace.TraceInformation("Workc {0} Workr {1} Pc {2} Pr {3}", CylinderWork_compression_InLbs, CylinderWork_release_InLbs, CompMeanPressure_compressionAtmPSI, CompMeanPressure_releaseAtmPSI);
+
+                    float TotalWorkCounterPressure = CylinderWork_compression_InLbs + CylinderWork_release_InLbs;
+
+                    float CounterPressureMEP = TotalWorkCounterPressure / Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM);
+
+                // Assume no impact of "return" stroke as air is being drawn into cylinder
+
+                // 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));
+
+                    //                Trace.TraceInformation("CogRetardForce {0} throttle {1} MEP {2} Ratio-Comp {3} Ratio-Rel {4}", N.ToLbf(SteamLocomotiveRetardingDynamicBrakeForceN), throttle, CounterPressureMEP, CylinderRatio_compression, CylinderRatio_release);
+                }
+                else
+                {
+                SteamEngines[numberofengine].CylinderCounterPressureBrakeForceN = 0;
+                }
         }
 
 
@@ -6562,6 +6562,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
         protected override void UpdateTractiveForce(float elapsedClockSeconds, float locomotivethrottle, float AbsSpeedMpS, float AbsWheelSpeedMpS)
         {
             TractiveForceN = 0; // reset tractiveforceN in preparation to calculating a new value
+            DynamicBrakeForceN = 0;
             if (!Simulator.UseAdvancedAdhesion && Simulator.Settings.SimpleControlPhysics)
             {
                 // Simple adhesion
@@ -6587,11 +6588,31 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             {
                 ApplyDirectionToTractiveForce(ref SteamEngines[i].RealTractiveForceN, i);
 
-                TractiveForceN += SteamEngines[i].RealTractiveForceN;
+                TractiveForceN += SteamEngines[i].RealTractiveForceN + DynamicBrakeForceN;
 
                 if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics)
                 {
                     SteamEngines[i].AttachedAxle.DriveForceN = SteamEngines[i].RealTractiveForceN;
+
+                    // Counter Pressure braking system
+
+                    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 (DynamicBrakeForceN > 0)
+                    {
+
+                        SteamEngines[i].AttachedAxle.DriveForceN = DynamicBrakeForceN;
+                    }
+
                     UpdateAxleDriveForce();
 
                     SteamEngines[i].DisplayTractiveForceN = SteamEngines[i].AverageTractiveForceN;
@@ -6641,25 +6662,12 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             MaxSpeedMpS = Me.FromMi(pS.FrompH(MaxLocoSpeedMpH)); // Note this is not the true max velocity of the locomotive, but  the speed at which max HP is reached
 
             // Set tractive force to zero if throttle is closed
-            if (locomotivethrottle < 0.001)
+            if (locomotivethrottle < 0.001 && !CounterPressureBrakingFitted)
             {
                 TractiveForceN = 0;
             }
-
-        //    if (DynamicBrakePercent > 0 && DynamicBrake)
-
-            if (DynamicBrakePercent > 0)
-            {
-                DynamicBrakeForceN = SteamLocomotiveRetardingDynamicBrakeForceN;
-            }
-            else
-            {
-                DynamicBrakeForceN = 0;
-            }
-
         }
 
-
         /// <summary>
         /// This function applies a sign to the motive force as a function of the direction of the train.
         /// </summary>
@@ -8443,7 +8451,6 @@ public override string GetDebugStatus()
                 FormatStrings.mm);
             }
 
-
             if (SteamIsAuxTenderCoupled)
             {
                 status.AppendFormat("{0}\t{1}\t{2}\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8}\t\t{9}\t{10}\t\t{11}\t{12:N0}\t{13}\t{14:N0}\n",

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs

@@ -361,6 +361,11 @@ public enum AuxiliarySteamEngineTypes
         /// </summary>
         public float DisplayTractiveForceN;
 
+        /// <summary>
+        /// Steam Engine counter pressure barking force
+        /// </summary>
+        public float CylinderCounterPressureBrakeForceN;
+
         /// <summary>
         /// Steam Engine maximum indicated horsepower
         /// </summary>

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs

@@ -912,7 +912,6 @@ public void Parse(STFReader stf)
                         break;
                     case "cogwheelfitted":
                         CogWheelFitted = stf.ReadBoolBlock(false);
-                        Trace.TraceInformation("CogWheel - {0}", CogWheelFitted);
                         break;
                     case "cogwheelradius":
                         CogWheelRadiusM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null);