Skip to content

Gravity v2 - Mars + Earth Radius Update #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ehariton wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Gravity v2 - Mars + Earth Radius Update #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
64bab5d
gravity constants, enums added but some tests not passing
ehariton Jun 30, 2026
7c177fd
removed enums as not necessary, test_fuselage.py is now running, but …
ehariton Jul 6, 2026
86b0eca
ruff
ehariton Jul 6, 2026
ab3a672
removed constants import
ehariton Jul 6, 2026
78f8cfe
Merge branch 'main' into gravity
ehariton Jul 7, 2026
c138311
reverted radius earth to old constant to separate out tests failing f…
ehariton Jul 8, 2026
b36ee43
merge main
ehariton Jul 8, 2026
37ae334
added back in GRAV_METRIC_FLOPS definition accidentially removed too …
ehariton Jul 8, 2026
91e7cbb
converted earth radius to tuple
ehariton Jul 8, 2026
6dcf864
reverted mars radius as well
ehariton Jul 8, 2026
cd6e551
merge main
ehariton Jul 8, 2026
b407cff
merge main
ehariton Jul 8, 2026
b520a7f
Update the json test for the new variables.
Kenneth-T-Moore Jul 8, 2026
2fd8a52
Update the json test for the new variables.
Kenneth-T-Moore Jul 8, 2026
ee7eb4b
Merge pull request #8 from Kenneth-T-Moore/jsonjson
ehariton Jul 8, 2026
2e5191d
updated earth and mars radius to desired values based on references, …
ehariton Jul 9, 2026
b1c9cd8
tweaking values to bring them in line with new earth radius data
ehariton Jul 9, 2026
7f3d57b
small tweaks on values for tests
ehariton Jul 9, 2026
24a1c31
update test values
ehariton Jul 9, 2026
6d6fc82
small number tweaks
ehariton Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion aviary/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,34 @@

units.add_unit('distance_units', '1*m')

GRAV_EARTH = (
9.80665,
'm/s**2',
) # NIST https://physics.nist.gov/cgi-bin/cuu/Value?gn|search_for=gravity
GRAV_MARS = (
3.712,
'm/s**2',
) # Mars Global Reference Atmospheric Model (Mars-GRAM) 2024: User Guide, NASA/TM-20240012934
GRAV_VENUS = (
8.870,
'm/s**2',
) # Venus Global Reference Atmospheric Model (Venus-GRAM): User Guide, NASA/TM-20210022168

RADIUS_EARTH = (6371009, 'm') # Source: GRS80, mean earth radius (rounded to nearest meter)

RADIUS_MARS = (
3386200,
'm',
) # Mars Global Reference Atmospheric Model (Mars-GRAM) 2024: User Guide, NASA/TM-20240012934, avg of equatorial and polar radius
RADIUS_VENUS = (
6051800,
'm',
) # Venus Global Reference Atmospheric Model (Venus-GRAM): User Guide, NASA/TM-20210022168, avg of equatorial and polar radius

