Skip to content

Commit

Permalink
changed thrust calculation when engine is choked
Browse files Browse the repository at this point in the history 
fixed issue with crossed derivatives
  • Loading branch information
@ngomezve
ngomezve committed Oct 25, 2024
1 parent 3619679 commit 0e10f38
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 47 deletions.
50 changes: 32 additions & 18 deletions src/engine/tfoper.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2005,6 +2005,11 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
h7_mf = h7_pt7 * pt7_mf + h7_st7 * st7_mf
s7_mf = s7_pt7 * pt7_mf + s7_st7 * st7_mf

p7_ml = p7_pt7 * pt7_ml
T7_ml = T7_pt7 * pt7_ml
h7_ml = h7_pt7 * pt7_ml
s7_ml = s7_pt7 * pt7_ml

Check warning on line 2011 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2008-L2011 

Added lines #L2008 - L2011 were not covered by tests

p7_Mi = p7_pt7 * pt7_Mi
T7_Mi = T7_pt7 * pt7_Mi
h7_Mi = h7_pt7 * pt7_Mi
Expand Down Expand Up @@ -2037,6 +2042,11 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
h7_mf = h7_ht7 * ht7_mf + h7_Tt7 * Tt7_mf
s7_mf = s7_ht7 * ht7_mf + s7_Tt7 * Tt7_mf

p7_ml = p7_pt7 * pt7_ml
T7_ml = 0.0 #Choked, so independent of total pressure
h7_ml = 0.0
s7_ml = 0.0

Check warning on line 2048 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2045-L2048 

Added lines #L2045 - L2048 were not covered by tests

p7_Mi = p7_pt7 * pt7_Mi
T7_Mi = 0.0

Expand All @@ -2046,12 +2056,14 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
u7 = sqrt(2.0 * (ht7 - h7))
u7_pf = (ht7_pf - h7_pf) / u7
u7_mf = (ht7_mf - h7_mf) / u7
u7_ml = (ht7_ml - h7_ml) / u7

Check warning on line 2059 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2059 

Added line #L2059 was not covered by tests
u7_Mi = ht7_Mi / u7
else
u7 = 0.0
u7tmp = max(0.2 * u0, 0.02 * sqrt(Rt7 * Tt7))
u7_pf = (ht7_pf - h7_pf) / u7tmp
u7_mf = (ht7_mf - h7_mf) / u7tmp
u7_ml = (ht7_ml - h7_ml) / u7tmp

Check warning on line 2066 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2066 

Added line #L2066 was not covered by tests
u7_Mi = ht7_Mi / u7tmp
end

Expand Down Expand Up @@ -2558,23 +2570,25 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
else
Finl = Phiinl / u0
end
F = ((1.0 - fo + ff) * u6 - u0 + BPR * (u8 - u0) + fo * u9) * mdotl + Finl
F_ff = u6 * mdotl
F_u6 = (1.0 - fo + ff) * mdotl
F_BPR = (u8 - u0) * mdotl
F_u8 = BPR * mdotl
F_fo = (-u6 + u9) * mdotl
F_mdotl = (1.0 - fo + ff) * u6 - u0 + BPR * (u8 - u0) + fo * u9

F_pf = F_u6 * u6_pf + F_u8 * u8_pf
F_pl = F_ff * ff_pl + F_u6 * u6_pl
F_ph = F_ff * ff_ph + F_u6 * u6_ph
F_mf = F_ff * ff_mf + F_u6 * u6_mf + F_u8 * u8_mf + F_BPR * BPR_mf
F_ml = F_ff * ff_ml + F_u6 * u6_ml + F_u8 * u8_ml + F_BPR * BPR_ml
F_mh = F_ff * ff_mh + F_u6 * u6_mh
F_Tb = F_ff * ff_Tb + F_u6 * u6_Tb
F_Pc = F_u6 * u6_Pc
F_Mi = F_ff * ff_Mi + F_u6 * u6_Mi + F_u8 * u8_Mi + F_BPR * BPR_Mi
F = ((1.0 - fo + ff) * u5 - u0 + BPR * (u7 - u0) + fo * u9) * mdotl + A5 * (p5 - p0) + A7 * (p7 - p0) + Finl
F_ff = u5 * mdotl
F_u5 = (1.0 - fo + ff) * mdotl
F_BPR = (u7 - u0) * mdotl
F_u7 = BPR * mdotl
F_fo = (-u5 + u9) * mdotl
F_mdotl = (1.0 - fo + ff) * u5 - u0 + BPR * (u7 - u0) + fo * u9
F_p5 = A5
F_p7 = A7

Check warning on line 2581 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2573-L2581 

Added lines #L2573 - L2581 were not covered by tests

F_pf = F_u5 * u5_pf + F_u7 * u7_pf + F_p5 * p5_pf + F_p7 * p7_pf
F_pl = F_ff * ff_pl + F_u5 * u5_pl + F_p5 * p5_pl
F_ph = F_ff * ff_ph + F_u5 * u5_ph + F_p5 * p5_ph
F_mf = F_ff * ff_mf + F_u5 * u5_mf + F_u7 * u7_mf + F_BPR * BPR_mf + F_p5 * p5_mf + F_p7 * p7_mf
F_ml = F_ff * ff_ml + F_u5 * u5_ml + F_u7 * u7_ml + F_BPR * BPR_ml + F_p5 * p5_ml + F_p7 * p7_ml
F_mh = F_ff * ff_mh + F_u5 * u5_mh + F_p5 * p5_mh
F_Tb = F_ff * ff_Tb + F_u5 * u5_Tb + F_p5 * p5_Tb
F_Pc = F_u5 * u5_Pc + F_p5 * p5_Pc
F_Mi = F_ff * ff_Mi + F_u5 * u5_Mi + F_u7 * u7_Mi + F_BPR * BPR_Mi + F_p5 * p5_Mi + F_p7 * p7_Mi

