Some minor adjustments

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs

@@ -926,7 +926,7 @@ public float LoadPercent
                     float tempEff = 0;
                     if (GearBox.CurrentGear != null)
                     {
-                        tempEff = (((GearBox.CurrentGear.TractiveForceatMaxSpeedN * GearBox.CurrentGear.MaxSpeedMpS / Locomotive.DieselEngines.NumOfActiveEngines) / (DieselTorqueTab[MaxRPM] * MaxRPM / 9.54f)) * 100.0f);
+                        tempEff = ((GearBox.CurrentGear.TractiveForceatMaxSpeedN * GearBox.CurrentGear.MaxSpeedMpS / (DieselTorqueTab[MaxRPM] * MaxRPM / 9.54f)) * 100.0f);
                     }
 
                     return tempEff;
@@ -1441,24 +1441,37 @@ public void Update(float elapsedClockSeconds)
                 CurrentDieselOutputPowerW = (RawRpM - IdleRPM) / (MaxRPM - IdleRPM) * MaximumDieselPowerW * (1 - Locomotive.PowerReduction);
             }
 
-            // For geared locomotives the engine RpM can be higher then the throttle demanded rpm, and this gives an inflated value of power
-            // so set output power based upon throttle demanded power
-            if (HasGearBox && Locomotive.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
-            {
-                //   Power(Watts) = Torque(Nm) * rpm / 9.54.
-                CurrentDieselOutputPowerW = GearBox.torqueCurveMultiplier * DieselTorqueTab[RealRPM] * RealRPM / 9.54f;
-                CurrentDieselOutputPowerW = MathHelper.Clamp(CurrentDieselOutputPowerW, 0, MaximumDieselPowerW);  // Clamp throttle setting within bounds
-            }
-
             if (Locomotive.DieselEngines.NumOfActiveEngines > 0)
             {
 
-                CurrentDieselOutputPowerW = (CurrentDieselOutputPowerW - Locomotive.DieselPowerSupply.ElectricTrainSupplyPowerW) / Locomotive.DieselEngines.NumOfActiveEngines;
+                CurrentDieselOutputPowerW -= Locomotive.DieselPowerSupply.ElectricTrainSupplyPowerW / Locomotive.DieselEngines.NumOfActiveEngines;
                 CurrentDieselOutputPowerW = CurrentDieselOutputPowerW < 0f ? 0f : CurrentDieselOutputPowerW;
             }
 
             CurrentDieselOutputPowerW = MathHelper.Clamp(CurrentDieselOutputPowerW, 0.0f, CurrentDieselOutputPowerW);  // prevent power going -ve
 
+            // For geared locomotives the engine RpM can be higher then the throttle demanded rpm, and this gives an inflated value of power
+            // so set output power based upon rail power
+            if (HasGearBox && Locomotive.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
+            {
+                if (LoadPercent != 0)
+                {
+                    CurrentDieselOutputPowerW = GearBox.TractiveForceN * Locomotive.AbsSpeedMpS * 100.0f / LoadPercent;
+
+                    if (Locomotive.DieselEngines.NumOfActiveEngines > 0)
+                    {
+
+                        CurrentDieselOutputPowerW += Locomotive.DieselPowerSupply.ElectricTrainSupplyPowerW / Locomotive.DieselEngines.NumOfActiveEngines;
+                    }
+
+                }
+                else
+                {
+                    CurrentDieselOutputPowerW = 0;
+                }
+                CurrentDieselOutputPowerW = MathHelper.Clamp(CurrentDieselOutputPowerW, 0, MaximumDieselPowerW);  // Clamp throttle setting within bounds
+            }
+
             if (State == DieselEngineState.Starting)
             {
                 if ((RealRPM > (0.9f * StartingRPM)) && (RealRPM < StartingRPM))

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

@@ -657,8 +657,6 @@ public float TractiveForceN
                             // During normal operation fuel admission is fixed, and therefore TE follows curve as RpM varies
                             tractiveForceN = torqueCurveMultiplier * DieselEngine.DieselTorqueTab[DieselEngine.RealRPM] / DieselEngine.DieselTorqueTab.MaxY() * CurrentGear.MaxTractiveForceN;
 
-                        //    Trace.TraceInformation("Tractive Force - CarID {0} Gear {1}, TF {2:N1} lbf, tcm {3:N1}, RpM {4}, Torque@RpM {5}, TorqueMax {6}, MaxTE {7:N1} DieselOutputHp {8:N1} hp", Locomotive.CarID, GearIndication, 0.224809f * tractiveForceN, torqueCurveMultiplier, DieselEngine.RealRPM, DieselEngine.DieselTorqueTab[DieselEngine.RealRPM], DieselEngine.DieselTorqueTab.MaxY(), 0.224809f * CurrentGear.MaxTractiveForceN, 0.00134102f * DieselEngine.CurrentDieselOutputPowerW);
-                            
                             Locomotive.HuDGearMaximumTractiveForce = CurrentGear.MaxTractiveForceN;
 
                             if (CurrentSpeedMpS > 0)
@@ -804,24 +802,24 @@ public void Initialize()
                     if (!GearBoxParams.MaxTEFound)
                     {
                         // If user has entered this value then assume that they have already put the maximum torque value in
-                        Gears[i].MaxTractiveForceN = GearBoxParams.GearBoxMaxTractiveForceForGearsN[i];
+                        Gears[i].MaxTractiveForceN = GearBoxParams.GearBoxMaxTractiveForceForGearsN[i] / Locomotive.DieselEngines.Count;
                     }
                     else
                     {
                         // if they entered the TE at maximum gear speed, then increase the value accordingly 
-                        Gears[i].MaxTractiveForceN = GearBoxParams.GearBoxTractiveForceAtSpeedN[i] * DieselEngine.DieselTorqueTab.MaxY() / DieselEngine.DieselTorqueTab[DieselEngine.MaxRPM];
+                        Gears[i].MaxTractiveForceN = (GearBoxParams.GearBoxTractiveForceAtSpeedN[i] * DieselEngine.DieselTorqueTab.MaxY() / DieselEngine.DieselTorqueTab[DieselEngine.MaxRPM]) / Locomotive.DieselEngines.Count;
                     //    Trace.TraceInformation("MaxTractiveForce - CarID {0} MaxTE {1} ")
                     }
                     // For purposes of calculating engine efficiency the tractive force at maximum gear speed needs to be used.
                     if (GearBoxParams.GearBoxTractiveForceAtSpeedN[i] != 0)
                     {
                         // Assume that user has entered the TE at max speed already in the Eng
-                        Gears[i].TractiveForceatMaxSpeedN = GearBoxParams.GearBoxTractiveForceAtSpeedN[i];
+                        Gears[i].TractiveForceatMaxSpeedN = GearBoxParams.GearBoxTractiveForceAtSpeedN[i] / Locomotive.DieselEngines.Count;
                     }
                     else
                     {
                         // Assume that user entered max TE at maximum torque point
-                        Gears[i].TractiveForceatMaxSpeedN = GearBoxParams.GearBoxMaxTractiveForceForGearsN[i] / (DieselEngine.DieselTorqueTab.MaxY() / DieselEngine.DieselTorqueTab[DieselEngine.MaxRPM]);
+                        Gears[i].TractiveForceatMaxSpeedN = (GearBoxParams.GearBoxMaxTractiveForceForGearsN[i] / (DieselEngine.DieselTorqueTab.MaxY() / DieselEngine.DieselTorqueTab[DieselEngine.MaxRPM])) / Locomotive.DieselEngines.Count;
                     }                                  
 
                     Gears[i].OverspeedPercentage = GearBoxParams.GearBoxOverspeedPercentageForFailure;