GNS = 9.8236930 # grav_accel_at_surface_earth # remove this asap
GRAV_METRIC_GASP = 9.81 # m/s^2
GRAV_ENGLISH_GASP = 32.2 # ft/s^2
GRAV_METRIC_FLOPS = 9.80665 # m/s^2
GRAV_ENGLISH_GASP = 32.2 # ft/s^2
GRAV_ENGLISH_FLOPS = 32.17399 # ft/s^2
GRAV_ENGLISH_LBM = 1.0 # lbf/lbm
# See issue 1169 for the value of RHO_SEA_LEVEL_ENGLISH
Expand Down
12 changes: 12 additions & 0 deletions aviary/interface/test/sizing_results_for_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,18 @@
"unitless",
"<class 'float'>"
],
[
"settings:atmosphere_model",
"STANDARD",
"unitless",
"<enum 'AtmosphereModel'>"
],
[
"mission:gravity",
9.80665,
"m/s**2",
"<class 'float'>"
],
[
"mission:gross_mass",
175400.0,
Expand Down
18 changes: 9 additions & 9 deletions aviary/mission/two_dof/ode/test/test_breguet_cruise_ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ def test_cruise(self):

tol = tol = 1e-6
assert_near_equal(self.prob[Dynamic.Mission.VELOCITY_RATE], np.array([0.0, 0.0]), tol)
assert_near_equal(self.prob[Dynamic.Mission.DISTANCE], np.array([0.0, 923.39168758]), tol)
assert_near_equal(self.prob['time'], np.array([0, 8280.30660691]), tol)
assert_near_equal(self.prob[Dynamic.Mission.DISTANCE], np.array([0.0, 923.38992577]), tol)
assert_near_equal(self.prob['time'], np.array([0, 8280.29080821]), tol)
assert_near_equal(
self.prob[Dynamic.Mission.SPECIFIC_ENERGY_RATE_EXCESS],
np.array([3.88465429, 4.90288541]),
np.array([3.88463177, 4.90286726]),
tol,
)
assert_near_equal(
self.prob[Dynamic.Mission.ALTITUDE_RATE_MAX],
np.array([3.88465429, 4.90288542]),
np.array([3.88463177, 4.90286726]),
tol,
)

Expand Down Expand Up @@ -123,21 +123,21 @@ def test_electric_cruise(self):

tol = tol = 1e-6
assert_near_equal(self.prob[Dynamic.Mission.VELOCITY_RATE], np.array([0.0, 0.0]), tol)
assert_near_equal(self.prob[Dynamic.Mission.DISTANCE], np.array([0.0, 66.37436515]), tol)
assert_near_equal(self.prob['time'], np.array([0, 595.19714299]), tol)
assert_near_equal(self.prob[Dynamic.Mission.DISTANCE], np.array([0.0, 66.37459993]), tol)
assert_near_equal(self.prob['time'], np.array([0, 595.19924828]), tol)
assert_near_equal(
self.prob[Dynamic.Mission.SPECIFIC_ENERGY_RATE_EXCESS],
np.array([3.89228205, 4.91098053]),
np.array([3.89225953, 4.91096237]),
tol,
)
assert_near_equal(
self.prob[Dynamic.Mission.ALTITUDE_RATE_MAX],
np.array([3.89228205, 4.91098053]),
np.array([3.89225953, 4.91096237]),
tol,
)
assert_near_equal(
self.prob[Dynamic.Vehicle.Propulsion.ELECTRIC_POWER_IN_TOTAL],
np.array([4.45946124, 4.15324496]),
np.array([4.45947061, 4.15325208]),
tol,
)

Expand Down
16 changes: 8 additions & 8 deletions aviary/mission/two_dof/ode/test/test_flight_ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ def test_end_of_climb(self):
self.prob.run_model()

testvals = {
Dynamic.Vehicle.ANGLE_OF_ATTACK: [3.99983993, 4.04378041],
Dynamic.Vehicle.LIFT_COEFFICIENT: [0.50719248, 0.61320271],
Dynamic.Vehicle.DRAG_COEFFICIENT: [0.02520388, 0.0312557],
Dynamic.Vehicle.ANGLE_OF_ATTACK: [3.99983969, 4.04381706],
Dynamic.Vehicle.LIFT_COEFFICIENT: [0.50719248, 0.613207],
Dynamic.Vehicle.DRAG_COEFFICIENT: [0.02520388, 0.03125595],
Dynamic.Mission.ALTITUDE_RATE: [52.68288688, 9.32639661], # ft/s
# TAS (kts -> ft/s) * cos(gamma), [319, 459] kts
# ft/s
Expand All @@ -127,7 +127,7 @@ def test_end_of_climb(self):
-11418.00064615,
-6042.88107957,
],
'theta': [0.16776765, 0.08262117], # rad ([9.47740, 4.59730] deg),
'theta': [0.16776764, 0.08262176], # rad ([9.47740, 4.59730] deg),
# rad, gamma
Dynamic.Mission.FLIGHT_PATH_ANGLE: [0.09795727, 0.01204389],
Dynamic.Vehicle.Propulsion.THRUST_TOTAL: [25555.79617743, 10773.48189764],
Expand Down Expand Up @@ -182,9 +182,9 @@ def test_high_alt(self):
self.prob.run_model()

testvals = {
Dynamic.Vehicle.ANGLE_OF_ATTACK: np.array([3.21974886, 1.20407839]),
Dynamic.Vehicle.LIFT_COEFFICIENT: np.array([0.51684124, 0.25916936]),
Dynamic.Vehicle.DRAG_COEFFICIENT: np.array([0.02633437, 0.01729238]),
Dynamic.Vehicle.ANGLE_OF_ATTACK: np.array([3.21977893, 1.20407788]),
Dynamic.Vehicle.LIFT_COEFFICIENT: np.array([0.51684476, 0.25916936]),
Dynamic.Vehicle.DRAG_COEFFICIENT: np.array([0.02633452, 0.01729237]),
# ft/s
Dynamic.Mission.ALTITUDE_RATE: np.array([-37.03297068, -44.19020778]),
# TAS (ft/s) * cos(gamma), [458.67774, 437.62297] kts
Expand All @@ -193,7 +193,7 @@ def test_high_alt(self):
Dynamic.Vehicle.Propulsion.FUEL_MASS_FLOW_RATE_NEGATIVE_TOTAL: np.array(
[-452.29666667, -997.48350936]
),
'EAS': [418.57187298, 590.73344999], # ft/s ([247.95894, 349.99997] kts)
'EAS': [418.57044883, 590.73344999], # ft/s ([247.95894, 349.99997] kts)
Dynamic.Atmosphere.MACH: [0.8, 0.69721946],
# gamma, rad ([-2.908332, -3.723388] deg)
Dynamic.Mission.FLIGHT_PATH_ANGLE: [-0.04784061, -0.05986972],
Expand Down
4 changes: 2 additions & 2 deletions aviary/mission/two_dof/ode/test/test_simple_cruise_ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ def test_cruise(self):
assert_near_equal(self.prob['time'], np.array([0, 8280.30660691]), tol)
assert_near_equal(
self.prob[Dynamic.Mission.SPECIFIC_ENERGY_RATE_EXCESS],
np.array([3.88465429, 4.90288541]),
np.array([3.88463177, 4.90286726]),
tol,
)
assert_near_equal(
self.prob[Dynamic.Mission.ALTITUDE_RATE_MAX],
np.array([3.88465429, 4.90288542]),
np.array([3.88463177, 4.90286726]),
tol,
)

Expand Down
16 changes: 8 additions & 8 deletions aviary/models/engines/turbofan_23k_1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.0, 30000.0, 0.801, 2808.161, -2068.88, 2676.95
0.0, 30000.0, 0.8626, 14043.93, 6579.6, 2882.87
0.0, 30000.0, 0.9242, 29400.55, 4365.93, 3088.79
0.0, 30000.0, 0.9859, 60041.21, 12221.7, 3294.71
0.0, 30000.0, 0.9858, 60041.21, 12221.7, 3294.71
0.0, 33000.0, 0.0, 183.1717, 183.172, 0.0
0.0, 33000.0, 0.3601, 73148.22, 8353.32, 1203.52
0.0, 33000.0, 0.4201, 57096.47, 6361.09, 1404.1
Expand Down Expand Up @@ -272,7 +272,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.05, 30000.0, 0.6781, -612.2555, 406.931, 2266.25
0.05, 30000.0, 0.7398, 1491.772, -206.138, 2472.27
0.05, 30000.0, 0.8014, 3295.707, -1231.19, 2678.29
0.05, 30000.0, 0.8631, 12370.15, 5613.44, 2884.31
0.05, 30000.0, 0.8630, 12370.15, 5613.44, 2884.31
0.05, 30000.0, 0.9247, 24896.87, 4169.04, 3090.34
0.05, 30000.0, 0.9863, 49261.2, 10598.3, 3296.36
0.05, 33000.0, 0.0, 183.4465, 183.447, 0.0
Expand Down Expand Up @@ -551,7 +551,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.15, 21000.0, 0.5336, 1347.889, 783.42, 1783.41
0.15, 21000.0, 0.6003, 2219.631, 808.77, 2006.34
0.15, 21000.0, 0.667, 3067.974, 938.153, 2229.27
0.15, 21000.0, 0.7338, 2816.955, 1172.64, 2452.19
0.15, 21000.0, 0.7337, 2816.955, 1172.64, 2452.19
0.15, 21000.0, 0.8005, 5736.527, 1786.35, 2675.12
0.15, 21000.0, 0.8672, 9241.063, 3136.89, 2898.05
0.15, 21000.0, 0.9339, 11521.47, 4207.99, 3120.97
Expand Down Expand Up @@ -579,7 +579,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.15, 27000.0, 0.9524, 5125.502, 3407.13, 3183.07
0.15, 30000.0, 0.0, 210.3324, 210.332, 0.0
0.15, 30000.0, 0.3714, -967.3588, 582.346, 1241.08
0.15, 30000.0, 0.4333, 347.277, 675.53, 1447.92
0.15, 30000.0, 0.4332, 347.277, 675.53, 1447.92
0.15, 30000.0, 0.4951, 1661.607, 768.81, 1654.77
0.15, 30000.0, 0.557, 2976.094, 862.034, 1861.61
0.15, 30000.0, 0.6189, 2931.884, 410.83, 2068.46
Expand Down Expand Up @@ -1346,7 +1346,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.4, 27000.0, 0.6523, 1475.572, 755.644, 2180.14
0.4, 27000.0, 0.7176, 2716.512, 1128.13, 2398.16
0.4, 27000.0, 0.7828, 4217.789, 1654.76, 2616.17
0.4, 27000.0, 0.8481, 5842.676, 2330.43, 2834.18
0.4, 27000.0, 0.8480, 5842.676, 2330.43, 2834.18
0.4, 27000.0, 0.9133, 7939.486, 3106.92, 3052.2
0.4, 27000.0, 0.9785, 9155.314, 3925.65, 3270.21
0.4, 30000.0, 0.0, 228.0843, 228.084, 0.0
Expand Down Expand Up @@ -1669,7 +1669,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.5, 33000.0, 0.5672, 390.9254, 299.0, 1895.54
0.5, 33000.0, 0.6302, 981.3919, 551.064, 2106.16
0.5, 33000.0, 0.6932, 1715.961, 846.817, 2316.77
0.5, 33000.0, 0.7563, 2950.938, 1294.56, 2527.39
0.5, 33000.0, 0.7562, 2950.938, 1294.56, 2527.39
0.5, 33000.0, 0.8193, 4283.182, 1800.03, 2738.0
0.5, 33000.0, 0.8823, 5594.077, 2358.21, 2948.62
0.5, 33000.0, 0.9453, 6646.168, 2951.3, 3159.23
Expand Down Expand Up @@ -1808,7 +1808,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.55, 30000.0, 0.7841, 3563.936, 1618.71, 2620.53
0.55, 30000.0, 0.8495, 5155.267, 2270.37, 2838.91
0.55, 30000.0, 0.9148, 6746.392, 3017.25, 3057.29
0.55, 30000.0, 0.9802, 8117.883, 3833.5, 3275.66
0.55, 30000.0, 0.9801, 8117.883, 3833.5, 3275.66
0.55, 33000.0, 0.0, 218.4692, 218.469, 0.0
0.55, 33000.0, 0.3819, -2025.39, -521.596, 1276.33
0.55, 33000.0, 0.4456, -1287.775, -244.072, 1489.05
Expand Down Expand Up @@ -2392,7 +2392,7 @@ Mach Number (input), Altitude (ft, input), Throttle (input), Thrust (lbf, output
0.75, 36000.0, 0.78, 2515.761, 1389.19, 2606.63
0.75, 36000.0, 0.845, 3764.579, 1975.59, 2823.85
0.75, 36000.0, 0.91, 5018.906, 2636.88, 3041.07
0.75, 36000.0, 0.975, 6063.22, 3334.02, 3258.29
0.75, 36000.0, 0.9749, 6063.22, 3334.02, 3258.29
0.75, 39000.0, 0.0, 192.3188, 192.319, 0.0
0.75, 39000.0, 0.3894, -2080.694, -571.283, 1301.52
0.75, 39000.0, 0.4544, -1459.096, -309.662, 1518.45
Expand Down
Loading
Loading