Skip to content

Commit 8bc4e5c

Browse files
committed
fixed an error due to merge
1 parent 6ab93ea commit 8bc4e5c

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

  • aviary/subsystems/mass/gasp_based

aviary/subsystems/mass/gasp_based/fixed.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ def setup_partials(self):
7070
Aircraft.Wing.ASPECT_RATIO,
7171
],
7272
)
73-
self.declare_partials(Aircraft.Engine.POSITION_FACTOR, Aircraft.Design.MAX_MACH)
74-
self.declare_partials(Aircraft.Propulsion.ENGINE_POSITION_FACTOR, ['max_mach'])
73+
self.declare_partials(Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH)
7574
self.declare_partials(
7675
'half_sweep',
7776
[
@@ -226,13 +225,15 @@ def compute_partials(self, inputs, J):
226225
max_mach, 0.75, 1 / 320.0
227226
) + 1.05 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
228227
if num_wing_engines == 2 or num_wing_engines == 3:
229-
J[Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH] = -0.98 * dSigmoidXdx(
230-
max_mach, 0.75, 1 / 320.0
231-
) + 0.95 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
228+
J[Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH] = (
229+
-0.98 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
230+
+ 0.95 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
231+
)
232232
if num_wing_engines == 4:
233-
J[Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH] = -0.95 * dSigmoidXdx(
234-
max_mach, 0.75, 1 / 320.0
235-
) + 0.9 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
233+
J[Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH] = (
234+
-0.95 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
235+
+ 0.9 * dSigmoidXdx(max_mach, 0.75, 1 / 320.0)
236+
)
236237
else:
237238
J[Aircraft.Propulsion.ENGINE_POSITION_FACTOR, Aircraft.Design.MAX_MACH] = 0.0
238239

0 commit comments

Comments
 (0)