reordered turbine cooling HX calculation

MIT-LAE · Jun 11, 2024 · eeb7899 · eeb7899
1 parent 98b029f
commit eeb7899
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/engine/tfoper.jl b/src/engine/tfoper.jl
@@ -906,14 +906,14 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
                   Trr_mh = Trr_gmi4 * (gmi4_Rt4 * Rt4_mh + gmi4_cpt4 * cpt4_mh)
                   Trr_Tb = Trr_gmi4 * (gmi4_Rt4 * Rt4_Tb + gmi4_cpt4 * cpt4_Tb)
 
-                  if (icool == 1)
-                        # Heat exchanger to cool turbine cooling air
-                        ht_tc = ht3 + Δh_TurbC #Specific enthalpy of turbine cooling air
-                        Tt_tc, Tttc_httc, _ = gas_tsetd(alpha, nair, ht_tc, Tt3) #Temperature of turbine cooling air
+                  # Heat exchanger to cool turbine cooling air
+                  ht_tc = ht3 + Δh_TurbC #Specific enthalpy of turbine cooling air
+                  Tt_tc, Tttc_httc, _ = gas_tsetd(alpha, nair, ht_tc, Tt3) #Temperature of turbine cooling air
 
-                        httc_ht3 = 1.0
-                        Tttc_Tt3 = Tttc_httc * httc_ht3 / Tt3_ht3
+                  httc_ht3 = 1.0
+                  Tttc_Tt3 = Tttc_httc * httc_ht3 / Tt3_ht3
 
+                  if (icool == 1)
                         #------ epsrow(.) is assumed to be passed in.. calculate Tmrow(.)
                         Tmrow_copy = Tmcalc(ncrowx, ncrow,
                               Tt_tc, Tb, dTstrk, Trrat,
@@ -936,13 +936,6 @@ function tfoper!(gee, M0, T0, p0, a0, Tref, pref,
                         fc_Mi = fc_fo * fo_Mi
 
                   else
-                        # Heat exchanger to cool turbine cooling air
-                        ht_tc = ht3 + Δh_TurbC #Specific enthalpy of turbine cooling air
-                        Tt_tc, Tttc_httc, _ = gas_tsetd(alpha, nair, ht_tc, Tt3) #Temperature of turbine cooling air
-
-                        httc_ht3 = 1.0
-                        Tttc_Tt3 = Tttc_httc * httc_ht3 / Tt3_ht3
-
                         #------ calculate cooling mass flow ratios epsrow(.) to get specified Tmrow(.)
                         ncrow, epsrow_copy, epsrow_Tttc, epsrow_Tb, epsrow_Trr = mcool(ncrowx,
                               Tmrow, Tt_tc, Tb, dTstrk, Trrat,