Skip to content

Commit

Permalink
Soooo many cleanups.
Browse files Browse the repository at this point in the history
  • Loading branch information
@1ozturkbe
1ozturkbe committed Sep 2, 2019
1 parent af2ab51 commit 500b065
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 125 deletions.
6 changes: 1 addition & 5 deletions stand_alone_simple_profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def setup(self, aircraft, state, **kwargs):
WLoadmax = Variable('W_{Load_max}', 'N/m^2', 'Max Wing Loading')
WLoad = Variable('W_{Load}', 'N/m^2', 'Wing Loading')
t = Variable('tmin', 'min', 'Segment Flight Time in Minutes')
thours = Variable('thr', 'hour', 'Segment Flight Time in Hours')

constraints = []

Expand All @@ -101,10 +100,7 @@ def setup(self, aircraft, state, **kwargs):
WLoad <= WLoadmax,

#compute fuel burn from TSFC
W_burn == aircraft['numeng']*self.engineP['TSFC'] * thours * self.engineP['thrust'],

#time unit conversion
t == thours,
W_burn == aircraft['numeng']*self.engineP['TSFC'] * t * self.engineP['thrust'],

#make lift equal weight --> small angle approx in climb
self.wingP['L_{wing}'] == W_avg,
Expand Down
8 changes: 4 additions & 4 deletions turbofan/TASOPT_flight_profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ def setup(self, Nclimb, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['c1'] == 1+.5*(.401)*M0**2,

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],
ac['numeng']*ac.engine['F'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],

#climb rate constraints
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][:Nclimb]]),
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F'][:Nclimb]]),
]

M2 = .8
Expand All @@ -179,10 +179,10 @@ def setup(self, Nclimb, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['M_{2.5}'][3] == M25,

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][Nclimb:] >= cruise['D'] + cruise['W_{avg}'] * cruise['\\theta'],
ac['numeng']*ac.engine['F'][Nclimb:] >= cruise['D'] + cruise['W_{avg}'] * cruise['\\theta'],

#climb rate constraints
TCS([cruise['excessP'] + cruise.state['V'] * cruise['D'] <= cruise.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][Nclimb:]]),
TCS([cruise['excessP'] + cruise.state['V'] * cruise['D'] <= cruise.state['V'] * ac['numeng'] * ac.engine['F'][Nclimb:]]),
]

return constraints + ac + climb + cruise + enginecruise + engineclimb + enginestate + statelinking
Expand Down
12 changes: 6 additions & 6 deletions turbofan/TASOPT_flight_profile_2_climb_segs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ def setup(self, Nclimb1, Nclimb2, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['c1'] == 1+.5*(.401)*M0**2,

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][:Nclimb1] >= climb1['D'] + climb1['W_{avg}'] * climb1['\\theta'],
ac['numeng']*ac.engine['F'][:Nclimb1] >= climb1['D'] + climb1['W_{avg}'] * climb1['\\theta'],

#climb rate constraints
TCS([climb1['excessP'] + climb1.state['V'] * climb1['D'] <= climb1.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][:Nclimb1]]),
TCS([climb1['excessP'] + climb1.state['V'] * climb1['D'] <= climb1.state['V'] * ac['numeng'] * ac.engine['F'][:Nclimb1]]),
]

M2 = .8
Expand All @@ -196,10 +196,10 @@ def setup(self, Nclimb1, Nclimb2, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['M_2'][Nclimb1:Nclimb1 + Nclimb2] == climb2['M'],

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][Nclimb1:Nclimb1 + Nclimb2] >= climb2['D'] + climb2['W_{avg}'] * climb2['\\theta'],
ac['numeng']*ac.engine['F'][Nclimb1:Nclimb1 + Nclimb2] >= climb2['D'] + climb2['W_{avg}'] * climb2['\\theta'],

#climb rate constraints
TCS([climb2['excessP'] + climb2.state['V'] * climb2['D'] <= climb2.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][Nclimb1:Nclimb1 + Nclimb2]]),
TCS([climb2['excessP'] + climb2.state['V'] * climb2['D'] <= climb2.state['V'] * ac['numeng'] * ac.engine['F'][Nclimb1:Nclimb1 + Nclimb2]]),
]

M2 = .8
Expand All @@ -214,10 +214,10 @@ def setup(self, Nclimb1, Nclimb2, Ncruise, substitutions = None, **kwargs):
## cruise['M'] >= .7,

