Skip to content

Commit 927b832

Browse files
authored
Merge pull request #630 from cmbenne3/fallout_summary_range
Update value of Mission.Summary.RANGE for fallout missions
2 parents 169c66a + d6fdda7 commit 927b832

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

aviary/interface/methods_for_level2.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ def link_phases(self):
15461546
connected=true_unless_mpi)
15471547

15481548
self.model.connect(f'traj.{self.regular_phases[-1]}.timeseries.distance',
1549-
'actual_range',
1549+
Mission.Summary.RANGE,
15501550
src_indices=[-1], flat_src_indices=True)
15511551

15521552
elif self.mission_method is SOLVED_2DOF:
@@ -1672,14 +1672,14 @@ def link_phases(self):
16721672
Mission.Landing.TOUCHDOWN_MASS, src_indices=[-1])
16731673

16741674
connect_map = {
1675-
f"traj.{self.regular_phases[-1]}.timeseries.distance": 'actual_range',
1675+
f"traj.{self.regular_phases[-1]}.timeseries.distance": Mission.Summary.RANGE,
16761676
}
16771677

16781678
else:
16791679
connect_map = {
16801680
"taxi.mass": "traj.mass_initial",
16811681
Mission.Takeoff.ROTATION_VELOCITY: "traj.SGMGroundroll_velocity_trigger",
1682-
"traj.distance_final": 'actual_range',
1682+
"traj.distance_final": Mission.Summary.RANGE,
16831683
"traj.mass_final": Mission.Landing.TOUCHDOWN_MASS,
16841684
}
16851685

@@ -2887,7 +2887,7 @@ def _add_objectives(self):
28872887
"val": self.target_range, "units": "NM"},
28882888
),
28892889
promotes_inputs=[
2890-
"actual_range",
2890+
("actual_range", Mission.Summary.RANGE),
28912891
("ascent_duration", Mission.Takeoff.ASCENT_DURATION),
28922892
],
28932893
promotes_outputs=[("reg_objective", Mission.Objectives.RANGE)],
@@ -2913,8 +2913,8 @@ def _add_objectives(self):
29132913
range_resid={"val": 30, "units": "NM"},
29142914
),
29152915
promotes_inputs=[
2916-
"actual_range",
2917-
("target_range", Mission.Summary.RANGE),
2916+
("actual_range", Mission.Summary.RANGE),
2917+
"target_range",
29182918
],
29192919
promotes_outputs=[
29202920
("range_resid", Mission.Constraints.RANGE_RESIDUAL)],

aviary/validation_cases/benchmark_tests/test_bench_GwGm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def test_bench_GwGm_shooting(self):
212212
)
213213

214214
assert_near_equal(
215-
prob.get_val(Mission.Summary.RANGE, units='NM'), 3675.0, tolerance=rtol
215+
prob.get_val(Mission.Summary.RANGE, units='NM'), 3765.48, tolerance=rtol
216216
)
217217

218218
assert_near_equal(

0 commit comments

Comments
 (0)