Skip to content

Commit 5c46373

Browse files
committed
Merge branch '88-dev-adding-models-for-exa-olivier' into 88-dev-adding-models-for-exa
2 parents b80b7de + bd870ff commit 5c46373

File tree

15 files changed

+9
-6
lines changed

15 files changed

+9
-6
lines changed

ext/OptimalControlModels/space_shuttle.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ function OptimalControlProblems.space_shuttle(
150150
v = scaled_v * scaling_v
151151

152152
## Helper functions
153-
c_D = b₀ + b₁ * rad2deg(α) + b₂ * (rad2deg(α)^2)
154-
c_L = a₀ + a₁ * rad2deg(α)
153+
r2dα = α * (180 / π)
154+
c_D = b₀ + b₁ * r2dα + b₂ * (r2dα^2)
155+
c_L = a₀ + a₁ * r2dα
155156
ρ = ρ₀ * exp(-h / hᵣ)
156157
D = (1 / 2) * c_D * S * ρ * (v^2)
157158
L = (1 / 2) * c_L * S * ρ * (v^2)

test/figures/solution/chain.pdf

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

test/figures/solution/glider.pdf

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

test/figures/solution/jackson.pdf

0 Bytes
Binary file not shown.

test/figures/solution/robbins.pdf

0 Bytes
Binary file not shown.

test/figures/solution/robot.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)