Skip to content

Commit 95fe32b

Browse files
committed
Automatic merge of T1.5.1-772-g23e1f0db5 and 15 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #898 at 2d1b44a: Extra line with all the arguments for debugging purposes in logfile - Pull request #899 at e5db0a2: Duplex steam engines - Booster Engine addition - Pull request #903 at a0d2991: first phase downloading from Github - Pull request #904 at 8dc3628: fix: adds downgrade to low precision
17 parents 9da5a60 + 23e1f0d + 3539862 + d00beb9 + f92de76 + a055bca + d9ce84b + 6c0785b + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + 2d1b44a + e5db0a2 + a0d2991 + 8dc3628 commit 95fe32b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5430,8 +5430,9 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
54305430
else // typically this will be a booster or geared engine
54315431
{
54325432
// If the steam piston is exceeding the maximum design piston rate then decrease efficiency of mep
5433-
if (SteamEngineType == SteamEngineTypes.Geared && SteamEngines[numberofengine].PistonSpeedFtpMin > MaxSteamGearPistonRateFtpM && SteamEngines[numberofengine].AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)
5433+
if (SteamEngineType == SteamEngineTypes.Geared && SteamEngines[numberofengine].PistonSpeedFtpMin > MaxSteamGearPistonRateFtpM)
54345434
{
5435+
54355436
// use straight line curve to decay mep to zero by 2 x piston speed
54365437
float pistonforcedecay = 1.0f - (1.0f / MaxSteamGearPistonRateFtpM) * (SteamEngines[numberofengine].PistonSpeedFtpMin - MaxSteamGearPistonRateFtpM);
54375438
pistonforcedecay = MathHelper.Clamp(pistonforcedecay, 0.0f, 1.0f); // Clamp decay within bounds
@@ -5450,7 +5451,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
54505451
GearRatioAdjusted = MotiveForceGearRatio;
54515452
}
54525453

5453-
SteamEngines[numberofengine].TractiveForceN = N.FromLbf((SteamEngines[numberofengine].NumberCylinders / 2.0f) * (Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) / (2.0f * Me.ToIn(DriverWheelRadiusM))) * (SteamEngines[numberofengine].MeanEffectivePressurePSI * CylinderEfficiencyRate) * MotiveForceGearRatio);
5454+
SteamEngines[numberofengine].TractiveForceN = N.FromLbf((SteamEngines[numberofengine].NumberCylinders / 2.0f) * (Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersDiameterM) * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) / (2.0f * Me.ToIn(DriverWheelRadiusM))) * (SteamEngines[numberofengine].MeanEffectivePressurePSI * CylinderEfficiencyRate) * GearRatioAdjusted);
54545455

54555456
// Force tractive effort to zero if throttle is closed, or if a geared steam locomotive in neutral gear. MEP calculation is not allowing it to go to zero
54565457
if (locomotivethrottle < 0.001 || (SteamEngineType == SteamEngineTypes.Geared && SteamGearPosition == 0))

0 commit comments

Comments
 (0)