Add rate for emergency brake actuation of triple valves

Author: cesarBLG

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -50,6 +50,7 @@ public class AirSinglePipe : MSTSBrakeSystem
         protected float MaxApplicationRatePSIpS = .9f;
         protected float MaxAuxilaryChargingRatePSIpS = 1.684f;
         protected float BrakeInsensitivityPSIpS = 0;
+        protected float EmergencyValveActuationRatePSIpS = 0;
         protected float EmergResChargingRatePSIpS = 1.684f;
         protected float EmergAuxVolumeRatio = 1.4f;
         protected string DebugType = string.Empty;
@@ -62,6 +63,7 @@ public class AirSinglePipe : MSTSBrakeSystem
         protected float SoundTriggerCounter = 0;
         protected float prevCylPressurePSI = 0f;
         protected float prevBrakePipePressurePSI = 0f;
+        protected float prevBrakePipePressurePSI_sound = 0f;
         protected bool BailOffOn;
 
 
@@ -113,6 +115,7 @@ public override void InitializeFromCopy(BrakeSystem copy)
             MaxApplicationRatePSIpS = thiscopy.MaxApplicationRatePSIpS;
             MaxAuxilaryChargingRatePSIpS = thiscopy.MaxAuxilaryChargingRatePSIpS;
             BrakeInsensitivityPSIpS = thiscopy.BrakeInsensitivityPSIpS;
+            EmergencyValveActuationRatePSIpS = thiscopy.EmergencyValveActuationRatePSIpS;
             EmergResChargingRatePSIpS = thiscopy.EmergResChargingRatePSIpS;
             EmergAuxVolumeRatio = thiscopy.EmergAuxVolumeRatio;
             TwoPipes = thiscopy.TwoPipes;
@@ -250,6 +253,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                 // OpenRails specific parameters
                 case "wagon(brakepipevolume": BrakePipeVolumeM3 = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
                 case "wagon(ortsbrakeinsensitivity": BrakeInsensitivityPSIpS = stf.ReadFloatBlock(STFReader.UNITS.PressureRateDefaultPSIpS, null); break;
+                case "wagon(ortsemergencyvalveactuationrate": EmergencyValveActuationRatePSIpS = stf.ReadFloatBlock(STFReader.UNITS.PressureRateDefaultPSIpS, 15f); break;
             }
         }
 
@@ -349,20 +353,37 @@ public override void LocoInitializeMoving() // starting conditions when starting
         {
         }
 
-        public virtual void UpdateTripleValveState(float targetPressurePSI)
+        public void UpdateTripleValveState(float elapsedClockSeconds)
         {
-            if (BrakeLine1PressurePSI < FullServPressurePSI - 1)
-                TripleValveState = ValveState.Emergency;
-            else if (BrakeLine1PressurePSI > AuxResPressurePSI + 1)
-                TripleValveState = ValveState.Release;
-            else if (TripleValveState == ValveState.Emergency && BrakeLine1PressurePSI > AuxResPressurePSI)
-                TripleValveState = ValveState.Release;
-            else if (ControlResPressurePSI > 70 && BrakeLine1PressurePSI > ControlResPressurePSI * 0.97f) // UIC regulation: for 5 bar systems, release if > 4.85 bar
-                TripleValveState = ValveState.Release;
-            else if (TripleValveState != ValveState.Emergency && BrakeLine1PressurePSI < AuxResPressurePSI - 1)
-                TripleValveState = ValveState.Apply;
-            else if (TripleValveState == ValveState.Apply && BrakeLine1PressurePSI >= AuxResPressurePSI)
-                TripleValveState = ValveState.Lap;
+            if ((Car as MSTSWagon).DistributorPresent)
+            {
+                float targetPressurePSI = (ControlResPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio;
+                if (targetPressurePSI > AutoCylPressurePSI && (prevBrakePipePressurePSI - BrakeLine1PressurePSI) > Math.Max(elapsedClockSeconds, 0.0001f) * EmergencyValveActuationRatePSIpS)
+                    TripleValveState = ValveState.Emergency;
+                else if (targetPressurePSI < AutoCylPressurePSI - (TripleValveState != ValveState.Release ? 2.2f : 0f)
+                    || targetPressurePSI < 2.2f) // The latter is a UIC regulation (0.15 bar)
+                    TripleValveState = ValveState.Release;
+                else if (!BailOffOn && TripleValveState != ValveState.Emergency && targetPressurePSI > AutoCylPressurePSI + (TripleValveState != ValveState.Apply ? 2.2f : 0f))
+                    TripleValveState = ValveState.Apply;
+                else
+                    TripleValveState = ValveState.Lap;
+            }
+            else
+            {
+                if (BrakeLine1PressurePSI < AuxResPressurePSI - 1 && (prevBrakePipePressurePSI - BrakeLine1PressurePSI) > Math.Max(elapsedClockSeconds, 0.0001f) * EmergencyValveActuationRatePSIpS)
+                    TripleValveState = ValveState.Emergency;
+                else if (BrakeLine1PressurePSI > AuxResPressurePSI + 1)
+                    TripleValveState = ValveState.Release;
+                else if (TripleValveState == ValveState.Emergency && BrakeLine1PressurePSI > AuxResPressurePSI)
+                    TripleValveState = ValveState.Release;
+                else if (ControlResPressurePSI > 70 && BrakeLine1PressurePSI > ControlResPressurePSI * 0.97f) // UIC regulation: for 5 bar systems, release if > 4.85 bar
+                    TripleValveState = ValveState.Release;
+                else if (TripleValveState != ValveState.Emergency && BrakeLine1PressurePSI < AuxResPressurePSI - 1)
+                    TripleValveState = ValveState.Apply;
+                else if (TripleValveState == ValveState.Apply && BrakeLine1PressurePSI >= AuxResPressurePSI)
+                    TripleValveState = ValveState.Lap;
+            }
+            prevBrakePipePressurePSI = BrakeLine1PressurePSI;
         }
 
         public override void Update(float elapsedClockSeconds)
@@ -393,15 +414,15 @@ public override void Update(float elapsedClockSeconds)
                 }
             }
             else
