Skip to content

Commit bf66646

Browse files
authored
Merge pull request #114 from Kenneth-T-Moore/ref_regression
Tweaked some residual scalers to improve nested solver performance.
2 parents cf72dce + 12ddd14 commit bf66646

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

aviary/docs/theory_guide/building_metadata_syntax.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"source": [
2828
"# Building Metadata\n",
2929
"\n",
30-
"When working with Aviary models, sometimes it is necessary to extend the Aviary-core variable hierarchy or update existing metadata. The syntax for `add_meta_data` and `update_meta_data` can be found below. For a more detailed explanation of metadata please visit [this link](../user_guide/variable_metadata.md).\n",
30+
"When working with Aviary models, sometimes it is necessary to extend the Aviary-core variable hierarchy or update existing metadata. The syntax for `add_meta_data` and `update_meta_data` can be found below. For a more detailed explanation of metadata please visit [this link](../user_guide/variable_metadata).\n",
3131
"\n",
3232
"```{eval-rst}\n",
3333
".. autofunction:: aviary.utils.develop_metadata.add_meta_data\n",

aviary/docs/theory_guide/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The [mass](./mass) calculations that Aviary provides are similar to the geometry
2020
The [mission analysis](./mission) calculations that Aviary provides are broader in scope than the other disciplines. Aviary provides two different types of equations of motion (2DOF and height energy), and also provides two different ways to integrate these EOMs (collocation and analytic shooting). The intended capability is that either EOM can be used with either integration technique.
2121

2222

23-
The second aspect of Aviary, instead of being computational like the first, is about subsystem integration. In addition to the capability to build purely Aviary-based aircraft models, Aviary provides the ability to build mixed-origin aircraft models, which are aircraft models consisting partially or entirely of external user-provided subsystems. In the case of a mixed-origin model, instead of just selecting existing Aviary subsystems and combining them into an aircraft model, the user also provides the Aviary code with their own subsystems (these could be pre-existing codes such as [pyCycle](https://github.com/OpenMDAO/pyCycle), or they could be new subsystems the user has built themselves). An example of a mixed-origin model is the [OpenAeroStruct example case](../examples/OAS_subsystem.md). In this example, the built-in Aviary subsystem for mass is partially replaced by external subsystems.
23+
The second aspect of Aviary, instead of being computational like the first, is about subsystem integration. In addition to the capability to build purely Aviary-based aircraft models, Aviary provides the ability to build mixed-origin aircraft models, which are aircraft models consisting partially or entirely of external user-provided subsystems. In the case of a mixed-origin model, instead of just selecting existing Aviary subsystems and combining them into an aircraft model, the user also provides the Aviary code with their own subsystems (these could be pre-existing codes such as [pyCycle](https://github.com/OpenMDAO/pyCycle), or they could be new subsystems the user has built themselves). An example of a mixed-origin model is the [OpenAeroStruct example case](../examples/OAS_subsystem). In this example, the built-in Aviary subsystem for mass is partially replaced by external subsystems.
2424

2525
### FLOPS/LEAPS References
2626
1. [Here](https://ntrs.nasa.gov/api/citations/20190000442/downloads/20190000442.pdf) is an overview of the LEAPS code development.

aviary/docs/theory_guide/merging_syntax.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"source": [
2727
"# Merging Variable Info\n",
2828
"\n",
29-
"When working with multiple external subsystems for Aviary, sometimes it is helpful to merge together variable hierarchies and metadata. The syntax for those merging functions can be found below. For more detailed descriptions of how to merge [metadata](../user_guide/variable_metadata.md) and [hierarchies](../user_guide/variable_hierarchy.md) visit the included links.\n",
29+
"When working with multiple external subsystems for Aviary, sometimes it is helpful to merge together variable hierarchies and metadata. The syntax for those merging functions can be found below. For more detailed descriptions of how to merge [metadata](../user_guide/variable_metadata) and [hierarchies](../user_guide/variable_hierarchy) visit the included links.\n",
3030
"\n",
3131
"```{eval-rst}\n",
3232
" .. autofunction:: aviary.utils.merge_hierarchies.merge_hierarchies\n",
@@ -64,4 +64,4 @@
6464
},
6565
"nbformat": 4,
6666
"nbformat_minor": 4
67-
}
67+
}

aviary/mission/flops_based/ode/mission_ODE.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ def setup(self):
164164
normalize=False,
165165
lower=0.0 if options['throttle_enforcement'] == 'bounded' else None,
166166
upper=1.0 if options['throttle_enforcement'] == 'bounded' else None,
167+
res_ref=1.0e6,
167168
),
168169
promotes_inputs=['*'],
169170
promotes_outputs=['*'])
@@ -187,7 +188,7 @@ def setup(self):
187188
exec_comp_string,
188189
initial_mass={'units': 'kg'},
189190
mass={'units': 'kg', 'shape': (nn,)},
190-
initial_mass_residual={'units': 'kg'},
191+
initial_mass_residual={'units': 'kg', 'res_ref': 1.0e5},
191192
)
192193

193194
self.add_subsystem('initial_mass_residual_constraint', initial_mass_residual_constraint,

aviary/subsystems/aerodynamics/flops_based/solved_alpha_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def setup(self):
7676
promotes_outputs=[Dynamic.Mission.LIFT, Dynamic.Mission.DRAG])
7777

7878
balance = self.add_subsystem('balance', om.BalanceComp())
79-
balance.add_balance('alpha', val=np.ones(nn), units='deg')
79+
balance.add_balance('alpha', val=np.ones(nn), units='deg', res_ref=1.0e6)
8080

8181
self.connect('balance.alpha', 'tabular_aero.alpha')
8282
self.connect('needed_lift.lift_resid', 'balance.lhs:alpha')

0 commit comments

Comments
 (0)