Merge branch 'OpenMDAO:main' into network_remote_dvs

Author: Asthelen

examples/aero_only/mach_tutorial_wing/adflow/mphys_aero_analysis.py

@@ -4,8 +4,8 @@
 from adflow.mphys import ADflowBuilder
 from baseclasses import AeroProblem
 
-from mphys.multipoint import Multipoint
-from mphys.scenarios.aerodynamic import ScenarioAerodynamic
+from mphys import MPhysVariables, Multipoint
+from mphys.scenarios import ScenarioAerodynamic
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--level", type=str, default="L1")
@@ -60,7 +60,10 @@ def setup(self):
         self.mphys_add_scenario(
             "cruise", ScenarioAerodynamic(aero_builder=adflow_builder)
         )
-        self.connect("mesh.x_aero0", "cruise.x_aero")
+        self.connect(
+            f"mesh.{MPhysVariables.Aerodynamics.Surface.Mesh.COORDINATES}",
+            "cruise.x_aero",
+        )
 
     def configure(self):
         aoa = 1.5

examples/aero_only/mach_tutorial_wing/adflow/mphys_aero_opt.py

@@ -6,8 +6,8 @@
 from baseclasses import AeroProblem
 from pygeo.mphys import OM_DVGEOCOMP
 
-from mphys.multipoint import Multipoint
-from mphys.scenarios.aerodynamic import ScenarioAerodynamic
+from mphys import MPhysVariables, Multipoint
+from mphys.scenarios import ScenarioAerodynamic
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--task", default="run")
@@ -78,7 +78,10 @@ def setup(self):
             "cruise", ScenarioAerodynamic(aero_builder=adflow_builder)
         )
 
-        self.connect("mesh.x_aero0", "geometry.x_aero_in")
+        self.connect(
+            f"mesh.{MPhysVariables.Aerodynamics.Surface.Mesh.COORDINATES}",
+            "geometry.x_aero_in",
+        )
         self.connect("geometry.x_aero0", "cruise.x_aero")
 
     def configure(self):

examples/aero_only/mach_tutorial_wing/adflow/mphys_aero_opt_2pt.py

@@ -6,8 +6,8 @@
 from baseclasses import AeroProblem
 from pygeo.mphys import OM_DVGEOCOMP
 
-from mphys.multipoint import Multipoint
-from mphys.scenarios.aerodynamic import ScenarioAerodynamic
+from mphys import MPhysVariables, Multipoint
+from mphys.scenarios import ScenarioAerodynamic
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--task", default="run")
@@ -81,7 +81,10 @@ def setup(self):
             "cruise1", ScenarioAerodynamic(aero_builder=adflow_builder)
         )
 
-        self.connect("mesh.x_aero0", "geometry.x_aero_in")
+        self.connect(
+            f"mesh.{MPhysVariables.Aerodynamics.Surface.Mesh.COORDINATES}",
+            "geometry.x_aero_in",
+        )
         self.connect("geometry.x_aero0", ["cruise0.x_aero", "cruise1.x_aero"])
 
         # add an exec comp to average two drags

examples/aero_only/mach_tutorial_wing/adflow/mphys_aero_opt_2pt_parallel.py

@@ -4,8 +4,8 @@
 from adflow.mphys import ADflowBuilder
 from baseclasses import AeroProblem
 
-from mphys.multipoint import MultipointParallel
-from mphys.scenarios.aerodynamic import ScenarioAerodynamic
+from mphys import MPhysVariables, MultipointParallel
+from mphys.scenarios import ScenarioAerodynamic
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--task", default="run")

examples/aerostructural/mach_tutorial_wing/adflow_meld_tacs/mphys_as_2scenario.py

@@ -77,6 +77,7 @@ def setup(self):
         struct_builder = TacsBuilder(
             mesh_file="wingbox.bdf",
             element_callback=tacs_setup.element_callback,
+            coupling_loads=[MPhysVariables.Structures.Loads.AERODYNAMIC],
             problem_setup=tacs_setup.problem_setup,
         )
         struct_builder.initialize(self.comm)