-                UpdateTripleValveState(threshold);
+                UpdateTripleValveState(elapsedClockSeconds);
 
             // triple valve is set to charge the brake cylinder
             if ((TripleValveState == ValveState.Apply || TripleValveState == ValveState.Emergency) && !Car.WheelBrakeSlideProtectionActive)
             {
                 float dp = elapsedClockSeconds * MaxApplicationRatePSIpS;
                 if (AuxResPressurePSI - dp / AuxCylVolumeRatio < AutoCylPressurePSI + dp)
                     dp = (AuxResPressurePSI - AutoCylPressurePSI) * AuxCylVolumeRatio / (1 + AuxCylVolumeRatio);
-                if ((Car as MSTSWagon).DistributorPresent && dp > threshold - AutoCylPressurePSI)
+                if ((Car as MSTSWagon).DistributorPresent && TripleValveState != ValveState.Emergency && dp > threshold - AutoCylPressurePSI)
                     dp = threshold - AutoCylPressurePSI;
                 if (AutoCylPressurePSI + dp > MaxCylPressurePSI)
                     dp = MaxCylPressurePSI - AutoCylPressurePSI;
@@ -469,9 +490,12 @@ public override void Update(float elapsedClockSeconds)
             float minCylPressurePSI = Math.Max(threshold, RetainerPressureThresholdPSI);
             if (TripleValveState == ValveState.Release && HoldingValve == ValveState.Release && AutoCylPressurePSI > minCylPressurePSI)
             {
-                AutoCylPressurePSI -= elapsedClockSeconds * ReleaseRatePSIpS;
-                if (AutoCylPressurePSI < minCylPressurePSI)
-                    AutoCylPressurePSI = minCylPressurePSI;
+                float dp = elapsedClockSeconds * ReleaseRatePSIpS;
+                if (AutoCylPressurePSI - dp < minCylPressurePSI)
+                    dp = AutoCylPressurePSI-minCylPressurePSI;
+                if (dp < 0)
+                    dp = 0;
+                AutoCylPressurePSI -= dp;
             }
 
             // Charge Auxiliary reservoir for MRP
@@ -616,11 +640,11 @@ public override void Update(float elapsedClockSeconds)
                     Car.SignalEvent(Event.TrainBrakePressureStoppedChanging);
                 }
 
-                if ( Math.Abs(BrakeLine1PressurePSI - prevBrakePipePressurePSI) > 0.1f /*BrakeLine1PressurePSI > prevBrakePipePressurePSI*/)
+                if ( Math.Abs(BrakeLine1PressurePSI - prevBrakePipePressurePSI_sound) > 0.1f /*BrakeLine1PressurePSI > prevBrakePipePressurePSI*/)
                 {
                     if (!BrakePipePressureChanging)
                     {
-                        if (BrakeLine1PressurePSI > prevBrakePipePressurePSI)
+                        if (BrakeLine1PressurePSI > prevBrakePipePressurePSI_sound)
                             Car.SignalEvent(Event.BrakePipePressureIncrease);
                         else
                             Car.SignalEvent(Event.BrakePipePressureDecrease);
@@ -634,7 +658,7 @@ public override void Update(float elapsedClockSeconds)
                     Car.SignalEvent(Event.BrakePipePressureStoppedChanging);
                 }
                 prevCylPressurePSI = AutoCylPressurePSI;
-                prevBrakePipePressurePSI = BrakeLine1PressurePSI;
+                prevBrakePipePressurePSI_sound = BrakeLine1PressurePSI;
 
                 var lead = Car as MSTSLocomotive;
 

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirTwinPipe.cs

@@ -26,22 +26,5 @@ public AirTwinPipe(TrainCar car)
             TwoPipes = true;
             DebugType = "2P";
         }
-        public override void UpdateTripleValveState(float targetPressurePSI)
-        {
-            if (!(Car as MSTSWagon).DistributorPresent)
-            {
-                base.UpdateTripleValveState(targetPressurePSI);
-            }
-            else
-            {
-                if (targetPressurePSI < AutoCylPressurePSI - (TripleValveState != ValveState.Release ? 2.2f : 0f)
-                    || targetPressurePSI < 2.2f) // The latter is a UIC regulation (0.15 bar)
-                    TripleValveState = ValveState.Release;
-                else if (!BailOffOn && targetPressurePSI > AutoCylPressurePSI + (TripleValveState != ValveState.Apply ? 2.2f : 0f))
-                    TripleValveState = ValveState.Apply;
-                else
-                    TripleValveState = ValveState.Lap;
-            }
-        }
     }
 }