Allow main resevoir pipe to be set differently to main reservoir

Author: peternewell

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -72,6 +72,7 @@ public enum CABViewControlTypes
         NONE,
         SPEEDOMETER,
         MAIN_RES,
+        MAIN_RES_PIPE,
         EQ_RES,
         BRAKE_CYL,
         BRAKE_PIPE,

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -3801,7 +3801,7 @@ public void UnconditionalInitializeBrakes()
                     if (MUDynamicBrakePercent == 0)
                         MUDynamicBrakePercent = -1;
                 }
-                BrakeLine2PressurePSI = maxPressurePSI;
+                BrakeLine2PressurePSI = lead.MaximumMainReservoirPipePressurePSI;
                 ConnectBrakeHoses();
             }
             else

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -131,6 +131,7 @@ public enum SoundState
         public float MaxSpeedMpS = 1e3f;
         public float UnloadingSpeedMpS;
         public float MainResPressurePSI = 130;
+        public float MaximumMainReservoirPipePressurePSI;
         public bool CompressorIsOn;
         public float AverageForceN;
         public float PowerOnDelayS;
@@ -834,6 +835,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                 case "engine(enginecontrollers(combined_control": ParseCombData(lowercasetoken, stf); break;
                 case "engine(airbrakesmainresvolume": MainResVolumeM3 = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
                 case "engine(airbrakesmainmaxairpressure": MainResPressurePSI = MaxMainResPressurePSI = stf.ReadFloatBlock(STFReader.UNITS.PressureDefaultPSI, null); break;
+                case "engine(airbrakemaxmainrespipepressure": MaximumMainReservoirPipePressurePSI = stf.ReadFloatBlock(STFReader.UNITS.PressureDefaultPSI, null); break;
                 case "engine(airbrakescompressorrestartpressure": CompressorRestartPressurePSI = stf.ReadFloatBlock(STFReader.UNITS.PressureDefaultPSI, null); break;
                 case "engine(airbrakesaircompressorpowerrating": CompressorChargingRateM3pS = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
                 case "engine(trainpipeleakrate": TrainBrakePipeLeakPSIorInHgpS = stf.ReadFloatBlock(STFReader.UNITS.PressureRateDefaultPSIpS, null); break;
@@ -1018,7 +1020,8 @@ public override void Copy(MSTSWagon copy)
             CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
             TrainBrakePipeLeakPSIorInHgpS = locoCopy.TrainBrakePipeLeakPSIorInHgpS;
             MaxMainResPressurePSI = locoCopy.MaxMainResPressurePSI;
-            MainResPressurePSI = MaxMainResPressurePSI;
+            MainResPressurePSI = locoCopy.MaxMainResPressurePSI;
+            MaximumMainReservoirPipePressurePSI = locoCopy.MaximumMainReservoirPipePressurePSI;
             MainResVolumeM3 = locoCopy.MainResVolumeM3;
             MainResChargingRatePSIpS = locoCopy.MainResChargingRatePSIpS;
             BrakePipeDischargeTimeFactor = locoCopy.BrakePipeDischargeTimeFactor;
@@ -1382,6 +1385,11 @@ public override void Initialize()
                 }
             }
 
+            if (MaximumMainReservoirPipePressurePSI == 0)
+            {
+                MaximumMainReservoirPipePressurePSI = MaxMainResPressurePSI;
+            }
+
             // Check TrainBrakesControllerMaxSystemPressure parameter for "correct" value 
             // This is only done for vacuum brakes as the UoM can be confusing - it defaults to psi due to way parameter is read, and if units are entered then a InHG value can be incorrectly converted.
             if ((BrakeSystem is VacuumSinglePipe))
@@ -4434,6 +4442,11 @@ public virtual float GetDataOf(CabViewControl cvc)
                         data = ConvertFromPSI(cvc, MainResPressurePSI);
                         break;
                     }
+                case CABViewControlTypes.MAIN_RES_PIPE:
+                    {
+                        data = ConvertFromPSI(cvc, this.BrakeSystem.BrakeLine2PressurePSI);
+                        break;
+                    }
                 case CABViewControlTypes.BRAKE_PIPE:
                     {
                         data = ConvertFromPSI(cvc, this.BrakeSystem.BrakeLine1PressurePSI);

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

@@ -452,6 +452,8 @@ public override void Update(float elapsedClockSeconds)
                     BrakeLine1PressurePSI += dp * AuxBrakeLineVolumeRatio;
                 }
             }
