Fix usage of axle numbers

Author: peternewell

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

@@ -2552,7 +2552,7 @@ public override void Update(float elapsedClockSeconds)
 
                 UpdateSteamTractiveForce(elapsedClockSeconds, tractiveforcethrottle, 0, 0, i);
 
-                SteamDrvWheelWeightLbs += Kg.ToLb(SteamEngines[i].AttachedAxle.WheelWeightKg / SteamEngines[i].AttachedAxle.NumAxles); // Calculate the weight per axle (used in MSTSLocomotive for friction calculatons)
+                SteamDrvWheelWeightLbs += Kg.ToLb(SteamEngines[i].AttachedAxle.WheelWeightKg / SteamEngines[i].AttachedAxle.NumDriveAxles); // Calculate the weight per axle (used in MSTSLocomotive for friction calculatons)
 
             }
 
@@ -6332,7 +6332,7 @@ public override void AdvancedAdhesion(float elapsedClockSeconds)
                     float TotalWheelMomentofInertia = WheelMomentInertia + AxleMomentInertia; // Total MoI for generic wheelset
 
                     // The moment of inertia needs to be increased by the number of wheels in each set
-                    TotalWheelMomentofInertia *= linkedEngine.AttachedAxle.NumAxles;
+                    TotalWheelMomentofInertia *= linkedEngine.AttachedAxle.NumDriveAxles;
 
                     // the inertia of the coupling rods can also be added
                     // Assume rods weigh approx 1500 lbs

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

@@ -235,13 +235,12 @@ public void Initialize()
                     if (axle.InertiaKgm2 <= 0) axle.InertiaKgm2 = locomotive.AxleInertiaKgm2 / AxleList.Count;
                     if (axle.WheelWeightKg <= 0) axle.WheelWeightKg = locomotive.DrvWheelWeightKg / AxleList.Count;
                     if (axle.AxleWeightN <= 0) axle.AxleWeightN = 9.81f * axle.WheelWeightKg;  //remains fixed for diesel/electric locomotives, but varies for steam locomotives
-                    if (axle.NumAxles <= 0) axle.NumAxles = locomotive.LocoNumDrvAxles;
+                    if (axle.NumDriveAxles <= 0) axle.NumDriveAxles = locomotive.LocoNumDrvAxles;
                     if (axle.WheelRadiusM <= 0) axle.WheelRadiusM = locomotive.DriverWheelRadiusM;
                     if (axle.WheelFlangeAngleRad <= 0) axle.WheelFlangeAngleRad = locomotive.MaximumWheelFlangeAngleRad;
                     if (axle.DampingNs <= 0) axle.DampingNs = locomotive.MassKG / 1000.0f / AxleList.Count;
                     if (axle.FrictionN <= 0) axle.FrictionN = locomotive.MassKG / 1000.0f / AxleList.Count;
-                    if (axle.NumberWheelAxles <= 0) axle.NumberWheelAxles = 1;
-
+                    
                     // set the wheel slip threshold times for different types of locomotives
                     // Because of the irregular force around the wheel for a steam engine during a revolution, "response" time for warnings needs to be lower
                     if (locomotive.EngineType == TrainCar.EngineTypes.Steam)
@@ -513,7 +512,7 @@ public float TransmissionEfficiency
         /// <summary>
         /// Wheel number
         /// </summary>
-        public int NumberWheelAxles;
+  //      public int NumberWheelAxles;
 
         /// <summary>
         /// Wheel mass parameter in kilograms
@@ -548,7 +547,7 @@ public float TransmissionEfficiency
         /// <summary>
         /// Number of drive axles in group of wheels
         /// </summary>
-        public float NumAxles;
+        public float NumDriveAxles;
 
         /// <summary>
         /// Static adhesion coefficient, as given by Curtius-Kniffler formula
@@ -791,8 +790,8 @@ public void Parse(STFReader stf)
                     case "ortsflangeangle":
                         WheelFlangeAngleRad = stf.ReadFloatBlock(STFReader.UNITS.Angle, null);
                         break;
-                    case "ortsnumberwheelaxles":
-                        NumAxles = stf.ReadFloatBlock(STFReader.UNITS.Distance, null);
+                    case "ortsnumberdriveaxles":
+                        NumDriveAxles = stf.ReadFloatBlock(STFReader.UNITS.Distance, null);
                         break;
                     case "ortsinertia":
                         InertiaKgm2 = stf.ReadFloatBlock(STFReader.UNITS.RotationalInertia, null);
@@ -801,9 +800,6 @@ public void Parse(STFReader stf)
                         WheelWeightKg = stf.ReadFloatBlock(STFReader.UNITS.Mass, null);
                         AxleWeightN = 9.81f * WheelWeightKg;
                         break;
-                    case "numberwheelaxles":
-                        NumberWheelAxles = stf.ReadIntBlock(null);
-                        break;
                     case "animatedparts":
                         foreach (var part in stf.ReadStringBlock("").ToUpper().Replace(" ", "").Split(','))
                         {
@@ -820,13 +816,12 @@ public void Copy(Axle other)
         {
             WheelRadiusM = other.WheelRadiusM;
             WheelFlangeAngleRad = other.WheelFlangeAngleRad;
-            NumAxles = other.NumAxles;
+            NumDriveAxles = other.NumDriveAxles;
             InertiaKgm2 = other.InertiaKgm2;
             WheelWeightKg = other.WheelWeightKg;
             AxleWeightN = other.AxleWeightN;
             AnimatedParts.Clear();
             AnimatedParts.AddRange(other.AnimatedParts);
-            NumberWheelAxles = other.NumberWheelAxles;
         }
 
         /// <summary>
@@ -1232,8 +1227,8 @@ public void Update()
                 var wheelRadiusMM = Axle.WheelRadiusM * 1000;
                 var wheelDistanceGaugeMM = Axle.WheelDistanceGaugeM * 1000;
                 var GNm2 = 8.40E+10;
-                wheelLoadN = Axle.AxleWeightN / (Axle.NumAxles * 2); // Assume two wheels per axle, and thus wheel weight will be have the value - multiple axles????
-                var wheelLoadkN = Axle.AxleWeightN / (Axle.NumAxles * 2 * 1000); // Assume two wheels per axle, and thus wheel weight will be have the value - multiple axles????
+                wheelLoadN = Axle.AxleWeightN / (Axle.NumDriveAxles * 2); // Assume two wheels per axle, and thus wheel weight will be have the value - multiple axles????
+                var wheelLoadkN = Axle.AxleWeightN / (Axle.NumDriveAxles * 2 * 1000); // Assume two wheels per axle, and thus wheel weight will be have the value - multiple axles????
                 var Young_ModulusMPa = 207000;
 
                 // Calculate Hertzian values - assume 2b = 12mm.

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -622,7 +622,7 @@ static string GetCarWhyteLikeNotation(TrainCar car)
                             currentCount += 2;
                             axlesCount += 1;
 
-                            if (axlesCount >= steamloco.SteamEngines[i].AttachedAxle.NumberWheelAxles && currentCount != 0)
+                            if (axlesCount >= steamloco.SteamEngines[i].AttachedAxle.NumDriveAxles && currentCount != 0)
                             {
                                 whyte.Add(currentCount.ToString());
                                 currentBogie = axle.BogieIndex;