Skip to content

Commit

Permalink
Merge branch 'jbook' into 1049_plots
Browse files Browse the repository at this point in the history
  • Loading branch information
swryan committed Mar 22, 2024
2 parents 94aef41 + f6a3b2c commit 3bbd960
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions docs/dymos_book/examples/water_rocket/water_rocket.ipynb
Expand Up @@ -52,7 +52,7 @@
"Author: Bernardo Bahia Monteiro (bbahia@umich.edu)\n",
"\n",
"In this example, we will optimize a water rocket for range and height at the apogee, using design variables that are easily modifiable just before launch: the empty mass, the initial water volume and the launch angle.\n",
"This example builds on [multi-phase cannonball](../multi_phase_cannonball/multi_phase_cannonball.md) ane is adapted from _Optimization of a Water Rocket in OpenMDAO/Dymos_ {cite}`bbahia_2020`.\n",
"This example builds on [multi-phase cannonball](../multi_phase_cannonball/multi_phase_cannonball.ipynb) ane is adapted from _Optimization of a Water Rocket in OpenMDAO/Dymos_ {cite}`bbahia_2020`.\n",
"\n",
"## Nomenclature\n",
"\n",
Expand Down Expand Up @@ -114,7 +114,7 @@
" <figcaption>N2 diagram for the water rocket model</figcaption>\n",
"</figure>\n",
"\n",
"`atmos`, `dynamic_pressure`, `aero` and `eom` are the same models used in [multi-phase cannonball](../multi_phase_cannonball/multi_phase_cannonball.md).\n",
"`atmos`, `dynamic_pressure`, `aero` and `eom` are the same models used in [multi-phase cannonball](../multi_phase_cannonball/multi_phase_cannonball.ipynb).\n",
"The remaining components are discussed below.\n",
"\n",
"```{Warning}\n",
Expand All @@ -124,7 +124,7 @@
"```\n",
"\n",
"```{Note}\n",
"Since the range of altitudes achieved by the water rocket is very small (100m), the air density and pressure are practically constant, thus the use of an atmospheric model is not necessary. However, using it makes it easier to reuse code from [multi-phase cannonball (../multi_phase_cannonball/multi_phase_cannonball.md).\n",
"Since the range of altitudes achieved by the water rocket is very small (100m), the air density and pressure are practically constant, thus the use of an atmospheric model is not necessary. However, using it makes it easier to reuse code from [multi-phase cannonball (../multi_phase_cannonball/multi_phase_cannonball.ipynb).\n",
"```\n",
"\n",
"### Water engine\n",
Expand Down
14 changes: 7 additions & 7 deletions docs/dymos_book/faq/faq.md
@@ -1,9 +1,9 @@
# Frequently Asked Questions

- [How do I add an ODE output to the timeseries outputs?](add_ode_output_to_timeseries.md)
- [How do I connect a scalar input to the ODE?](connect_scalar_parameters_to_ode.md)
- [How do connect the outputs of an upstream analysis as inputs to Dymos?](upstream_analysis.md)
- [How do connect the outputs of Dymos to a downstream analysis?](downstream_analysis.md)
- [How do I run two phases parallel-in-time?](tandem_phases.md)
- [How can I more efficiently use finite-differenced components in the ODE?](use_partial_coloring.md)
- [How can I debug models when things go wrong?](debugging.md)
- [How do I add an ODE output to the timeseries outputs?](add_ode_output_to_timeseries.ipynb)
- [How do I connect a scalar input to the ODE?](connect_scalar_parameters_to_ode.ipynb)
- [How do connect the outputs of an upstream analysis as inputs to Dymos?](upstream_analysis.ipynb)
- [How do connect the outputs of Dymos to a downstream analysis?](downstream_analysis.ipynb)
- [How do I run two phases parallel-in-time?](tandem_phases.ipynb)
- [How can I more efficiently use finite-differenced components in the ODE?](use_partial_coloring.ipynb)
- [How can I debug models when things go wrong?](debugging.ipynb)
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -6,7 +6,7 @@
'matplotlib',
'bokeh',
'jupyter',
'jupyter-book==0.14',
'jupyter-book',
'nbconvert',
'notebook',
'ipython',
Expand Down

0 comments on commit 3bbd960

Please sign in to comment.