Skip to content

Commit

Permalink
Automatic merge of T1.5.1-535-g2f57132ee and 11 pull requests
Browse files Browse the repository at this point in the history
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #821 at cc3af66: Adds suppression of safety valves
- Pull request #831 at 61bbf43: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at a9760ec: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #856 at 30e7413: Add Alternate Syntax for Confusing Tokens
- Pull request #857 at 076c77a: Adding Air Flow Meters
- Pull request #858 at bbaeeba: Fix wheel animation problems
- Pull request #859 at d6d0c82: Steam adhesion bug#1
  • Loading branch information
openrails-bot committed Aug 6, 2023
13 parents cd86400 + 2f57132 + 98dd1a7 + cc3af66 + 61bbf43 + d00beb9 + 410a585 + a9760ec + b39e5d8 + 30e7413 + 076c77a + bbaeeba + d6d0c82 commit e12bc7a
Showing 1 changed file with 2 additions and 13 deletions.
Expand Up @@ -5197,19 +5197,8 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
float connectRodInertiaAngleFactor = 0;

// Calculate the "angle variation factors" for the Inertia
// Account for the position of the crosshead position. In other words it depends upon whether the Rods and Reciporating gear is above or below the axle.
if (crankAngleRad > 0 && crankAngleRad < Math.PI)
{
// forward stroke
reciprocatingInertiaAngleFactor = (cos + ((CrankRadiusFt / ConnectRodLengthFt) * (float)Math.Cos(2 * crankAngleRad)));
connectRodInertiaAngleFactor = (cos + ((CrankRadiusFt * RodCoGFt) / (ConnectRodLengthFt * ConnectRodLengthFt)) * (float)Math.Cos(2 * crankAngleRad));
}
else
{
// reverse stroke
reciprocatingInertiaAngleFactor = (cos - ((CrankRadiusFt / ConnectRodLengthFt) * (float)Math.Cos(2 * crankAngleRad)));
connectRodInertiaAngleFactor = (cos - ((CrankRadiusFt * RodCoGFt) / (ConnectRodLengthFt * ConnectRodLengthFt)) * (float)Math.Cos(2 * crankAngleRad));
}
reciprocatingInertiaAngleFactor = (cos + ((CrankRadiusFt / ConnectRodLengthFt) * (float)Math.Cos(2 * crankAngleRad)));
connectRodInertiaAngleFactor = (cos + ((CrankRadiusFt * RodCoGFt) / (ConnectRodLengthFt * ConnectRodLengthFt)) * (float)Math.Cos(2 * crankAngleRad));

// Calculate the speed factor to allow for variation in speed
// Adjust the above factor to allow for the speed of rotation on the parts - based upon Eq 8 (pg 21)
Expand Down

0 comments on commit e12bc7a

Please sign in to comment.