#constraint on drag and thrust
ac['numeng'] * ac.engine['F_{spec}'][Nclimb1 + Nclimb2:] >= cruise['D'] + cruise['W_{avg}'] * cruise['\\theta'],
ac['numeng'] * ac.engine['F'][Nclimb1 + Nclimb2:] >= cruise['D'] + cruise['W_{avg}'] * cruise['\\theta'],

#climb rate constraints
TCS([cruise['excessP'] + cruise.state['V'] * cruise['D'] <= cruise.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][Nclimb1 + Nclimb2:]]),
TCS([cruise['excessP'] + cruise.state['V'] * cruise['D'] <= cruise.state['V'] * ac['numeng'] * ac.engine['F'][Nclimb1 + Nclimb2:]]),
]

return constraints + ac + climb1 + climb2 + cruise + enginecruise + engineclimb1 + engineclimb2 + enginestate + statelinking
Expand Down
6 changes: 3 additions & 3 deletions turbofan/engine_flight_profile_fleet.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ def setup(self, Nclimb, Ncruise, Nfleet):
ac.engine.engineP['c1'] == 1+.5*(.401)*M0**2,

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],
ac['numeng']*ac.engine['F'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],

#climb rate constraints
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][:Nclimb]]),
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F'][:Nclimb]]),
]

M25 = .6
Expand All @@ -177,7 +177,7 @@ def setup(self, Nclimb, Ncruise, Nfleet):
ac.engine.engineP['M_{2.5}'][Nclimb:] == M25,

#steady level flight constraint on D
cruise['D'] == ac['numeng'] * ac.engine['F_{spec}'][Nclimb:],
cruise['D'] == ac['numeng'] * ac.engine['F'][Nclimb:],

#breguet range eqn
TCS([cruise['z_{bre}'] >= (ac.engine['TSFC'][Nclimb:] * cruise['thr']*
Expand Down
6 changes: 3 additions & 3 deletions turbofan/engine_flight_profile_integration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ def setup(self, Nclimb, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['c1'] == 1+.5*(.401)*M0**2,

#constraint on drag and thrust
ac['numeng']*ac.engine['F_{spec}'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],
ac['numeng']*ac.engine['F'][:Nclimb] >= climb['D'] + climb['W_{avg}'] * climb['\\theta'],

#climb rate constraints
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F_{spec}'][:Nclimb]]),
TCS([climb['excessP'] + climb.state['V'] * climb['D'] <= climb.state['V'] * ac['numeng'] * ac.engine['F'][:Nclimb]]),
]

M25 = .6
Expand All @@ -165,7 +165,7 @@ def setup(self, Nclimb, Ncruise, substitutions = None, **kwargs):
ac.engine.engineP['M_{2.5}'][Nclimb:] == M25,

#steady level flight constraint on D
cruise['D'] == ac['numeng'] * ac.engine['F_{spec}'][Nclimb:],
cruise['D'] == ac['numeng'] * ac.engine['F'][Nclimb:],

#breguet range eqn
TCS([cruise['z_{bre}'] >= (ac.engine['TSFC'][Nclimb:] * cruise['thr']*
Expand Down
2 changes: 1 addition & 1 deletion turbofan/engine_flight_profile_integration_no_climb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def setup(self, substitutions = None, **kwargs):


#steady level flight constraint on D
cruise['D'] == ac['numeng'] * ac.engine['F_{spec}'],
cruise['D'] == ac['numeng'] * ac.engine['F'],

#breguet range eqn
TCS([cruise['z_{bre}'] >= (ac.engine['TSFC'] * cruise['thr']*
Expand Down
2 changes: 1 addition & 1 deletion turbofan/engine_sols/baselineTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ p17
S'N'
sS'name'
p18
S'F_{spec}'
S'F'
p19
sS'models'
p20
Expand Down
2 changes: 1 addition & 1 deletion turbofan/engine_sols/test1.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ p17
S'N'
sS'name'
p18
S'F_{spec}'
S'F'
p19
sS'models'
p20
Expand Down
2 changes: 1 addition & 1 deletion turbofan/engine_sols/test2.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ p17
S'N'
sS'name'
p18
S'F_{spec}'
S'F'
p19
sS'models'
p20
Expand Down
2 changes: 1 addition & 1 deletion turbofan/engine_sols/test3.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ p17
S'N'
sS'name'
p18
S'F_{spec}'
S'F'
p19
sS'models'
p20
Expand Down
Loading

0 comments on commit 500b065

Please sign in to comment.