Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the constants

Browse Source
This commit is contained in:
ulteq 2015-05-03 12:07:13 +02:00
parent d07cb0e6ed
commit 29fdd63432
1 changed files with 4 additions and 4 deletions

8
extensions/advanced_ballistics/AdvancedBallistics.cpp
View File

@ -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;
}
}