Merge pull request #414 from peternewell/diesel-adhesion#2

Fix issues with adhesion resume

Author: peternewell

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

@@ -424,6 +424,7 @@ public float OdometerM
         public Axle LocomotiveAxle;
         public IIRFilter CurrentFilter;
         public IIRFilter AdhesionFilter;
+        public float SaveAdhesionFilter;
 
         public float FilteredMotiveForceN;
 
@@ -1110,6 +1111,7 @@ public override void Save(BinaryWriter outf)
             outf.Write(ScoopIsBroken);
             outf.Write(IsWaterScoopDown);
             outf.Write(CurrentTrackSandBoxCapacityM3);
+            outf.Write(SaveAdhesionFilter);
 
             base.Save(outf);
 
@@ -1137,7 +1139,7 @@ public override void Restore(BinaryReader inf)
             VacuumExhausterIsOn = inf.ReadBoolean();
             TrainBrakePipeLeakPSIorInHgpS = inf.ReadSingle();
             AverageForceN = inf.ReadSingle();
-            LocomotiveAxle.Reset(Simulator.GameTime, inf.ReadSingle());
+            float axleSpeedMpS = inf.ReadSingle();
             CabLightOn = inf.ReadBoolean();
             UsingRearCab = inf.ReadBoolean();
             CalculatedCarHeaterSteamUsageLBpS = inf.ReadSingle();
@@ -1154,13 +1156,18 @@ public override void Restore(BinaryReader inf)
             ScoopIsBroken = inf.ReadBoolean();
             IsWaterScoopDown = inf.ReadBoolean();
             CurrentTrackSandBoxCapacityM3 = inf.ReadSingle();
+
+            SaveAdhesionFilter = inf.ReadSingle();
 
-            AdhesionFilter.Reset(0.5f);
+            AdhesionFilter.Reset(SaveAdhesionFilter);
 
             base.Restore(inf);
 
             TrainControlSystem.Restore(inf);
             LocomotiveAxle = new Axle(inf);
+            MoveParamsToAxle();
+            LocomotiveAxle.FilterMovingAverage.Initialize(AverageForceN);
+            LocomotiveAxle.Reset(Simulator.GameTime, axleSpeedMpS);
         }
 
         public bool IsLeadLocomotive()
@@ -2796,7 +2803,8 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
             // Set adhesion conditions for diesel, electric or steam geared locomotives
             if (elapsedClockSeconds > 0)
             {
-                LocomotiveAxle.AdhesionConditions = AdhesionMultiplier * AdhesionFilter.Filter(BaseFrictionCoefficientFactor + AdhesionRandom, elapsedClockSeconds);
+                SaveAdhesionFilter = AdhesionFilter.Filter(BaseFrictionCoefficientFactor + AdhesionRandom, elapsedClockSeconds);
+                LocomotiveAxle.AdhesionConditions = AdhesionMultiplier * SaveAdhesionFilter;
                 LocomotiveAxle.AdhesionConditions = MathHelper.Clamp(LocomotiveAxle.AdhesionConditions, 0.05f, 2.5f); // Avoids NaNs in axle speed computing
             }
 

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

@@ -315,7 +315,7 @@ public float AdhesionK
         /// </summary>
         float axleSpeedMpS;
         /// <summary>
-        /// Read only axle speed value, in metric meters per second
+        /// Axle speed value, in metric meters per second
         /// </summary>
         public float AxleSpeedMpS
         {
@@ -342,10 +342,6 @@ public float AxleForceN
             {
                 return axleForceN;
             }
-            /*set
-            {
-                axleForceN = value;
-            }*/
         }
 
         /// <summary>
@@ -387,12 +383,12 @@ public float WheelSlipThresholdMpS
             {
                 if (AdhesionK == 0.0f)
                     AdhesionK = 1.0f;
-                float A = 2.0f*AdhesionK*AdhesionConditions*AdhesionConditions;
-                float B = AdhesionConditions*AdhesionConditions;
-                float C = AdhesionK*AdhesionK;
-                float a = -2.0f*A*B;
-                float b = A*B;
-                float c = A*C;
+                float A = 2.0f * AdhesionK * AdhesionConditions * AdhesionConditions;
+                float B = AdhesionConditions * AdhesionConditions;
+                float C = AdhesionK * AdhesionK;
+                float a = -2.0f * A * B;
+                float b = A * B;
+                float c = A * C;
                 return ((-b - (float)Math.Sqrt(b * b - 4.0f * a * c)) / (2.0f * a));
             }
         }
@@ -520,10 +516,6 @@ public Axle()
             AxleRevolutionsInt.IsLimited = true;
             Adhesion2 = 0.331455f;
 
-            CurtiusKnifflerA = 7.5f;
-            CurtiusKnifflerB = 44.0f;
-            CurtiusKnifflerC = 0.161f;
-
             switch (driveType)
             {
                 case AxleDriveType.NotDriven:
@@ -561,10 +553,6 @@ public Axle(ElectricMotor electricMotor)
             AxleRevolutionsInt.IsLimited = true;
             Adhesion2 = 0.331455f;
 
-            CurtiusKnifflerA = 7.5f;
-            CurtiusKnifflerB = 44.0f;
-            CurtiusKnifflerC = 0.161f;
-
             switch (driveType)
             {
                 case AxleDriveType.NotDriven:
@@ -594,6 +582,11 @@ public Axle(BinaryReader inf) : this()
         {
             previousSlipPercent = inf.ReadSingle();
             previousSlipSpeedMpS = inf.ReadSingle();
+            axleForceN = inf.ReadSingle();
+            adhesionK = inf.ReadSingle();
+            AdhesionConditions = inf.ReadSingle();
+            frictionN = inf.ReadSingle();
+            dampingNs = inf.ReadSingle();
         }
 
         /// <summary>
@@ -604,6 +597,11 @@ public void Save(BinaryWriter outf)
         {
             outf.Write(previousSlipPercent);
             outf.Write(previousSlipSpeedMpS);
+            outf.Write(axleForceN);
+            outf.Write(adhesionK);
+            outf.Write(AdhesionConditions);
+            outf.Write(frictionN);
+            outf.Write(dampingNs);
         }
 
         /// <summary>
@@ -615,6 +613,7 @@ public void Save(BinaryWriter outf)
         /// <param name="timeSpan"></param>
         public virtual void Update(float timeSpan)
         {
+
             //Update axle force ( = k * loadTorqueNm)
             axleForceN = AxleWeightN * SlipCharacteristics(AxleSpeedMpS - TrainSpeedMpS, TrainSpeedMpS, AdhesionK, AdhesionConditions, Adhesion2);