+
+            // Charge Auxiliary reservoir for MRP
             if (TwoPipes
                 && !NoMRPAuxResCharging
                 && AuxResPressurePSI < BrakeLine2PressurePSI
@@ -796,7 +798,9 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
             int last = -1;
             train.FindLeadLocomotives(ref first, ref last);
             float sumpv = 0;
+            float summainrespv = 0;
             float sumv = 0;
+            float summainresv = 0;
             int continuousFromInclusive = 0;
             int continuousToExclusive = train.Cars.Count;
             for (int i = 0; i < train.Cars.Count; i++)
@@ -823,11 +827,18 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
                 {
                     sumv += brakeSystem.BrakePipeVolumeM3;
                     sumpv += brakeSystem.BrakePipeVolumeM3 * brakeSystem.BrakeLine2PressurePSI;
+
+                    summainresv += brakeSystem.BrakePipeVolumeM3;
+                    summainrespv += brakeSystem.BrakePipeVolumeM3 * (train.Cars[i] as MSTSLocomotive).MainResPressurePSI;
+
                     var eng = train.Cars[i] as MSTSLocomotive;
                     if (eng != null)
                     {
                         sumv += eng.MainResVolumeM3;
                         sumpv += eng.MainResVolumeM3 * eng.MainResPressurePSI;
+
+                        summainresv += eng.MainResVolumeM3;
+                        summainrespv += eng.MainResVolumeM3 * eng.MainResPressurePSI;
                     }
                 }
 
@@ -876,24 +887,38 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
                 }
             }
             if (sumv > 0)
+            {
                 sumpv /= sumv;
+                summainrespv /= summainresv;
+            }
 
             if (!train.Cars[continuousFromInclusive].BrakeSystem.FrontBrakeHoseConnected && train.Cars[continuousFromInclusive].BrakeSystem.AngleCockAOpen
                 || (continuousToExclusive == train.Cars.Count || !train.Cars[continuousToExclusive].BrakeSystem.FrontBrakeHoseConnected) && train.Cars[continuousToExclusive - 1].BrakeSystem.AngleCockBOpen)
+            {
                 sumpv = 0;
+                summainrespv = 0;
+            }
 
             // Propagate main reservoir pipe (2) data
             train.BrakeLine2PressurePSI = sumpv;
             for (int i = 0; i < train.Cars.Count; i++)
             {
                 if (first <= i && i <= last || twoPipes && continuousFromInclusive <= i && i < continuousToExclusive)
                 {
+                    if (sumpv > (train.Cars[i] as MSTSLocomotive).MaximumMainReservoirPipePressurePSI)
+                    {
+                        sumpv = (train.Cars[i] as MSTSLocomotive).MaximumMainReservoirPipePressurePSI;
+                    }
+
                     train.Cars[i].BrakeSystem.BrakeLine2PressurePSI = sumpv;
                     if (sumpv != 0 && train.Cars[i] is MSTSLocomotive)
-                        (train.Cars[i] as MSTSLocomotive).MainResPressurePSI = sumpv;
+                        (train.Cars[i] as MSTSLocomotive).MainResPressurePSI = summainrespv;
                 }
                 else
-                    train.Cars[i].BrakeSystem.BrakeLine2PressurePSI = train.Cars[i] is MSTSLocomotive ? (train.Cars[i] as MSTSLocomotive).MainResPressurePSI : 0;
+                {
+                    // train.Cars[i].BrakeSystem.BrakeLine2PressurePSI = train.Cars[i] is MSTSLocomotive ? (train.Cars[i] as MSTSLocomotive).MainResPressurePSI : 0;
+                    train.Cars[i].BrakeSystem.BrakeLine2PressurePSI = train.Cars[i] is MSTSLocomotive ? (train.Cars[i] as MSTSLocomotive).MaximumMainReservoirPipePressurePSI : 0;
+                }
             }
         }