Merge pull request #1104 from cesarBLG/simple-adhesion-axle

Handle simple adhesion within the axle module

Author: cjakeman

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -178,7 +178,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
                     var transmissionType = stf.ReadString();
                     try
                     {
-                        DieselTransmissionType = (DieselTransmissionTypes)Enum.Parse(typeof(DieselTransmissionTypes), transmissionType.First().ToString().ToUpper() + transmissionType.Substring(1));
+                        DieselTransmissionType = (DieselTransmissionTypes)Enum.Parse(typeof(DieselTransmissionTypes), transmissionType, true);
                     }
                     catch
                     {
@@ -699,27 +699,12 @@ protected override void UpdateTractionForce(float elapsedClockSeconds)
         {
             if (DieselEngines.HasGearBox && (TractiveForceCurves == null || DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic))
             {
-                TractiveForceN = TractionForceN = DieselEngines.TractiveForceN;
+                TractionForceN = DieselEngines.TractiveForceN;
                 return;
             }
             base.UpdateTractionForce(elapsedClockSeconds);
         }
 
-        protected override void UpdateAxleDriveForce()
-        {
-            /* TODO: connect different engines to different axles
-            if (DieselEngines.HasGearBox && DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
-            {
-                foreach (var de in DieselEngines)
-                {
-                }
-            }
-            else */
-            {
-                base.UpdateAxleDriveForce();
-            }
-        }
-
         /// <summary>
         /// This function updates periodically the locomotive's sound variables.
         /// </summary>

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

@@ -172,7 +172,7 @@ public enum WindowState
         public float SlipWarningThresholdPercent = 70;
         public MSTSNotchController WeightLoadController; // Used to control freight loading in freight cars
 
-        public Axles LocomotiveAxles; // Only used at locomotives for efficiency
+        public Axles LocomotiveAxles;
 
         // Colours for smoke and steam effects
         public Color ExhaustTransientColor = Color.Black;
@@ -2370,6 +2370,14 @@ private void UpdateTrainBaseResistance()
             {
                 UpdateTrainBaseResistance_ORTS();
             }
+
+            // TODO: the Davis A and B parameters already include rolling friction. Thus, there is an over-estimation
+            // of the rolling friction forces, due to a small amount of friction being inserted to the axle module.
+            // This needs to be fixed by inserting the Davis A and B parameters to the axle, to the 'friction' and
+            // 'damping' axle parameters respectively, and their calculation must be removed from UpdateTrainBaseResistance_ methods
+            // This means that low/high speed friction has to be calculated and passed to the axle module elsewhere
+            // Davis C is related to air speed and must be calculated here and not inside the axle module
+            FrictionForceN += RollingFrictionForceN;
         }
 
         /// <summary>

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

@@ -1990,14 +1990,6 @@ public override void Update(float elapsedClockSeconds)
             Car.HuDBrakeShoeFriction = Car.GetBrakeShoeFrictionCoefficientHuD();
 
             Car.BrakeRetardForceN = Car.BrakeShoeForceN * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
-            if (Car.BrakeSkid) // Test to see if wheels are skiding to excessive brake force
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * Car.SkidFriction;   // if excessive brakeforce, wheel skids, and loses adhesion
-            }
-            else
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * brakeShoeFriction; // In advanced adhesion model brake shoe coefficient varies with speed, in simple model constant force applied as per value in WAG file, will vary with wheel skid.
-            }
 
             // sound trigger checking runs every half second, to avoid the problems caused by the jumping BrakeLine1PressurePSI value, and also saves cpu time :)
             if (SoundTriggerCounter >= 0.5f)

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -232,14 +232,6 @@ public override void Update(float elapsedClockSeconds)
             Car.HuDBrakeShoeFriction = Car.GetBrakeShoeFrictionCoefficientHuD();
 
             Car.BrakeRetardForceN = Car.BrakeShoeForceN * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
-            if (Car.BrakeSkid) // Test to see if wheels are skiding to excessive brake force
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * Car.SkidFriction;   // if excessive brakeforce, wheel skids, and loses adhesion
-            }
-            else
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * brakeShoeFriction; // In advanced adhesion model brake shoe coefficient varies with speed, in simple model constant force applied as per value in WAG file, will vary with wheel skid.
-            }
 
         }
 

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