Check warning on line 2591 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L2583-L2591 

Added lines #L2583 - L2591 were not covered by tests

F_mf = F_mf + F_fo * fo_mf + F_mdotl * mdotl_mf
F_ml = F_ml + F_fo * fo_ml + F_mdotl * mdotl_ml
Expand Down Expand Up @@ -3120,7 +3134,7 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
else
Finl = Phiinl / u0
end
Feng = ((1.0 - fo + ff) * u6 - u0 + BPR * (u8 - u0) + fo * u9) * mcore + Finl
Feng = ((1.0 - fo + ff) * u5 - u0 + BPR * (u7 - u0) + fo * u9) * mcore + A5 * (p5 - p0) + A7 * (p7 - p0) + Finl

Check warning on line 3137 in src/engine/tfoper.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfoper.jl#L3137 

Added line #L3137 was not covered by tests

#---- overall Fsp and TSFC
if (u0 == 0.0)
Expand Down
58 changes: 29 additions & 29 deletions src/engine/tfsize.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,31 +625,6 @@ function tfsize!(gee, M0, T0, p0, a0, M2, M25,
Finl = Phiinl / u0
end

#---- set core mass flow from specified effective net thrust
mcore = (Feng - Finl) /
((1.0 - fo + ff) * u6 - u0 + BPR * (u8 - u0) + fo * u9)

#---- corresponding new offtake mass flow fraction
fonew = mofft / mcore
dfo = fonew - foold

fo = fo + rlxfo * dfo

#---- estimate better new mass flow, compensating for change in mass offtake
mfac = min(2.0, 1.0 / (1.0 - dfo))
mcore = mcore * mfac

#---- power offtake per mass flow
Pom = Pofft / mcore

#---- overall Fsp and TSFC
Fsp = Feng / (u0 * mcore * (1.0 + BPR))
if (Feng <= 0.0)
TSFC = 0.0
else
TSFC = (gee * ff * mcore) / Feng
end

# ===============================================================

M8 = u8 / sqrt(cp8 * R8 / (cp8 - R8) * T8)
Expand All @@ -671,10 +646,6 @@ function tfsize!(gee, M0, T0, p0, a0, M2, M25,
end
rho7 = p7 / (R7 * T7)

#---- size fan nozzle and plume areas
A7 = BPR * mcore / (rho7 * u7)
A8 = BPR * mcore / (rho8 * u8)

# ===============================================================
M6 = u6 / sqrt(cp6 * R6 / (cp6 - R6) * T6)
# write(*,*) 'u6,M6', u6,M6
Expand All @@ -697,6 +668,35 @@ function tfsize!(gee, M0, T0, p0, a0, M2, M25,

rho5 = p5 / (R5 * T5)

#---- set core mass flow from specified effective net thrust
mcore = (Feng - Finl) /

Check warning on line 672 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L672 

Added line #L672 was not covered by tests
((1.0 - fo + ff) * (u5 + (p5 - p0)/(rho5 * u5)) - u0 + BPR * (u7 - u0 + (p7 - p0)/(rho7 * u7)) + fo * u9)

#---- corresponding new offtake mass flow fraction
fonew = mofft / mcore
dfo = fonew - foold

Check warning on line 677 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L676-L677 

Added lines #L676 - L677 were not covered by tests

fo = fo + rlxfo * dfo

Check warning on line 679 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L679 

Added line #L679 was not covered by tests

#---- estimate better new mass flow, compensating for change in mass offtake
mfac = min(2.0, 1.0 / (1.0 - dfo))
mcore = mcore * mfac

Check warning on line 683 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L682-L683 

Added lines #L682 - L683 were not covered by tests

#---- power offtake per mass flow
Pom = Pofft / mcore

Check warning on line 686 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L686 

Added line #L686 was not covered by tests

#---- overall Fsp and TSFC
Fsp = Feng / (u0 * mcore * (1.0 + BPR))
if (Feng <= 0.0)
TSFC = 0.0

Check warning on line 691 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L689-L691 

Added lines #L689 - L691 were not covered by tests
else
TSFC = (gee * ff * mcore) / Feng

Check warning on line 693 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L693 

Added line #L693 was not covered by tests
end

#---- size fan nozzle and plume areas
A7 = BPR * mcore / (rho7 * u7)
A8 = BPR * mcore / (rho8 * u8)

Check warning on line 698 in src/engine/tfsize.jl

View check run for this annotation

Codecov / codecov/patch

src/engine/tfsize.jl#L697-L698 

Added lines #L697 - L698 were not covered by tests

#---- size core nozzle and plume areas
A5 = (1.0 - fo + ff) * mcore / (rho5 * u5)
A6 = (1.0 - fo + ff) * mcore / (rho6 * u6)
Expand Down

0 comments on commit 0e10f38

Please sign in to comment.