Merge pull request #5 from Kenneth-T-Moore/jason_external_engine

updated level 3 examples to adhere to new default subsystem syntax.
OpenMDAO · Jun 5, 2024 · aa07010 · aa07010
2 parents ea01f54 + f9d8c51
commit aa07010
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb b/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb
@@ -758,7 +758,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,

diff --git a/aviary/docs/getting_started/onboarding_level2.ipynb b/aviary/docs/getting_started/onboarding_level2.ipynb
@@ -750,7 +750,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -764,7 +764,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,

diff --git a/aviary/docs/user_guide/FLOPS_based_detailed_takeoff_and_landing.ipynb b/aviary/docs/user_guide/FLOPS_based_detailed_takeoff_and_landing.ipynb
@@ -46,6 +46,8 @@
     "\n",
     "from aviary.models.N3CC.N3CC_data import inputs\n",
     "\n",
+    "aviary_options = inputs.deepcopy()\n",
+    "\n",
     "# This builder can be used for both takeoff and landing phases\n",
     "aero_builder = av.CoreAerodynamicsBuilder(\n",
     "    name='low_speed_aero',\n",
@@ -79,7 +81,8 @@
     "\n",
     "# We also need propulsion analysis for takeoff and landing. No additional configuration\n",
     "# is needed for this builder\n",
-    "prop_builder = av.CorePropulsionBuilder()"
+    "engine = av.build_engine_deck(aviary_options)\n",
+    "prop_builder = av.CorePropulsionBuilder(engine_models=engine)"
    ]
   },
   {
@@ -254,10 +257,9 @@
     "    takeoff_mic_p2_builder, takeoff_mic_p2_to_engine_cutback_builder,\n",
     "    takeoff_engine_cutback_builder, takeoff_engine_cutback_to_mic_p1_builder,\n",
     "    takeoff_mic_p1_to_climb_builder, takeoff_liftoff_user_options)\n",
+    "from aviary.utils.test_utils.default_subsystems import get_default_premission_subsystems\n",
     "\n",
     "\n",
-    "aviary_options = inputs.deepcopy()\n",
-    "\n",
     "takeoff_trajectory_builder = av.DetailedTakeoffTrajectoryBuilder('detailed_takeoff')\n",
     "\n",
     "takeoff_trajectory_builder.set_brake_release_to_decision_speed(\n",
@@ -283,12 +285,15 @@
     "\n",
     "takeoff = om.Problem()\n",
     "\n",
+    "# default subsystems\n",
+    "default_premission_subsystems = get_default_premission_subsystems('FLOPS', engine)\n",
+    "    \n",
     "# Upstream pre-mission analysis for aero\n",
     "takeoff.model.add_subsystem(\n",
     "    'core_subsystems',\n",
     "    av.CorePreMission(\n",
     "        aviary_options=aviary_options,\n",
-    "        subsystems=av.default_premission_subsystems,\n",
+    "        subsystems=default_premission_subsystems,\n",
     "    ),\n",
     "    promotes_inputs=['*'],\n",
     "    promotes_outputs=['*'])\n",
@@ -541,7 +546,7 @@
     "    'core_subsystems',\n",
     "    av.CorePreMission(\n",
     "        aviary_options=aviary_options,\n",
-    "        subsystems=av.default_premission_subsystems,\n",
+    "        subsystems=default_premission_subsystems,\n",
     "    ),\n",
     "    promotes_inputs=['*'],\n",
     "    promotes_outputs=['*'])\n",
@@ -581,7 +586,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -595,7 +600,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,

diff --git a/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb b/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb
@@ -193,6 +193,7 @@
     "import dymos as dm\n",
     "\n",
     "import aviary.api as av\n",
+    "from aviary.utils.test_utils.default_subsystems import get_default_mission_subsystems\n",
     "\n",
     "\n",
     "prob = om.Problem(model=om.Group())\n",
@@ -271,6 +272,9 @@
     "prob.model.add_design_var(av.Mission.Design.GROSS_MASS, units='lbm',\n",
     "                            lower=100000.0, upper=200000.0, ref=135000)\n",
     "\n",
+    "# default subsystems\n",
+    "default_mission_subsystems = get_default_mission_subsystems('FLOPS', engine)\n",
+    "\n",
     "#################\n",
     "# Define Phases #\n",
     "#################\n",
@@ -300,7 +304,7 @@
     "        'fix_initial': (True, 'unitless'),\n",
     "        'use_polynomial_control': (False, 'unitless'),\n",
     "    }),\n",
-    "    core_subsystems=av.default_mission_subsystems,\n",
+    "    core_subsystems=default_mission_subsystems,\n",
     "    subsystem_options={'core_aerodynamics': {'method': 'computed'}},\n",
     "    transcription=transcription_climb,\n",
     ")\n",
@@ -315,7 +319,7 @@
     "        'required_available_climb_rate': (300, 'ft/min'),\n",
     "        'fix_initial': (False, 'unitless'),\n",
     "    }),\n",
-    "    core_subsystems=av.default_mission_subsystems,\n",
+    "    core_subsystems=default_mission_subsystems,\n",
     "    subsystem_options={'core_aerodynamics': {'method': 'computed'}},\n",
     "    transcription=transcription_cruise,\n",
     ")\n",
@@ -330,7 +334,7 @@
     "        'fix_initial': (False, 'unitless'),\n",
     "        'use_polynomial_control': (False, 'unitless'),\n",
     "    }),\n",
-    "    core_subsystems=av.default_mission_subsystems,\n",
+    "    core_subsystems=default_mission_subsystems,\n",
     "    subsystem_options={'core_aerodynamics': {'method': 'computed'}},\n",
     "    transcription=transcription_descent,\n",
     ")\n",

diff --git a/aviary/docs/user_guide/external_aero.ipynb b/aviary/docs/user_guide/external_aero.ipynb
@@ -252,14 +252,6 @@
     "prob.add_objective(objective_type=\"mass\", ref=-1e5)\n",
     "prob.setup()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a9ed7c42",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {