Merge pull request #730 from openrails/release/1.5

Merge pull request #728 from Csantucci/cosine-fix

Author: Sharpe49

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

@@ -329,10 +329,10 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
                 ControlResPressurePSI = maxPressurePSI;
             FullServPressurePSI = fullServPressurePSI;
             AutoCylPressurePSI = immediateRelease ? 0 : Math.Min((maxPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio, MaxCylPressurePSI);
-            AuxResPressurePSI = TwoPipes ? maxPressurePSI : Math.Max(maxPressurePSI - AutoCylPressurePSI / AuxCylVolumeRatio, BrakeLine1PressurePSI);
+            AuxResPressurePSI = Math.Max(TwoPipes ? maxPressurePSI : maxPressurePSI - AutoCylPressurePSI / AuxCylVolumeRatio, BrakeLine1PressurePSI);
             if ((Car as MSTSWagon).EmergencyReservoirPresent)
                 EmergResPressurePSI = Math.Max(AuxResPressurePSI, maxPressurePSI);
-            TripleValveState = ValveState.Lap;
+            TripleValveState = AutoCylPressurePSI < 1 ? ValveState.Release : ValveState.Lap;
             HoldingValve = ValveState.Release;
             HandbrakePercent = handbrakeOn & (Car as MSTSWagon).HandBrakePresent ? 100 : 0;
             SetRetainer(RetainerSetting.Exhaust);

Source/RunActivity/Viewer3D/Common/SunMoonPos.cs

@@ -86,6 +86,10 @@ public static Vector3 SolarAngle(double latitude, double longitude, float clockT
                 +Math.Cos(latitude)
                 * Math.Sin(Math.Acos(solarZenithCosine)));
 
+            // Running at 64 bit solarAzimuthCosine can be slightly below -1, generating NaN results
+            if (solarAzimuthCosine > 1.0d) solarAzimuthCosine = 1.0d;
+            if (solarAzimuthCosine < -1.0d) solarAzimuthCosine = -1.0d;
+
             // Solar azimuth angle, radians. Currently not used.
             //          double solarAzimuthAngle = Math.Acos(solarAzimuthCosine);
             //          if (clockTime > 0.5)