Skip to content
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.

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

fixed issue of hardcoded pax in stickfig #8

Merged
merged 5 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions src/IO/outputs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ function stickfig(ac::aircraft; ax = nothing, label_fs = 16)
yshell[k] = sqrt(Rfuse^2 * max((1 - ((xshell[k]-xshellcenter)/(Rfuse/AR))^2), 0.0) )
end

pax = parg[igWpay]/(215*lbf_to_N)
pax = parg[igWpay]/parm[imWperpax]
seat_pitch = 30.0 * in_to_m
seat_width = 19.0 * in_to_m
aisle_halfwidth = 10.0 * in_to_m # per CFR § 25.815
Expand Down Expand Up @@ -1352,7 +1352,7 @@ function high_res_airplane_plot(ac; ax = nothing, label_fs = 16, save_name = not
end

#Seats
pax = parg[igWpay]/(215*lbf_to_N)
pax = parg[igWpay]/parm[imWperpax]
seat_pitch = 30.0 * in_to_m
seat_width = 19.0 * in_to_m
aisle_halfwidth = 10.0 * in_to_m # per CFR § 25.815
Expand Down
1 change: 1 addition & 0 deletions src/IO/read_input.jl
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ ranges = readmis("range")
parm[imRange, :] .= Len.(ranges)

Wpax = Force(readmis("weight_per_pax"))
parm[imWperpax, :] = Wpax
parm[imWpay, :] .= readmis("pax") * Wpax
parg[igWpaymax] = readmis("max_pax") * Wpax
parg[igfreserve] = readmis("fuel_reserves")
Expand Down
61 changes: 31 additions & 30 deletions src/misc/index.inc
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,37 @@
imwOpt = 1
imRange = 2
imWpay = 3
imaltTO = 4
imT0TO = 5
imWTO = 6
imWfuel = 7
imPFEI = 8
imV1 = 9
imV2 = 10
imtTO = 11
imFTO = 12
iml1 = 13
imlTO = 14
imlBF = 15
imlCB = 16
imgamVTO = 17
imgamVBF = 18
imgamVCB = 19
imgamVDE1 = 20
imgamVDEn = 21
imthCB = 22
imxCB = 23
imzCB = 24
imxFO = 25
imzFO = 26
imdBSL = 27
imdBCB = 28
imdBFO = 29
imfexcdw = 30
imfexcdt = 31
imfexcdf = 32
imtotal = 32
imWperpax = 4
imaltTO = 5
imT0TO = 6
imWTO = 7
imWfuel = 8
imPFEI = 9
imV1 = 10
imV2 = 11
imtTO = 12
imFTO = 13
iml1 = 14
imlTO = 15
imlBF = 16
imlCB = 17
imgamVTO = 18
imgamVBF = 19
imgamVCB = 20
imgamVDE1 = 21
imgamVDEn = 22
imthCB = 23
imxCB = 24
imzCB = 25
imxFO = 26
imzFO = 27
imdBSL = 28
imdBCB = 29
imdBFO = 30
imfexcdw = 31
imfexcdt = 32
imfexcdf = 33
imtotal = 34
askprash marked this conversation as resolved.
Show resolved Hide resolved

#---- indices for geometry (airframe) variables and other sizing variables
const igFOpt = 1
Expand Down
Loading