Add simple slip control

Author: cesarBLG

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

@@ -2188,6 +2188,7 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds, float t, f
         {
             // Method to set force and power info
             // An alternative method in the steam locomotive will override this and input force and power info for it.
+
             if (LocomotivePowerSupply.MainPowerSupplyOn && Direction != Direction.N)
             {
 
@@ -2589,6 +2590,17 @@ public void AdvancedAdhesion(float elapsedClockSeconds)
                 //LocomotiveAxle.AxleRevolutionsInt.MinStep = LocomotiveAxle.InertiaKgm2 / MaxPowerW / 5.0f;
                 LocomotiveAxle.AxleDiameterM = 2*DriverWheelRadiusM;
 
+                if (AntislipControl == AntislipControlType.Full)
+                {
+                    // Simple slip control
+                    // Motive force is reduced to the maximum adhesive force
+                    // In wheelslip situations, motive force is set to zero
+                    float umax = (LocomotiveAxle.CurtiusKnifflerA / (MpS.ToKpH(Math.Abs(SpeedMpS)) + LocomotiveAxle.CurtiusKnifflerB) + LocomotiveAxle.CurtiusKnifflerC); // Curtius - Kniffler equation
+                    umax *= LocomotiveAxle.AdhesionConditions;
+                    MotiveForceN = Math.Sign(MotiveForceN) * Math.Min(umax * LocomotiveAxle.AxleWeightN, Math.Abs(MotiveForceN));
+                    if (LocomotiveAxle.IsWheelSlip) MotiveForceN = 0;
+                }
+
                 //Set axle model parameters
 
                 // Inputs
@@ -2597,6 +2609,7 @@ public void AdvancedAdhesion(float elapsedClockSeconds)
                 LocomotiveAxle.DriveForceN = MotiveForceN;              //Total force applied to wheels
                 LocomotiveAxle.TrainSpeedMpS = SpeedMpS;                //Set the train speed of the axle mod
                 LocomotiveAxle.Update(elapsedClockSeconds); //Main updater of the axle model
+
                 MotiveForceN = LocomotiveAxle.CompensatedAxleForceN;
                 if (elapsedClockSeconds > 0)
                 {

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

@@ -146,7 +146,12 @@ public class MSTSWagon : TrainCar
         public float Curtius_KnifflerB = 44.0f;              // (adhesion coeficient)       umax = ---------------------  + C
         public float Curtius_KnifflerC = 0.161f;             //                                      speedMpS * 3.6 + B
         public float AdhesionK = 0.7f;   //slip characteristics slope
-        //public AntislipControl AntislipControl = AntislipControl.None;
+        public enum AntislipControlType
+        {
+            None,
+            Full
+        }
+        public AntislipControlType AntislipControl = AntislipControlType.None;
         public float AxleInertiaKgm2;    //axle inertia
         public float AdhesionDriveWheelRadiusM;
         public float WheelSpeedMpS;
@@ -1361,8 +1366,9 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                     stf.SkipRestOfBlock();
                     break;
                 case "wagon(ortsadhesion(ortsantislip":
-                    stf.MustMatch("(");
-                    //AntislipControl = stf.ReadStringBlock(null);
+                    string type = stf.ReadStringBlock("none").ToLowerInvariant();
+                    if (type == "full") AntislipControl = AntislipControlType.Full;
+                    else AntislipControl = AntislipControlType.None;
                     stf.SkipRestOfBlock();
                     break;
                 case "wagon(ortsadhesion(wheelset(axle(ortsinertia":
@@ -1567,6 +1573,7 @@ public virtual void Copy(MSTSWagon copy)
             Curtius_KnifflerC = copy.Curtius_KnifflerC;
             AdhesionK = copy.AdhesionK;
             AxleInertiaKgm2 = copy.AxleInertiaKgm2;
+            AntislipControl = copy.AntislipControl;
             AdhesionDriveWheelRadiusM = copy.AdhesionDriveWheelRadiusM;
             SlipWarningThresholdPercent = copy.SlipWarningThresholdPercent;
             Lights = copy.Lights;

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

@@ -115,7 +115,7 @@ public virtual void Update(float timeSpan)
             //revolutionsRad += timeSpan / inertiaKgm2 * (developedTorqueNm + loadTorqueNm + (revolutionsRad == 0.0 ? 0.0 : frictionTorqueNm));
             //if (revolutionsRad < 0.0)
             //    revolutionsRad = 0.0;
-            //temperatureK = tempIntegrator.Integrate(timeSpan, 1.0f/(SpecificHeatCapacityJ_kg_C * WeightKg)*((powerLossesW - CoolingPowerW) / (ThermalCoeffJ_m2sC * SurfaceM) - temperatureK));
+            temperatureK = tempIntegrator.Integrate(timeSpan, (temperatureK) => 1.0f/(SpecificHeatCapacityJ_kg_C * WeightKg)*((powerLossesW - CoolingPowerW) / (ThermalCoeffJ_m2sC * SurfaceM) - temperatureK));
 
         }