Revert NumPy 2.x / OpenMDAO 3.43 compatibility changes

Author: A-CGray

openconcept/aerodynamics/drag_jet_transport.py

@@ -578,14 +578,6 @@ def compute(self, inputs, outputs):
         # Reynolds number
         Re = inputs["fltcond|Utrue"] * inputs["L"] / visc_kin
 
-        # During Newton iterations, Utrue can temporarily go negative, making Re
-        # negative and causing log(negative) = NaN. Apply abs only for the real part so
-        # complex-step derivative checking still propagates the imaginary part correctly.
-        if np.isrealobj(Re):
-            Re = np.abs(Re)
-        else:
-            Re = np.where(np.real(Re) < 0, -Re, Re)
-
         # Skin friction coefficient assuming fully turbulent
         Cf = 0.523 / np.log(0.06 * Re) ** 2  # explicit fit of Spalding
 
@@ -611,15 +603,14 @@ def compute_partials(self, inputs, J):
         dvkin_dT = dvdyn_dT / inputs["fltcond|rho"]
         dvkin_drho = -visc_dyn / inputs["fltcond|rho"] ** 2
 
-        # Reynolds number (absolute value of velocity to handle negative Utrue during Newton iterations)
+        # Reynolds number
         U = inputs["fltcond|Utrue"]
-        absU = np.abs(U)
         L = inputs["L"]
-        Re = absU * L / visc_kin
-        dRe_dT = -absU * L / visc_kin**2 * dvkin_dT
-        dRe_drho = -absU * L / visc_kin**2 * dvkin_drho
-        dRe_dU = np.sign(U) * L / visc_kin
-        dRe_dL = absU / visc_kin
+        Re = U * L / visc_kin
+        dRe_dT = -U * L / visc_kin**2 * dvkin_dT
+        dRe_drho = -U * L / visc_kin**2 * dvkin_drho
+        dRe_dU = L / visc_kin
+        dRe_dL = U / visc_kin
 
         # Skin friction coefficient assuming fully turbulent
         Cf = 0.523 / np.log(0.06 * Re) ** 2  # explicit fit of Spalding

openconcept/examples/HybridTwin_thermal.py

@@ -61,13 +61,7 @@ def setup(self):
         # any control variables other than throttle and braking need to be defined here
         controls = self.add_subsystem("controls", IndepVarComp(), promotes_outputs=["*"])
         controls.add_output("proprpm", val=np.ones((nn,)) * 2000, units="rpm")
-        # mdot_coolant is a per-phase control vector of shape (nn,), where nn differs between
-        # phases (e.g. nn=11 for climb/cruise/descent, nn=1 for engineoutclimb). If this were
-        # promoted under its ac|propulsion|* name, all phases would expose the same promoted name
-        # at the parent analysis level with different shapes, which OpenMDAO 3.43+ rejects.
-        # Instead, give it a local name and wire it into the propulsion model via an explicit
-        # connect() below, keeping it entirely within this group's scope.
-        controls.add_output("phase_hx_mdot_coolant", val=0.1 * np.ones((nn,)), units="kg/s")
+        controls.add_output("ac|propulsion|thermal|hx|mdot_coolant", val=0.1 * np.ones((nn,)), units="kg/s")
 
         # assume TO happens on battery backup
         if flight_phase in ["climb", "cruise", "descent"]:
@@ -82,23 +76,9 @@ def setup(self):
         )
 
         propulsion_promotes_outputs = ["fuel_flow", "thrust", "ac|propulsion|thermal|duct|area_nozzle"]
-        # Explicitly list ac|propulsion|* inputs except mdot_coolant, which has a per-phase
-        # (nn,) shape and is connected directly below to avoid analysis-level shape conflicts.
         propulsion_promotes_inputs = [
             "fltcond|*",
-            "ac|propulsion|battery|specific_energy",
-            "ac|propulsion|engine|rating",
-            "ac|propulsion|generator|rating",
-            "ac|propulsion|motor|rating",
-            "ac|propulsion|propeller|diameter",
-            "ac|propulsion|thermal|hx|channel_height",
-            "ac|propulsion|thermal|hx|channel_length",
-            "ac|propulsion|thermal|hx|channel_width",
-            "ac|propulsion|thermal|hx|coolant_mass",
-            "ac|propulsion|thermal|hx|n_long_cold",
-            "ac|propulsion|thermal|hx|n_parallel",
-            "ac|propulsion|thermal|hx|n_tall",
-            "ac|propulsion|thermal|hx|n_wide_cold",
+            "ac|propulsion|*",
             "throttle",
             "propulsor_active",
             "ac|weights*",
@@ -113,7 +93,6 @@ def setup(self):
         )
         self.connect("proprpm", ["propmodel.prop1.rpm", "propmodel.prop2.rpm"])
         self.connect("hybrid_factor.vec", "propmodel.hybrid_split.power_split_fraction")
-        self.connect("phase_hx_mdot_coolant", "propmodel.ac|propulsion|thermal|hx|mdot_coolant")
 
         # use a different drag coefficient for takeoff versus cruise
         if flight_phase not in ["v0v1", "v1v0", "v1vr", "rotate"]: