Automatic merge of T1.6-rc8-59-g2eb7441b08 and 11 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 9b80fac: Automatic speed control
- Pull request #1104 at 7919243: Handle simple adhesion within the axle module
- 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 #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

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

@@ -6605,8 +6605,8 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds)
                 IndicatedHorsePowerHP += engine.IndicatedHorsePowerHP;
                 IndicatedHorsePowerHP = MathHelper.Clamp(IndicatedHorsePowerHP, 0, IndicatedHorsePowerHP);
             }
-                //TODO - identify the maximum value for display?? 
-                PistonSpeedFtpMin = SteamEngines[0].PistonSpeedFtpMin;
+            //TODO - identify the maximum value for display?? 
+            PistonSpeedFtpMin = SteamEngines[0].PistonSpeedFtpMin;
 
             // Find the maximum TE for debug i.e. @ start and full throttle
             if (AbsTractionSpeedMpS < 1.0)
@@ -6724,8 +6724,8 @@ protected override void UpdateAxles(float elapsedClockSeconds)
                 axle.CurrentCurveRadiusM = CurrentCurveRadiusM;
                 axle.BogieRigidWheelBaseM = RigidWheelBaseM;
             }
-                foreach (var engine in SteamEngines)
-                {
+            foreach (var engine in SteamEngines)
+            {
                 var axle = engine.AttachedAxle;
                 if (SteamEngineType == SteamEngineTypes.Geared || engine.AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)
                 // geared locomotive or booster locomotive
@@ -6739,7 +6739,7 @@ protected override void UpdateAxles(float elapsedClockSeconds)
                     float TotalWheelMomentofInertia = WheelMomentInertia + AxleMomentInertia; // Total MoI for generic wheelset
                     float TotalMomentInertia = TotalWheelMomentofInertia;
                     axle.InertiaKgm2 = TotalMomentInertia;
- 
+
                     // Calculate internal resistance - IR = 3.8 * diameter of cylinder^2 * stroke * dia of drivers (all in inches) - This should reduce wheel force
                     axle.FrictionN = N.FromLbf(3.8f * Me.ToIn(engine.CylindersDiameterM) * Me.ToIn(engine.CylindersDiameterM) * Me.ToIn(engine.CylindersStrokeM) / (Me.ToIn(axle.WheelRadiusM * 2.0f)));
                 }
@@ -6758,7 +6758,7 @@ protected override void UpdateAxles(float elapsedClockSeconds)
                     float WheelMomentInertia = (wheelMassKG * axle.WheelRadiusM * axle.WheelRadiusM) / 2.0f;
                     float AxleMomentInertia = (AxleMassKG * AxleRadiusM * AxleRadiusM) / 2.0f;
                     float TotalWheelMomentofInertia = WheelMomentInertia + AxleMomentInertia; // Total MoI for generic wheelset
-                    
+
                     // The moment of inertia needs to be increased by the number of wheels in each set
                     TotalWheelMomentofInertia *= engine.AttachedAxle.NumWheelsetAxles;
 

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

@@ -354,6 +354,8 @@ public void Initialize()
                 else if (axle.DriveType == AxleDriveType.ForceDriven) numForce++;
                 else if (axle.DriveType == AxleDriveType.MotorDriven) numMotor++;
             }
+            float totalDriveWheelWeightKg = 0;
+            float totalWheelWeightKg = 0;
             foreach (var axle in AxleList)
             {
                 if (numMotor > 0 && axle.DriveType == AxleDriveType.ForceDriven) axle.DriveType = AxleDriveType.NotDriven;
@@ -366,7 +368,6 @@ public void Initialize()
                 {
                     if (axle.DriveType != AxleDriveType.NotDriven)
                     {
-                        axle.BrakeForceFraction = 1.0f / (locomotive.DriveWheelOnlyBrakes ? numDriven : AxleList.Count);
                         if (axle.WheelWeightKg <= 0) axle.WheelWeightKg = locomotive.DrvWheelWeightKg / numDriven;
                         if (axle.NumWheelsetAxles <= 0) axle.NumWheelsetAxles = locomotive.LocoNumDrvAxles / numDriven;
                         if (axle.WheelRadiusM <= 0) axle.WheelRadiusM = locomotive.DriverWheelRadiusM;
@@ -388,7 +389,6 @@ public void Initialize()
                 if (axle.DriveType == AxleDriveType.NotDriven)
                 {
                     var wagon = Car as MSTSWagon;
-                    axle.BrakeForceFraction = locomotive != null && locomotive.DriveWheelOnlyBrakes ? 0 :1.0f / AxleList.Count;
                     if (axle.WheelWeightKg <= 0)
                     {
                         if (locomotive != null) axle.WheelWeightKg = Math.Max((Car.MassKG - locomotive.DrvWheelWeightKg) / numNotDriven, 500);
@@ -402,6 +402,21 @@ public void Initialize()
                 if (axle.AxleWeightN <= 0) axle.AxleWeightN = 9.81f * axle.WheelWeightKg;  //remains fixed for diesel/electric locomotives, but varies for steam locomotives
                 if (axle.DampingNs <= 0) axle.DampingNs = axle.WheelWeightKg / 1000.0f;
                 if (axle.FrictionN <= 0) axle.FrictionN = axle.WheelWeightKg / 1000.0f;
+
+                if (axle.DriveType != AxleDriveType.NotDriven) totalDriveWheelWeightKg += axle.WheelWeightKg;
+                totalWheelWeightKg += axle.WheelWeightKg;
+            }
+            foreach (var axle in AxleList)
+            {
+                var locomotive = Car as MSTSLocomotive;
+                if (axle.DriveType == AxleDriveType.NotDriven)
+                {
+                    axle.BrakeForceFraction = locomotive == null || !locomotive.DriveWheelOnlyBrakes ? axle.WheelWeightKg / totalWheelWeightKg : 0;
+                }
+                else
+                {
+                    axle.BrakeForceFraction = axle.WheelWeightKg / (locomotive != null && locomotive.DriveWheelOnlyBrakes ? totalDriveWheelWeightKg : totalWheelWeightKg);
+                }
                 axle.Initialize();
             }
         }

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

@@ -1123,89 +1123,89 @@ public void InitializeCarTemperatures()
         public virtual void UpdateBrakeSlideCalculation()
         {
             if (this is MSTSLocomotive locomotive)
+            {
+                // If advanced adhesion model indicates wheel slip warning, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                if (WheelSlipWarning && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0)
                 {
-                    // If advanced adhesion model indicates wheel slip warning, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
-                    if (WheelSlipWarning && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0) 
-                    {
-                        BrakeSkidWarning = true;  // set brake skid flag true
-                    }
-                    else
-                    {
-                        BrakeSkidWarning = false;
-                    }
+                    BrakeSkidWarning = true;  // set brake skid flag true
+                }
+                else
+                {
+                    BrakeSkidWarning = false;
+                }
 
-                    // If advanced adhesion model indicates wheel slip, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
-                    if (WheelSlip && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0)
-                    {
-                        BrakeSkid = true;  // set brake skid flag true
-                    }
-                    else
-                    {
-                        BrakeSkid = false;
-                    }
+                // If advanced adhesion model indicates wheel slip, then check other conditions (throttle and brake force) to determine whether it is a wheel slip or brake skid
+                if (WheelSlip && ThrottlePercent < 0.1f && BrakeRetardForceN > 25.0)
+                {
+                    BrakeSkid = true;  // set brake skid flag true
                 }
+                else
+                {
+                    BrakeSkid = false;
+                }
+            }
             // Only apply slide, and advanced brake friction, if advanced adhesion is selected, simplecontrolphysics is not set, and it is a Player train
             else if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && IsPlayerTrain)
+            {
+                // Determine whether car is experiencing a wheel slip during braking
+                if (!BrakeSkidWarning && AbsSpeedMpS > 0.01)
                 {
-                    // Determine whether car is experiencing a wheel slip during braking
-                    if (!BrakeSkidWarning && AbsSpeedMpS > 0.01)
-                    {
-                        var wagonbrakeadhesiveforcen = MassKG * GravitationalAccelerationMpS2 * Train.WagonCoefficientFriction; // Adhesive force wheel normal 
+                    var wagonbrakeadhesiveforcen = MassKG * GravitationalAccelerationMpS2 * Train.WagonCoefficientFriction; // Adhesive force wheel normal 
 
                     if (BrakeRetardForceN > 0.80f * WagonBrakeAdhesiveForceN && ThrottlePercent > 0.01)
-                        {
-                            BrakeSkidWarning = true; 	// wagon wheel is about to slip
-                        }
-                    }
-                else if (BrakeRetardForceN < 0.75f * WagonBrakeAdhesiveForceN)
                     {
-                        BrakeSkidWarning = false; 	// wagon wheel is back to normal
+                        BrakeSkidWarning = true; 	// wagon wheel is about to slip
                     }
+                }
+                else if (BrakeRetardForceN < 0.75f * WagonBrakeAdhesiveForceN)
+                {
+                    BrakeSkidWarning = false; 	// wagon wheel is back to normal
+                }
 
-                    // Reset WSP dump valve lockout
-                    if (WheelBrakeSlideProtectionFitted && WheelBrakeSlideProtectionDumpValveLockout && (ThrottlePercent > 0.01 || AbsSpeedMpS <= 0.002))
-                    {
-                        WheelBrakeSlideProtectionTimerS = wheelBrakeSlideTimerResetValueS;
-                        WheelBrakeSlideProtectionDumpValveLockout = false;
+                // Reset WSP dump valve lockout
+                if (WheelBrakeSlideProtectionFitted && WheelBrakeSlideProtectionDumpValveLockout && (ThrottlePercent > 0.01 || AbsSpeedMpS <= 0.002))
+                {
+                    WheelBrakeSlideProtectionTimerS = wheelBrakeSlideTimerResetValueS;
+                    WheelBrakeSlideProtectionDumpValveLockout = false;
 
-                    }       
+                }       
 
-                    // Calculate adhesive force based upon whether in skid or not
-                    if (BrakeSkid)
-                    {
-                        WagonBrakeAdhesiveForceN = MassKG * GravitationalAccelerationMpS2 * SkidFriction;  // Adhesive force if wheel skidding
-                    }
-                    else
-                    {
-                        WagonBrakeAdhesiveForceN = MassKG * GravitationalAccelerationMpS2 * Train.WagonCoefficientFriction; // Adhesive force wheel normal
-                    }
+                // Calculate adhesive force based upon whether in skid or not
+                if (BrakeSkid)
+                {
+                    WagonBrakeAdhesiveForceN = MassKG * GravitationalAccelerationMpS2 * SkidFriction;  // Adhesive force if wheel skidding
+                }
+                else
+                {
+                    WagonBrakeAdhesiveForceN = MassKG * GravitationalAccelerationMpS2 * Train.WagonCoefficientFriction; // Adhesive force wheel normal
+                }
 
 
-                    // Test if wheel forces are high enough to induce a slip. Set slip flag if slip occuring 
-                    if (!BrakeSkid && AbsSpeedMpS > 0.01)  // Train must be moving forward to experience skid
-                    {
+                // Test if wheel forces are high enough to induce a slip. Set slip flag if slip occuring 
+                if (!BrakeSkid && AbsSpeedMpS > 0.01)  // Train must be moving forward to experience skid
+                {
                     if (BrakeRetardForceN > WagonBrakeAdhesiveForceN)
-                        {
-                            BrakeSkid = true; 	// wagon wheel is slipping
-                            var message = "Car ID: " + CarID + " - experiencing braking force wheel skid.";
-                            Simulator.Confirmer.Message(ConfirmLevel.Warning, message);
-                        }
-                    }
-                    else if (BrakeSkid && AbsSpeedMpS > 0.01)
                     {
-                    if (BrakeRetardForceN < WagonBrakeAdhesiveForceN || BrakeForceN == 0.0f)
-                        {
-                            BrakeSkid = false; 	// wagon wheel is not slipping
-                        }
-                        
+                        BrakeSkid = true; 	// wagon wheel is slipping
+                        var message = "Car ID: " + CarID + " - experiencing braking force wheel skid.";
+                        Simulator.Confirmer.Message(ConfirmLevel.Warning, message);
                     }
-                    else
+                }
+                else if (BrakeSkid && AbsSpeedMpS > 0.01)
+                {
+                    if (BrakeRetardForceN < WagonBrakeAdhesiveForceN || BrakeForceN == 0.0f)
                     {
                         BrakeSkid = false; 	// wagon wheel is not slipping
                     }
+                        
+                }
+                else
+                {
+                    BrakeSkid = false;  // wagon wheel is not slipping
+                }
                 BrakeForceN = BrakeRetardForceN;
                 if (BrakeSkid) BrakeForceN = Math.Min(BrakeForceN, MassKG * GravitationalAccelerationMpS2 * SkidFriction);
-                }
+            }
             else  // set default values if simple adhesion model
             {
                 BrakeSkid = false; 	// wagon wheel is not slipping

Source/RunActivity/Viewer3D/InfoDisplay.cs

@@ -182,7 +182,7 @@ void DataLoggerLog()
                     Logger.Data(Viewer.PlayerLocomotive.ThrottlePercent.ToString("F0"));
                     Logger.Data(Viewer.PlayerLocomotive.MotiveForceN.ToString("F0"));
                     Logger.Data(Viewer.PlayerLocomotive.BrakeForceN.ToString("F0"));
-                        Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.AxleMotiveForceN.ToString("F2"));
+                    Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.AxleMotiveForceN.ToString("F2"));
                     Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.SlipSpeedPercent.ToString("F1"));
                     DataLoggerLogSpeed(Viewer.PlayerLocomotive.SpeedMpS);
                     DataLoggerLogSpeed(Viewer.PlayerTrain.AllowedMaxSpeedMpS);