Merge branch 'OpenMDAO:main' into glue_user_guide

OpenMDAO · Jan 9, 2025 · a1dba9b · a1dba9b
2 parents c6448c5 + 394fb52
commit a1dba9b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 21 deletions.
diff --git a/.github/workflows/test_benchmarks.yml b/.github/workflows/test_benchmarks.yml
@@ -18,7 +18,7 @@ on:
 jobs:
 
   latest_benchmarks:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 90
 
     steps:

diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml
@@ -18,7 +18,7 @@ on:
 jobs:
 
   latest_docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 90
 
     steps:

diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
@@ -18,7 +18,7 @@ jobs:
 
   pre_commit:
     # run pre-commit checks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4
@@ -28,7 +28,7 @@ jobs:
     - uses: pre-commit/[email protected]
 
   test_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/test_workflow_dev_deps.yml b/.github/workflows/test_workflow_dev_deps.yml
@@ -14,7 +14,7 @@ on:
 jobs:
 
   test_ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/test_workflow_no_dev_install.yml b/.github/workflows/test_workflow_no_dev_install.yml
@@ -17,7 +17,7 @@ on:
 jobs:
 
   test_ubuntu_no_dev_install:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 90
 

diff --git a/aviary/utils/preprocessors.py b/aviary/utils/preprocessors.py
@@ -400,21 +400,6 @@ def preprocess_propulsion(aviary_options: AviaryValues, engine_models: list = No
     aviary_options.set_val(Aircraft.Engine.NUM_WING_ENGINES, num_wing_engines_all)
     aviary_options.set_val(Aircraft.Engine.NUM_FUSELAGE_ENGINES, num_fuse_engines_all)
 
-    # Update nacelle-related variables in aero to be sized to the number of
-    # engine types.
-    if num_engine_type > 1:
-
-        keys = [
-            Aircraft.Nacelle.LAMINAR_FLOW_LOWER,
-            Aircraft.Nacelle.LAMINAR_FLOW_UPPER
-        ]
-
-        for var in keys:
-            try:
-                aviary_options.get_val(var)
-            except KeyError:
-                aviary_options.set_val(var, np.zeros(num_engine_type))
-
     if Mission.Summary.FUEL_FLOW_SCALER not in aviary_options:
         aviary_options.set_val(Mission.Summary.FUEL_FLOW_SCALER, 1.0)