Remove assumptions of zero throttle means zero force

cesarBLG · cesarBLG · commit 154f8836fc33 · 2025-04-15T12:16:34.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2315,7 +2315,6 @@ public override void Update(float elapsedClockSeconds)
             UpdateHornAndBell(elapsedClockSeconds);
 
             UpdateSoundVariables(elapsedClockSeconds);
-            PrevTractiveForceN = TractiveForceN;
             base.Update(elapsedClockSeconds);
 
 #if DEBUG_ADHESION
@@ -5424,17 +5423,17 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (LocomotiveAxles.Count > 0)
                         {
                             data = 0.0f;
-                            if (ThrottlePercent > 0)
+                            if (TractionForceN > 0)
                             {
                                 //float rangeFactor = direction == 0 ? (float)cvc.MaxValue : (float)cvc.MinValue;
                                 float rangeFactor = direction == 0 ? MaxCurrentA : (float)cvc.MinValue;
                                 if (FilteredTractiveForceN != 0)
                                     data = FilteredTractiveForceN / MaxForceN * rangeFactor;
                                 else
-                                    data = TractiveForceN / MaxForceN * rangeFactor;
+                                    data = TractionForceN / MaxForceN * rangeFactor;
                                 data = Math.Abs(data);
                             }
-                            if (DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
+                            if (DynamicBrakeForceN > 0)
                             {
                                 float rangeFactor;
                                 if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS)
@@ -5472,15 +5471,15 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (DynamicBrakeMaxCurrentA == 0)
                             DynamicBrakeMaxCurrentA = (float)cvc.MinValue;
                         data = 0.0f;
-                        if (ThrottlePercent > 0)
+                        if (TractionForceN > 0)
                         {
                             if (FilteredTractiveForceN != 0)
                                 data = FilteredTractiveForceN / MaxForceN * MaxCurrentA;
                             else
                                 data = TractiveForceN / MaxForceN * MaxCurrentA;
                             data = Math.Abs(data);
                         }
-                        if (DynamicBrake && DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)
+                        if (DynamicBrakeForceN > 0)
                         {
                             data = DynamicBrakeForceN / MaxDynamicBrakeForceN * DynamicBrakeMaxCurrentA;
                             data = -Math.Abs(data); // Ensure that dynamic force is seen as a "-ve force", changes colour on the load meter
@@ -5499,7 +5498,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                             data = FilteredTractiveForceN;
                         else
                             data = TractiveForceN;
-                        if (DynamicBrake && DynamicBrakePercent > 0)
+                        if (DynamicBrakeForceN > 0)
                         {
                             data = DynamicBrakeForceN;
                         }
@@ -5511,11 +5510,11 @@ public virtual float GetDataOf(CabViewControl cvc)
                                     MaxCurrentA = (float)cvc.MaxValue;
                                 if (DynamicBrakeMaxCurrentA == 0)
                                     DynamicBrakeMaxCurrentA = (float)cvc.MinValue;
-                                if (ThrottlePercent > 0)
+                                if (TractionForceN > 0)
                                 {
                                     data = (data / MaxForceN) * MaxCurrentA;
-                                 }
-                                if (DynamicBrakePercent > 0)
+                                }
+                                if (DynamicBrakeForceN > 0)
                                 {
                                     data = (DynamicBrakeForceN / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
                                 }
@@ -5558,11 +5557,11 @@ public virtual float GetDataOf(CabViewControl cvc)
                                     MaxCurrentA = (float)cvc.MaxValue;
                                 if (DynamicBrakeMaxCurrentA == 0)
                                     DynamicBrakeMaxCurrentA = (float)cvc.MinValue;
-                                if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)
+                                if (TractionForceN > 0)
                                 {
                                     data = (data / MaxForceN) * MaxCurrentA;
                                 }
-                                if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)
+                                if (DynamicBrakeForceN > 0)
                                 {
                                     data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
                                 }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
@@ -1038,9 +1038,9 @@ public void Update(float elapsedClockSeconds)
 
             DemandedThrottlePercent = Math.Max(DemandedThrottlePercent, ReverseThrottleRPMTab[Locomotive.DieselPowerSupply.DieselEngineMinRpm]);
 
-            if ((State == DieselEngineState.Running) && (Locomotive.ThrottlePercent > 0))
+            if (State == DieselEngineState.Running)
             {
-                var abstempTractiveForce = Math.Abs(Locomotive.PrevTractiveForceN);
+                var abstempTractiveForce = Locomotive.TractionForceN;
                 OutputPowerW = ( abstempTractiveForce > 0 ? abstempTractiveForce * Locomotive.AbsWheelSpeedMpS : 0) / Locomotive.DieselEngines.NumOfActiveEngines;
             }
             else
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -1,4 +1,4 @@
-// COPYRIGHT 2009 - 2022 by the Open Rails project.
+﻿// COPYRIGHT 2009 - 2022 by the Open Rails project.
 // 
 // This file is part of Open Rails.
 // 
@@ -579,7 +579,6 @@ public Direction Direction
         /// Tractive force generated by the engine(s)
         /// </summary>
         public float TractiveForceN = 0f;
-        public float PrevTractiveForceN;
         // Gravity forces have negative values on rising grade. 
         // This means they have the same sense as the motive forces and will push the train downhill.
         public float GravityForceN;  // Newtons  - signed relative to direction of car.

Original file line number	Diff line number	Diff line change
`@@ -2315,7 +2315,6 @@ public override void Update(float elapsedClockSeconds)`
`2315`	`2315`	`UpdateHornAndBell(elapsedClockSeconds);`
`2316`	`2316`
`2317`	`2317`	`UpdateSoundVariables(elapsedClockSeconds);`
`2318`		`- PrevTractiveForceN = TractiveForceN;`
`2319`	`2318`	`base.Update(elapsedClockSeconds);`
`2320`	`2319`
`2321`	`2320`	`#if DEBUG_ADHESION`
`@@ -5424,17 +5423,17 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5424`	`5423`	`if (LocomotiveAxles.Count > 0)`
`5425`	`5424`	`{`
`5426`	`5425`	`data = 0.0f;`
`5427`		`- if (ThrottlePercent > 0)`
	`5426`	`+ if (TractionForceN > 0)`
`5428`	`5427`	`{`
`5429`	`5428`	`//float rangeFactor = direction == 0 ? (float)cvc.MaxValue : (float)cvc.MinValue;`
`5430`	`5429`	`float rangeFactor = direction == 0 ? MaxCurrentA : (float)cvc.MinValue;`
`5431`	`5430`	`if (FilteredTractiveForceN != 0)`
`5432`	`5431`	`data = FilteredTractiveForceN / MaxForceN * rangeFactor;`
`5433`	`5432`	`else`
`5434`		`- data = TractiveForceN / MaxForceN * rangeFactor;`
	`5433`	`+ data = TractionForceN / MaxForceN * rangeFactor;`
`5435`	`5434`	`data = Math.Abs(data);`
`5436`	`5435`	`}`
`5437`		`- if (DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)`
	`5436`	`+ if (DynamicBrakeForceN > 0)`
`5438`	`5437`	`{`
`5439`	`5438`	`float rangeFactor;`
`5440`	`5439`	`if (cvc.ControlType.Type == CABViewControlTypes.AMMETER_ABS)`
`@@ -5472,15 +5471,15 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5472`	`5471`	`if (DynamicBrakeMaxCurrentA == 0)`
`5473`	`5472`	`DynamicBrakeMaxCurrentA = (float)cvc.MinValue;`
`5474`	`5473`	`data = 0.0f;`
`5475`		`- if (ThrottlePercent > 0)`
	`5474`	`+ if (TractionForceN > 0)`
`5476`	`5475`	`{`
`5477`	`5476`	`if (FilteredTractiveForceN != 0)`
`5478`	`5477`	`data = FilteredTractiveForceN / MaxForceN * MaxCurrentA;`
`5479`	`5478`	`else`
`5480`	`5479`	`data = TractiveForceN / MaxForceN * MaxCurrentA;`
`5481`	`5480`	`data = Math.Abs(data);`
`5482`	`5481`	`}`
`5483`		`- if (DynamicBrake && DynamicBrakePercent > 0 && MaxDynamicBrakeForceN > 0)`
	`5482`	`+ if (DynamicBrakeForceN > 0)`
`5484`	`5483`	`{`
`5485`	`5484`	`data = DynamicBrakeForceN / MaxDynamicBrakeForceN * DynamicBrakeMaxCurrentA;`
`5486`	`5485`	`data = -Math.Abs(data); // Ensure that dynamic force is seen as a "-ve force", changes colour on the load meter`
`@@ -5499,7 +5498,7 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5499`	`5498`	`data = FilteredTractiveForceN;`
`5500`	`5499`	`else`
`5501`	`5500`	`data = TractiveForceN;`
`5502`		`- if (DynamicBrake && DynamicBrakePercent > 0)`
	`5501`	`+ if (DynamicBrakeForceN > 0)`
`5503`	`5502`	`{`
`5504`	`5503`	`data = DynamicBrakeForceN;`
`5505`	`5504`	`}`
`@@ -5511,11 +5510,11 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5511`	`5510`	`MaxCurrentA = (float)cvc.MaxValue;`
`5512`	`5511`	`if (DynamicBrakeMaxCurrentA == 0)`
`5513`	`5512`	`DynamicBrakeMaxCurrentA = (float)cvc.MinValue;`
`5514`		`- if (ThrottlePercent > 0)`
	`5513`	`+ if (TractionForceN > 0)`
`5515`	`5514`	`{`
`5516`	`5515`	`data = (data / MaxForceN) * MaxCurrentA;`
`5517`		`- }`
`5518`		`- if (DynamicBrakePercent > 0)`
	`5516`	`+ }`
	`5517`	`+ if (DynamicBrakeForceN > 0)`
`5519`	`5518`	`{`
`5520`	`5519`	`data = (DynamicBrakeForceN / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;`
`5521`	`5520`	`}`
`@@ -5558,11 +5557,11 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5558`	`5557`	`MaxCurrentA = (float)cvc.MaxValue;`
`5559`	`5558`	`if (DynamicBrakeMaxCurrentA == 0)`
`5560`	`5559`	`DynamicBrakeMaxCurrentA = (float)cvc.MinValue;`
`5561`		`- if (ThrottlePercent >= 0 && DynamicBrakePercent == -1)`
	`5560`	`+ if (TractionForceN > 0)`
`5562`	`5561`	`{`
`5563`	`5562`	`data = (data / MaxForceN) * MaxCurrentA;`
`5564`	`5563`	`}`
`5565`		`- if (ThrottlePercent == 0 && DynamicBrakePercent >= 0)`
	`5564`	`+ if (DynamicBrakeForceN > 0)`
`5566`	`5565`	`{`
`5567`	`5566`	`data = (data / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;`
`5568`	`5567`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1038,9 +1038,9 @@ public void Update(float elapsedClockSeconds)`
`1038`	`1038`
`1039`	`1039`	`DemandedThrottlePercent = Math.Max(DemandedThrottlePercent, ReverseThrottleRPMTab[Locomotive.DieselPowerSupply.DieselEngineMinRpm]);`
`1040`	`1040`
`1041`		`- if ((State == DieselEngineState.Running) && (Locomotive.ThrottlePercent > 0))`
	`1041`	`+ if (State == DieselEngineState.Running)`
`1042`	`1042`	`{`
`1043`		`- var abstempTractiveForce = Math.Abs(Locomotive.PrevTractiveForceN);`
	`1043`	`+ var abstempTractiveForce = Locomotive.TractionForceN;`
`1044`	`1044`	`OutputPowerW = ( abstempTractiveForce > 0 ? abstempTractiveForce * Locomotive.AbsWheelSpeedMpS : 0) / Locomotive.DieselEngines.NumOfActiveEngines;`
`1045`	`1045`	`}`
`1046`	`1046`	`else`