Automatic merge of T1.6-rc4-34-g041d7ab18 and 14 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at aa72c13: Automatic speed control
- Pull request #1104 at 86d38a2: Handle simple adhesion within the axle module
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging
- Pull request #1139 at b47224d: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. 
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 58de4c3: Particle Emitter Overhaul

Author: openrails-bot

Source/Documentation/Manual/options.rst

@@ -863,23 +863,21 @@ are a problem for OR, which has a more sophisticated braking model. The
 problem usually is that the train brakes require a long time to release,
 and in some times do not release at all.
 
+.. index::
+   single: AirBrakesAirCompressorPowerRating
+
 The following checks and corrections are performed if the option is
-checked:
+checked (only for single-pipe brake system):
 
 - if the compressor restart pressure is smaller or very near to the max
   system pressure, the compressor restart pressure and if necessary the max
-  main reservoir pressure are increased (single pipe air brakes only)
+  main reservoir pressure are increased;
 - if the main reservoir volume is smaller than 0.3 m\ :sup:`3` and the
   engine mass is higher than 20 tons, the reservoir volume is raised to 0.78
-  m\ :sup:`3`
-- the maximum brake cylinder pressure will be reduced to the maximum pressure
-  possible from a full service train brake application if it was set above this
-  amount
-- any brake pipe leakage specified by ``TrainPipeLeakRate`` is limited to 2.5 psi/minute
-- the dynamic brake delay on electric locomotives is reduced to 2 seconds
-  if it was defined to be above 4 seconds
-- dynamic brake force left at the default value of 20kN will be increased to
-  half the locomotive's continuous force, or 150kN, whichever is lower
+  m\ :sup:`3`;
+- the charging rate of the reservoir is derived from the .eng parameter
+  ``AirBrakesAirCompressorPowerRating`` (if this generates a value greater
+  than 0.5 psi/s) instead of using a default value.
 
 For a full list of parameters, see :ref:`Developing ORTS Content - Parameters and Tokens<parameters_and_tokens>`
 

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

@@ -389,7 +389,7 @@ public float OdometerM
         public float CompressorRestartPressurePSI = 110;
         public float CompressorChargingRateM3pS = 0.075f;
         public bool CompressorIsMUControlled = false;
-        public float MainResChargingRatePSIpS = -1.0f;
+        public float MainResChargingRatePSIpS = 0.4f;
         public float EngineBrakeReleaseRatePSIpS = 12.5f;
         public float EngineBrakeApplyRatePSIpS = 12.5f;
         public float BrakePipeTimeFactorS = 0.0015f;
@@ -1887,6 +1887,21 @@ public override void Initialize()
                 }
             }
 
+            // Initialise Train Pipe Leak Rate
+            if (TrainBrakePipeLeakPSIorInHgpS == 0) // Check to see if TrainBrakePipeLeakPSIorInHgpS has been set in the ENG file.
+            {
+                // Set Default Train Brake Pipe Leak depending upon whether locomotive has Vacuum or air brakes - overwritten by ENG file setting.
+                // Default currently set to zero - means that by default function is off, and a value must be entered into the ENG file to get it to work
+                if ((BrakeSystem is VacuumSinglePipe))
+                {
+                    TrainBrakePipeLeakPSIorInHgpS = 0.0f; // Vacuum brakes
+                }
+                else
+                {
+                    TrainBrakePipeLeakPSIorInHgpS = 0.0f; // Air brakes
+                }
+            }
+
             if (DynamicBrakeEngineBrakeReplacement && DynamicBrakeEngineBrakeReplacementSpeed == 0)
             {
                 DynamicBrakeEngineBrakeReplacementSpeed = DynamicBrakeSpeed2MpS;
@@ -2008,18 +2023,16 @@ protected void CorrectBrakingParams()
                     // correct questionable MaxCylPressurePSI
                     BrakeSystem.CorrectMaxCylPressurePSI(this);
                 }
-                // Limit brake pipe leak to 2.5 psi/min (~ 1 bar every 6 minutes) to prevent stuck brakes
-                if (TrainBrakePipeLeakPSIorInHgpS > 2.5f / 60f)
-                    TrainBrakePipeLeakPSIorInHgpS = 2.5f / 60f;
-            }
-            // No OR compressor speed defined, use MSTS compressor speed or 0.025 m^3/s (whichever is higher)
-            if (MainResChargingRatePSIpS < 0) 
+                if (MainResChargingRatePSIpS <= 0)
                 {
-                MainResChargingRatePSIpS = Math.Max(0.025f, CompressorChargingRateM3pS) * OneAtmospherePSI / MainResVolumeM3;
+                    MainResChargingRatePSIpS = Math.Max(0.5f, (CompressorChargingRateM3pS * Bar.ToPSI(1)) / MainResVolumeM3);
                 }
