Skip to content

Commit a14a010

Browse files
committed
Automatic merge of T1.6-186-g21d9ada29 and 9 pull requests
- Pull request #1082 at b191a54: Allow variable water level in glass gauge - Pull request #1057 at 85bde8e: Switchable brake system - Pull request #1122 at 73c47b4: Wagon Size and Centering Controls - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1128 at b6c197f: Particle Emitter Overhaul - Pull request #1169 at 906f204: Revise TrainCar.SetUpWheels to Better Handle Unusual Rolling Stock - Pull request #1175 at d28315e: Make Data Logger interval configurable - Pull request #1176 at 4cd961b: Remove Implicit Requirement for Engine Name to Come After "Engine (" - Pull request #1178 at 015769e: Fix Diesel RPM Rate of Change
11 parents 380cf61 + 21d9ada + b191a54 + 85bde8e + 73c47b4 + e241a0d + b6c197f + 906f204 + d28315e + 4cd961b + 015769e commit a14a010

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2746,7 +2746,7 @@ private float CalculateLiveSteamInjectorDefaultSize( int injectorNumber, float F
27462746
Trace.TraceInformation("Calculated Live Steam Injector{0}NozzleSizeMM as {1} mm to meet water delivery requirements", injectorNumber, ActualInjectorNozzleSizeMM);
27472747
return ActualInjectorNozzleSizeMM;
27482748
}
2749-
else if (i == 20)
2749+
else if (i == 19)
27502750
{
27512751
ActualInjectorNozzleSizeMM = 19; // set to maximum size
27522752
if (Simulator.Settings.VerboseConfigurationMessages)
@@ -2776,7 +2776,7 @@ private float CalculateExhaustSteamInjectorDefaultSize(int injectorNumber, float
27762776
Trace.TraceInformation("Calculated Exhaust Steam Injector{0}NozzleSizeMM as {1} mm to meet water delivery requirements", injectorNumber, ActualInjectorNozzleSizeMM);
27772777
return ActualInjectorNozzleSizeMM;
27782778
}
2779-
else if (i == 20)
2779+
else if (i == 19)
27802780
{
27812781
ActualInjectorNozzleSizeMM = 19; // set to maximum size
27822782
if (Simulator.Settings.VerboseConfigurationMessages)
@@ -7388,7 +7388,7 @@ private void UpdateWaterGauge()
73887388

73897389
GradientBoilerLevelFraction = MathHelper.Clamp(GradientBoilerLevelFraction, 0.0f, 1.0f);
73907390

7391-
CurrentWaterGaugeFraction = ((BoilerWaterFractionAbs - waterVariationLevelM / BoilerDiameterM) - WaterGlassMinLevel) / (WaterGlassMaxLevel - WaterGlassMinLevel); // Calculate water glass grade fraction
7391+
CurrentWaterGaugeFraction = ((BoilerWaterFractionAbs - waterVariationLevelM / BoilerDiameterM) - WaterGlassMinLevel) / (WaterGlassMaxLevel - WaterGlassMinLevel); // Calculate water glass grade fraction inverse for use in determining water injector operation.
73927392

73937393
CurrentWaterGaugeFraction = MathHelper.Clamp(CurrentWaterGaugeFraction, 0.0f, 1.0f);
73947394

0 commit comments

Comments
 (0)