Automatic merge of T1.6-145-g7915033ac and 11 pull requests

- Pull request #1082 at ebf0879: Allow variable water level in glass gauge
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #570 at 1b6b22e: glTF 2.0 support with PBR lighting
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1122 at 73c47b4: Wagon Size and Centering Controls
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1167 at 115325f: Fix: RunActivity slow to terminate because of long sleep in Host Process
- Pull request #1168 at 6e2942f: Fix exception when exiting with MapForm or SoundDebugForm open.
- Pull request #1169 at 6cf8c3e: Better Handling of Wagons with Invalid Bogie Configuration
- Pull request #1171 at 8fd2066: no internet connection is available, not possible to open the Menu Content Form

Author: openrails-bot

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

@@ -155,6 +155,10 @@ public class MSTSSteamLocomotive : MSTSLocomotive
 
         float ActualInjector1NozzleSizeMM;
         float ActualInjector2NozzleSizeMM;
+        float ActualInjectorTemperatureCorrectionFactor;
+        float ActualInjector1SteamUsedLBpS;
+        float ActualInjector2SteamUsedLBpS;
+        float InjectorHFGkJPkg; // Enthalpy of steam used by injector - kJ/kg
 
         // Feedwater Pump
         float WaterMotionPump1FlowRateLBpS;
@@ -235,6 +239,7 @@ public class MSTSSteamLocomotive : MSTSLocomotive
         public bool AuxTenderMoveFlag = false; // Flag to indicate whether train has moved
         bool SteamIsAuxTenderCoupled = false;
         float TenderWaterPercent;       // Percentage of water in tender
+        float TenderWaterTemperatureC;
         public float WaterConsumptionLbpS;
         public float CurrentAuxTenderWaterMassKG;
         public float CurrentAuxTenderWaterVolumeUKG;
@@ -4086,6 +4091,15 @@ private void UpdateTender(float elapsedClockSeconds)
                 CoalIsExhausted = false;
             }
 
+            // Calculate water temperature in tender based upon ambient temperature and water level
+            // Twt = Tat + 3 + 0.3 * (Tat - 10) - where wt = water temperature, at = ambient temperature, has to be capped at 50 deg C
+            // Check for more accurate solution later
+
+            TenderWaterTemperatureC = CarOutsideTempC + 3.0f + 0.3f * (CarOutsideTempC - 10.0f);
+            TenderWaterTemperatureC = MathHelper.Clamp(TenderWaterTemperatureC, 0, 50);
+
+
+
             #region Auxiliary Water Tender Operation
 
             // If aux tender is coupled then assume that both tender and aux tender will equalise at same % water level
@@ -7390,12 +7404,15 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
             {
                 #region Calculate Injector flow rates
 
+                ActualInjector1SteamUsedLBpS = 0;
+                ActualInjector2SteamUsedLBpS = 0;
+
                 // Calculate the flow rates for injector #1 based upon boiler pressure and injector nozzle size
                 var ActualInjector1NozzleAreaMM2 = (float)(Math.PI * Math.Pow((ActualInjector1NozzleSizeMM) / 2.0f, 2));
 
-                MaxInjectorFlowRateLBpS = pS.FrompH(RefKInjector1Factor * ActualInjector1NozzleAreaMM2 * (float)Math.Sqrt(MaxBoilerPressurePSI)) * WaterLBpUKG;
+                MaxInjectorFlowRateLBpS = ActualInjectorTemperatureCorrectionFactor * pS.FrompH(RefKInjector1Factor * ActualInjector1NozzleAreaMM2 * (float)Math.Sqrt(MaxBoilerPressurePSI)) * WaterLBpUKG;
 
-                ActualInjector1FlowRateLBpS = pS.FrompH(RefKInjector1Factor * ActualInjector1NozzleAreaMM2 * (float)Math.Sqrt(BoilerPressurePSI)) * WaterLBpUKG;
+                ActualInjector1FlowRateLBpS = ActualInjectorTemperatureCorrectionFactor * pS.FrompH(RefKInjector1Factor * ActualInjector1NozzleAreaMM2 * (float)Math.Sqrt(BoilerPressurePSI)) * WaterLBpUKG;
 
                 // Calculate the flow rates for injector #2 based upon boiler pressure and injector nozzle size
                 var ActualInjector2NozzleAreaMM2 = (float)(Math.PI * Math.Pow((ActualInjector1NozzleSizeMM) / 2.0f, 2));
@@ -7404,6 +7421,19 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
 
                 ActualInjector2FlowRateLBpS = pS.FrompH(RefKInjector2Factor * ActualInjector1NozzleAreaMM2 * (float)Math.Sqrt(BoilerPressurePSI)) * WaterLBpUKG;
 
+                // Calculate the temperature correction factor as the feedwater temperature will affect the flow rate and the hence the steam used
+                // Actual Delivery Capacity = Base Delivery * Temperature Correction Factor
+                // Actual Steam used = Base Steam used * Temperature Correction Factor
+                // Temperature Correction Factor = (Tsat - Tfeedwater) / (Tsat - Tref), Assume ref = 20C
+
+                var ReferenceTemperature = 20.0f; // Reference temperature for injector performance
+                ActualInjectorTemperatureCorrectionFactor = ( C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - TenderWaterTemperatureC) / (C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - ReferenceTemperature);
+
+                // Calculate enthalpy of injector feed water based on boiler water temperature
+                // hfg kJ/kg) = 2500 - 2.4 * Tsat (C) - 4% accurate, to be explored later for better accuracy
+
+                InjectorHFGkJPkg = 2500.0f - (2.4f * C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]));
+
                 #endregion
 
                 if (WaterIsExhausted)
