Merge branch 'main' into doctape_updates

OpenMDAO · Jan 7, 2025 · 2a8ccee · 2a8ccee
2 parents 0b9605a + 75c0804
commit 2a8ccee
Show file tree

Hide file tree

Showing 400 changed files with 15,471 additions and 12,143 deletions.
diff --git a/.github/workflows/test_benchmarks.yml b/.github/workflows/test_benchmarks.yml
@@ -38,8 +38,7 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            #OPENMDAO: 'latest'
-            OPENMDAO: '3.34.2'
+            OPENMDAO: 'latest'
             DYMOS: 'latest'
             SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
             SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}}

diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml
@@ -38,8 +38,7 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            #OPENMDAO: 'latest'
-            OPENMDAO: '3.34.2'
+            OPENMDAO: 'latest'
             DYMOS: 'latest'
             SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
             SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}}

diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
@@ -34,13 +34,14 @@ jobs:
       matrix:
         include:
           # oldest versions of openmdao/dymos
+          # Note: bugfixes sometimes require incrementing the minimal version of openmdao or dymos.
           - NAME: oldest
             PY: '3.9'
             NUMPY: '1.20'
             SCIPY: '1.6'
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            OPENMDAO: '3.33.0'
+            OPENMDAO: '3.35.0'
             DYMOS: '1.8.0'
 
           # latest versions of openmdao/dymos
@@ -50,8 +51,7 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            #OPENMDAO: 'latest'
-            OPENMDAO: '3.34.2'
+            OPENMDAO: 'latest'
             DYMOS: 'latest'
 
     steps:

diff --git a/.github/workflows/test_workflow_dev_deps.yml b/.github/workflows/test_workflow_dev_deps.yml
@@ -27,8 +27,7 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'latest'
             SNOPT: '7.7'
-            #OPENMDAO: 'dev'
-            OPENMDAO: '3.34.2'
+            OPENMDAO: 'dev'
             DYMOS: 'dev'
 
     steps:

diff --git a/.github/workflows/test_workflow_no_dev_install.yml b/.github/workflows/test_workflow_no_dev_install.yml
@@ -70,7 +70,6 @@ jobs:
           echo ""
           echo "Temporarily install specific versions for now."
           pip install "numpy<2"
-          pip install "openmdao==3.34.2"
           pip install packaging
           pip install .[all]
 

diff --git a/.gitignore b/.gitignore
@@ -152,5 +152,9 @@ coloring_files/
 # OpenMDAO N2 diagrams
 n2.html
 
+# Input and output lists
+input_list.txt
+output_list.txt
+
 # Windows downloads
 *:Zone.Identifier
diff --git a/aviary/api.py b/aviary/api.py
@@ -23,7 +23,7 @@
 from aviary.variable_info.options import get_option_defaults, is_option
 from aviary.utils.develop_metadata import add_meta_data, update_meta_data
 from aviary.variable_info.variable_meta_data import CoreMetaData
-from aviary.variable_info.functions import add_aviary_input, add_aviary_output, get_units, override_aviary_vars, setup_trajectory_params
+from aviary.variable_info.functions import add_aviary_input, add_aviary_output, get_units, override_aviary_vars, setup_trajectory_params, setup_model_options
 from aviary.utils.merge_hierarchies import merge_hierarchies
 from aviary.utils.merge_variable_metadata import merge_meta_data
 from aviary.utils.named_values import NamedValues, get_keys, get_items, get_values

diff --git a/aviary/docs/_toc.yml b/aviary/docs/_toc.yml
@@ -45,6 +45,7 @@ parts:
       - file: user_guide/features/overriding
       - file: user_guide/FLOPS_based_detailed_takeoff_and_landing
       - file: user_guide/reserve_missions
+      - file: user_guide/multi_mission
       - file: user_guide/off_design_missions
       - file: user_guide/SGM_capabilities
     - file: user_guide/troubleshooting
@@ -57,6 +58,7 @@ parts:
     - file: examples/coupled_aircraft_mission_optimization
     - file: examples/additional_flight_phases
     - file: examples/reserve_missions
