Skip to content

Commit

Permalink
Conflict resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenneth-T-Moore committed Jan 9, 2025
1 parent ec89f78 commit 8cef416
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions aviary/subsystems/aerodynamics/flops_based/tabular_aero_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ def setup(self):
'lift_coefficient',
CL(num_nodes=nn),
promotes_inputs=[
Dynamic.Mission.MASS,
Dynamic.Vehicle.MASS,
Aircraft.Wing.AREA,
Dynamic.Mission.DYNAMIC_PRESSURE,
Dynamic.Atmosphere.DYNAMIC_PRESSURE,
],
promotes_outputs=[('cl', 'lift_coefficient'), Dynamic.Mission.LIFT])
promotes_outputs=[('cl', 'lift_coefficient'), Dynamic.Vehicle.LIFT])

if connect_training_data:
extra_promotes = [('zero_lift_drag_coefficient_train',
Expand Down Expand Up @@ -171,14 +171,6 @@ def setup(self):
promotes_outputs=['*'],
)

self.add_subsystem(
'CD0_interp', CD0_interp, promotes_inputs=['*'], promotes_outputs=['*']
)

self.add_subsystem(
'CDI_interp', CDI_interp, promotes_inputs=['*'], promotes_outputs=['*']
)

self.add_subsystem(
Dynamic.Vehicle.DRAG,
Drag(num_nodes=nn),
Expand Down

0 comments on commit 8cef416

Please sign in to comment.