From 29fdd63432aaaf327d4fddccd2cc574e178e4dcb Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 3 May 2015 12:07:13 +0200 Subject: [PATCH] Use the constants --- extensions/advanced_ballistics/AdvancedBallistics.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp index 0a476c9c65..d08b6a6122 100644 --- a/extensions/advanced_ballistics/AdvancedBallistics.cpp +++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp @@ -96,9 +96,9 @@ double calculateAirDensity(double temperature, double pressure, double relativeH double vaporPressure = relativeHumidity * _pSat; double partialPressure = pressure - vaporPressure; - return (partialPressure * 0.028964 + vaporPressure * 0.018016) / (8.314 * (273.15 + temperature)); + return (partialPressure * DRY_AIR_MOLAR_MASS + vaporPressure * WATER_VAPOR_MOLAR_MASS) / (UNIVERSAL_GAS_CONSTANT * KELVIN(temperature)); } else { - return pressure / (287.058 * (273.15 + temperature)); + return pressure / (SPECIFIC_GAS_CONSTANT_DRY_AIR * KELVIN(temperature)); } } @@ -106,9 +106,9 @@ double calculateAtmosphericCorrection(double ballisticCoefficient, double temper double airDensity = calculateAirDensity(temperature, pressure, relativeHumidity); if (!strcmp(atmosphereModel, "ICAO")) { - return (1.22498 / airDensity) * ballisticCoefficient; + return (STD_AIR_DENSITY_ICAO / airDensity) * ballisticCoefficient; } else { - return (1.20885 / airDensity) * ballisticCoefficient; + return (STD_AIR_DENSITY_ASM / airDensity) * ballisticCoefficient; } }