+    - file: examples/multi_mission
     - file: examples/off_design_example
     - file: examples/OAS_subsystem
     - file: examples/level_2_detailed_takeoff_and_landing

diff --git a/aviary/docs/developer_guide/codebase_overview.ipynb b/aviary/docs/developer_guide/codebase_overview.ipynb
@@ -18,7 +18,7 @@
     "    'interface':'is where most code that users interact with is located',\n",
     "    'mission':'contains OpenMDAO components and groups for modeling the aircraft mission',\n",
     "    'models':'contains aircraft and propulsion models for use in Aviary examples and tests',\n",
-    "    'subsystems':'is where the aerodynamic, propulsion, mass, and geometry core subsystems are located',\n",
+    "    'subsystems':'is where the aerodynamic, atmosphere, energy, propulsion, mass, and geometry core subsystems are located',\n",
     "    'utils':'contains utility functions for use in Aviary code, examples, and tests',\n",
     "    'validation_cases':'contains validation cases for testing and benchmarking Aviary',\n",
     "    'variable_info':'contains the variable meta data as well as several variable classes that are used in Aviary',\n",

diff --git a/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb b/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb
@@ -197,7 +197,7 @@
     "aircraft_filename = 'models/test_aircraft/aircraft_for_bench_FwFm.csv'\n",
     "optimizer = \"IPOPT\"\n",
     "make_plots = True\n",
-    "max_iter = 200\n",
+    "max_iter = 100\n",
     "\n",
     "prob = av.run_aviary(aircraft_filename, phase_info, optimizer=optimizer,\n",
     "                     make_plots=make_plots, max_iter=max_iter)"

diff --git a/aviary/docs/examples/images/multi_mission.png b/aviary/docs/examples/images/multi_mission.png
diff --git a/aviary/docs/examples/modified_aircraft.csv b/aviary/docs/examples/modified_aircraft.csv
@@ -7,17 +7,17 @@ aircraft:canard:aspect_ratio,0.0,unitless
 aircraft:canard:thickness_to_chord,0.0,unitless
 aircraft:crew_and_payload:baggage_mass_per_passenger,45.0,lbm
 aircraft:crew_and_payload:cargo_container_mass_scaler,1.0,unitless
+aircraft:crew_and_payload:design:num_business_class,0,unitless
+aircraft:crew_and_payload:design:num_first_class,11,unitless
+aircraft:crew_and_payload:design:num_passengers,169,unitless
+aircraft:crew_and_payload:design:num_tourist_class,158,unitless
 aircraft:crew_and_payload:flight_crew_mass_scaler,1.0,unitless
 aircraft:crew_and_payload:mass_per_passenger,180.0,lbm
 aircraft:crew_and_payload:misc_cargo,0.0,lbm
 aircraft:crew_and_payload:non_flight_crew_mass_scaler,1.0,unitless
-aircraft:crew_and_payload:num_business_class,0,unitless
-aircraft:crew_and_payload:num_first_class,11,unitless
 aircraft:crew_and_payload:num_flight_attendants,3,unitless
 aircraft:crew_and_payload:num_flight_crew,2,unitless
 aircraft:crew_and_payload:num_galley_crew,0,unitless
-aircraft:crew_and_payload:num_passengers,169,unitless
-aircraft:crew_and_payload:num_tourist_class,158,unitless
 aircraft:crew_and_payload:passenger_service_mass_scaler,1.0,unitless
 aircraft:crew_and_payload:wing_cargo,0.0,lbm
 aircraft:design:base_area,0.0,ft**2
@@ -114,7 +114,7 @@ aircraft:wing:aeroelastic_tailoring_factor,0.0,unitless
 aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:area,1370.0,ft**2
 aircraft:wing:aspect_ratio,11.02091,unitless
-aircraft:wing:bending_mass_scaler,1.0,unitless
+aircraft:wing:BENDING_MATERIAL_MASS_SCALER,1.0,unitless
 aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2