@@ -170,15 +170,6 @@ public override void Update(float elapsedClockSeconds)
             UpdateAngleCockState(AngleCockBOpen, ref AngleCockBOpenAmount, ref AngleCockBOpenTime);
 
             Car.BrakeRetardForceN = ( Car.MaxHandbrakeForceN * HandbrakePercent / 100) * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
-            if (Car.BrakeSkid) // Test to see if wheels are skiding to excessive brake force
-            {
-                Car.BrakeForceN = (Car.MaxHandbrakeForceN * HandbrakePercent / 100) * Car.SkidFriction;   // if excessive brakeforce, wheel skids, and loses adhesion
-            }
-            else
-            {
-                Car.BrakeForceN = (Car.MaxHandbrakeForceN * HandbrakePercent / 100) * brakeShoeFriction; // In advanced adhesion model brake shoe coefficient varies with speed, in simple model constant force applied as per value in WAG file, will vary with wheel skid.
-            }
-        
         }
     }
 }

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

@@ -168,14 +168,6 @@ public override void Update(float elapsedClockSeconds)
                     Car.HuDBrakeShoeFriction = Car.GetBrakeShoeFrictionCoefficientHuD();
 
                     Car.BrakeRetardForceN = Car.BrakeShoeForceN * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
-                    if (Car.BrakeSkid) // Test to see if wheels are skiding due to excessive brake force
-                    {
-                        Car.BrakeForceN = Car.BrakeShoeForceN * Car.SkidFriction;   // if excessive brakeforce, wheel skids, and loses adhesion
-                    }
-                    else
-                    {
-                        Car.BrakeForceN = Car.BrakeShoeForceN * brakeShoeFriction; // In advanced adhesion model brake shoe coefficient varies with speed, in simple odel constant force applied as per value in WAG file, will vary with wheel skid.
-                    }
 
                     // If wagons are not attached to the locomotive, then set wagon BC pressure to same as locomotive in the Train brake line
                     if (!Car.Train.WagonsAttached && (Car.WagonType == MSTSWagon.WagonTypes.Engine || Car.WagonType == MSTSWagon.WagonTypes.Tender))

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

@@ -621,15 +621,6 @@ public override void Update(float elapsedClockSeconds)
             Car.HuDBrakeShoeFriction = Car.GetBrakeShoeFrictionCoefficientHuD();
 
             Car.BrakeRetardForceN = Car.BrakeShoeForceN * brakeShoeFriction; // calculates value of force applied to wheel, independent of wheel skid
-            if (Car.BrakeSkid) // Test to see if wheels are skiding due to excessive brake force
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * Car.SkidFriction;   // if excessive brakeforce, wheel skids, and loses adhesion
-            }
-            else
-            {
-                Car.BrakeForceN = Car.BrakeShoeForceN * brakeShoeFriction; // In advanced adhesion model brake shoe coefficient varies with speed, in simple model constant force applied as per value in WAG file, will vary with wheel skid.
-            }
-           
 
             // sound trigger checking runs every 4th update, to avoid the problems caused by the jumping BrakeLine1PressurePSI value, and also saves cpu time :)
             if (SoundTriggerCounter >= 4)

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

@@ -1495,10 +1495,10 @@ public float GetDataOf(CabViewControl cvc)
                     data = Locomotive.TractiveForceN;
                     break;
                 case CABViewControlTypes.ORTS_MOTIVE_FORCE_KILONEWTON:
-                    if (Locomotive.TractionForceN >0)
-                        data = (float)Math.Round(Locomotive.TractionForceN / 1000, 0);
-                    else if (Locomotive.DynamicBrakeForceN > 0)
+                    if (Locomotive.DynamicBrake)
                         data = -(float)Math.Round(Locomotive.DynamicBrakeForceN / 1000, 0);
+                    else
+                        data = (float)Math.Round(Locomotive.TractionForceN / 1000, 0);
                     break;
                 case CABViewControlTypes.ORTS_MAXIMUM_FORCE:
                     data = Locomotive.MaxForceN;