@@ -7421,6 +7451,7 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
                 else
                 {
                     // Injectors to fill boiler   
+                    // // Injector #1
                     if (Injector1IsOn)
                     {
                         // Calculate Injector 1 delivery water temp
@@ -7441,6 +7472,12 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
                         MaxInject1SteamUsedLbpS = InjWaterFedSteamPressureFtoPSI[BoilerPressurePSI];  // Maximum amount of steam used at actual boiler pressure
                         ActInject1SteamUsedLbpS = (Injector1Fraction * ActualInjector1FlowRateLBpS) / MaxInject1SteamUsedLbpS; // Lbs of steam injected into boiler to inject water.
 
+                        // Actual steam used by the injector is calculated by following formula
+                        // Steam Mass (kg/hr) = Water Mass (kg/h) * (Cp*(Tsat-Ttenderwater))/(hfg+(Cp*(Tsat-Ttenderwater))
+                        // where Cp = specific heat of water (4.18kJ/kgK), hfg = latent heat of vaporisation at boiler pressure
+
+                        ActualInjector1SteamUsedLBpS = (Injector1Fraction * ActualInjector1FlowRateLBpS) * (4.18f * (C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - TenderWaterTemperatureC)) / (InjectorHFGkJPkg + (4.18f * (C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - TenderWaterTemperatureC)));
+
                         // Calculate heat loss for steam injection
                         Inject1SteamHeatLossBTU = ActInject1SteamUsedLbpS * (BoilerSteamHeatBTUpLB - WaterHeatPSItoBTUpLB[Injector1WaterTempPressurePSI]); // Calculate heat loss for injection steam, ie steam heat to water delivery temperature
 
@@ -7454,6 +7491,8 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
                         BoilerWaterInputLB += (elapsedClockSeconds * Injector1Fraction * ActualInjector1FlowRateLBpS); // Keep track of water flow into boilers from Injector 1
                         BoilerHeatOutBTUpS += (Inject1WaterHeatLossBTU + Inject1SteamHeatLossBTU); // Total loss of boiler heat due to water injection - inject steam and water Heat
                     }
+
+                    // Injector #2
                     if (Injector2IsOn)
                     {
                         // Calculate Injector 2 delivery water temp
@@ -7473,6 +7512,12 @@ private void UpdateWaterInjection(float elapsedClockSeconds)
                         MaxInject2SteamUsedLbpS = InjWaterFedSteamPressureFtoPSI[BoilerPressurePSI];  // Maximum amount of steam used at boiler pressure
                         ActInject2SteamUsedLbpS = (Injector2Fraction * ActualInjector2FlowRateLBpS) / MaxInject2SteamUsedLbpS; // Lbs of steam injected into boiler to inject water.
 
+                        // Actual steam used by the injector is calculated by following formula
+                        // Steam Mass (kg/hr) = Water Mass (kg/h) * (Cp*(Tsat-Ttenderwater))/(hfg+(Cp*(Tsat-Ttenderwater))
+                        // where Cp = specific heat of water (4.18kJ/kgK), hfg = latent heat of vaporisation at boiler pressure
+
+                        ActualInjector2SteamUsedLBpS = (Injector1Fraction * ActualInjector2FlowRateLBpS) * (4.18f * (C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - TenderWaterTemperatureC)) / (InjectorHFGkJPkg + (4.18f * (C.FromF(PressureToTemperaturePSItoF[BoilerPressurePSI]) - TenderWaterTemperatureC)));
+
                         // Calculate heat loss for steam injection
                         Inject2SteamHeatLossBTU = ActInject2SteamUsedLbpS * (BoilerSteamHeatBTUpLB - WaterHeatPSItoBTUpLB[Injector2WaterTempPressurePSI]); // Calculate heat loss for injection steam, ie steam heat to water delivery temperature
 
@@ -8528,7 +8573,7 @@ public override string GetDebugStatus()
             }
             else
             {
-                status.AppendFormat("{0}\t{1}\t{2}/{13}\t\t{3}\t({4:N0} {14})\t{5}/{13}\t\t{6}\t{7}\t{8}\t({9:N0} {14})\t{10}/{13}\t\t{11}\t{12}\n",
+                status.AppendFormat("{0}\t{1}\t{2}/{17}\t\t{3}\t({4:N0} {18})\t{5}/{17}\t\t{6}\t{7}\t{8}\t{9}/{17}\t\t{10}\t({11:N0} {18})\t{12}/{17}\t\t{13}\t{14}\t{15}\t{16:N0}/{17}\n",
                 Simulator.Catalog.GetString("Injector:"),
                 Simulator.Catalog.GetString("Max"),
                 FormatStrings.FormatFuelVolume(pS.TopH(L.FromGUK(MaxInjectorFlowRateLBpS / WaterLBpUKG)), IsMetric, IsUK),
@@ -8537,11 +8582,15 @@ public override string GetDebugStatus()
                 FormatStrings.FormatFuelVolume(Injector1Fraction * pS.TopH(L.FromGUK(ActualInjector1FlowRateLBpS / WaterLBpUKG)), IsMetric, IsUK),
                 Simulator.Catalog.GetString("Temp1"),
                 FormatStrings.FormatTemperature(C.FromF(Injector1WaterDelTempF), IsMetric, false),
+                Simulator.Catalog.GetString("Steam1"),
+                FormatStrings.FormatMass(pS.TopH(ActualInjector1SteamUsedLBpS), IsMetric),
                 Simulator.Catalog.GetString("Inj2"),
                 ActualInjector2NozzleSizeMM,
                 FormatStrings.FormatFuelVolume(Injector2Fraction * pS.TopH(L.FromGUK(ActualInjector2FlowRateLBpS / WaterLBpUKG)), IsMetric, IsUK),
                 Simulator.Catalog.GetString("Temp2"),
                 FormatStrings.FormatTemperature(C.FromF(Injector2WaterDelTempF), IsMetric, false),
+                Simulator.Catalog.GetString("Steam2"),
+                FormatStrings.FormatMass(pS.TopH(ActualInjector2SteamUsedLBpS), IsMetric),
                 FormatStrings.h,
                 FormatStrings.mm);
             }
@@ -8602,14 +8651,16 @@ public override string GetDebugStatus()
                 }
                 else // default to coal
                 {
-                    status.AppendFormat("{0}\t{1}\t{2}\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8:N0}\t{9}\t\t{10:N0}\n",
+                    status.AppendFormat("{0}\t{1}\t{2}\t{3:N0}%\t{4}\t{5}\t\t{6:N0}%\t{7}\t{8:N0}\t{9}\t{10:N0}\t{11}\t\t{12:N0}\n",
                         Simulator.Catalog.GetString("Tender:"),
                         Simulator.Catalog.GetString("Coal"),
                         FormatStrings.FormatMass(TenderFuelMassKG, IsMetric),
                         TenderFuelMassKG / MaxTenderFuelMassKG * 100,
                         Simulator.Catalog.GetString("Water"),
                         FormatStrings.FormatFuelVolume(L.FromGUK(CombinedTenderWaterVolumeUKG), IsMetric, IsUK),
                         CombinedTenderWaterVolumeUKG / MaxTotalCombinedWaterVolumeUKG * 100,
+                        Simulator.Catalog.GetString("Tempw"),
+                        FormatStrings.FormatTemperature(TenderWaterTemperatureC, IsMetric, false),
                         Simulator.Catalog.GetString("Steam"),
                         FormatStrings.FormatMass(Kg.FromLb(CumulativeCylinderSteamConsumptionLbs), IsMetric),
                         Simulator.Catalog.GetString("TotSteam"),