+            }
+            else if (MainResChargingRatePSIpS <= 0) MainResChargingRatePSIpS = 0.4f;
 
             // Corrections for dynamic braking parameters
 
+            if (this is MSTSElectricLocomotive && DynamicBrakeDelayS > 4) DynamicBrakeDelayS = 2; // Electric locomotives have short engaging delays
             if (DynamicBrakeSpeed2MpS > 0 && DynamicBrakeSpeed3MpS > 0 && DynamicBrakeSpeed2MpS > DynamicBrakeSpeed3MpS)
             {
                 // also exchanging DynamicBrakesMaximumEffectiveSpeed with DynamicBrakesFadingSpeed is a frequent error that upsets operation of
@@ -2030,9 +2043,6 @@ protected void CorrectBrakingParams()
             }
             if (Simulator.Settings.CorrectQuestionableBrakingParams)
             {
-                if (this is MSTSElectricLocomotive && DynamicBrakeDelayS > 4)
-                    DynamicBrakeDelayS = 2; // Electric locomotives have short engaging delays
-
                 if (MaxDynamicBrakeForceN > 0 && MaxContinuousForceN > 0 &&
                 (MaxDynamicBrakeForceN / MaxContinuousForceN < 0.3f && MaxDynamicBrakeForceN == 20000))
                     MaxDynamicBrakeForceN = Math.Min (MaxContinuousForceN * 0.5f, 150000); // 20000 is suggested as standard value in the MSTS documentation, but in general it is a too low value

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs

@@ -105,11 +105,6 @@ public override void UpdatePressure(ref float pressureBar, float elapsedClockSec
                 {
                     PreviousNotchPosition = NotchController.GetCurrentNotch();
                     BrakeControllerInitialised = true;
-                    if (PreviousNotchPosition != null)
-                    {
-                        var type = PreviousNotchPosition.Type;
-                        if (type == ControllerState.Lap || type == ControllerState.MinimalReduction) EnforceMinimalReduction = true;
-                    }
                 }
                 if (notch == null)
                 {

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

@@ -37,12 +37,14 @@
 using Orts.Common;
 using Orts.Formats.Msts;
 using Orts.Parsers.Msts;
+using Orts.Simulation.AIs;
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks.Coupling;
 using Orts.Simulation.RollingStocks.SubSystems;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using Orts.Simulation.Signalling;
+using Orts.Simulation.Timetables;
 using ORTS.Common;
 using ORTS.Scripting.Api;
 using System;
@@ -2075,13 +2077,14 @@ public virtual void UpdateCurveForce(float elapsedClockSeconds)
                 // Base Curve Resistance (from refernce i)) = (Vehicle mass x Coeff Friction) * (Track Gauge + Vehicle Fixed Wheelbase) / (2 * curve radius)
                 // Vehicle Fixed Wheel base is the distance between the wheels, ie bogie or fixed wheels
 
-                float rBaseWagonN = GravitationalAccelerationMpS2 * MassKG * Train.WagonCoefficientFriction * (TrackGaugeM + RigidWheelBaseM) / (2.0f * CurrentCurveRadiusM);
+                var rBaseWagonN = 9.81f * MassKG * Train.WagonCoefficientFriction * (TrackGaugeM + RigidWheelBaseM) / (2.0f * CurrentCurveRadiusM);
 
                 // Speed Curve Resistance (from reference ii) - second term only) = ((Speed^2 / Curve Radius) - (Superelevation / Track Gauge) * Gravitational acceleration) * Constant
 
-                float speedConstant = 1.5f;
-                float rspeedKgpTonne = speedConstant * Math.Abs((SpeedMpS * SpeedMpS / CurrentCurveRadiusM) - (GravitationalAccelerationMpS2 * SuperElevationM / TrackGaugeM));
-                float rSpeedWagonN = GravitationalAccelerationMpS2 * (Kg.ToTonne(MassKG) * rspeedKgpTonne);
+                var speedConstant = 1.5f;
+                var MToMM = 1000;
+                var rspeedKgpTonne = speedConstant * Math.Abs((SpeedMpS * SpeedMpS / CurrentCurveRadiusM) - ((MToMM * SuperElevationM / MToMM * TrackGaugeM) * GravitationalAccelerationMpS2));
+                var rSpeedWagonN = GravitationalAccelerationMpS2 * (Kg.ToTonne(MassKG) * rspeedKgpTonne);
 
                 CurveForceN = rBaseWagonN + rSpeedWagonN;
             }