merged upstream main to resolve conflicts with hx

Marie J Vaucher · Marie J Vaucher · commit 8e03df03d874 · 2024-03-05T15:42:37.000-05:00
diff --git a/openconcept/aerodynamics/openaerostruct/aerostructural.py b/openconcept/aerodynamics/openaerostruct/aerostructural.py
@@ -244,6 +244,7 @@ def setup(self):
                 q={"units": "Pa", "shape": (nn,)},
                 S={"units": "m**2"},
                 CD={"shape": (nn,)},
+                has_diag_partials=True,
             ),
             promotes_inputs=[("q", "fltcond|q"), ("S", "ac|geom|wing|S_ref")],
             promotes_outputs=["drag"],
@@ -1495,6 +1496,7 @@ def setup(self):
                 S={"units": "m**2"},
                 CD={"shape": (nn,)},
                 CD0={"shape": (1,)},
+                has_diag_partials=True,
             ),
             promotes_inputs=[("q", "fltcond|q"), ("S", "ac|geom|wing|S_ref"), ("CD0", "ac|aero|CD_nonwing")],
             promotes_outputs=["drag"],
diff --git a/openconcept/aerodynamics/openaerostruct/drag_polar.py b/openconcept/aerodynamics/openaerostruct/drag_polar.py
@@ -356,6 +356,7 @@ def setup(self):
                 q={"units": "Pa", "shape": (nn,)},
                 S={"units": "m**2"},
                 CD={"shape": (nn,)},
+                has_diag_partials=True,
             ),
             promotes_inputs=[("q", "fltcond|q"), ("S", "ac|geom|wing|S_ref")],
             promotes_outputs=["drag"],
diff --git a/openconcept/examples/B738.py b/openconcept/examples/B738.py
@@ -41,6 +41,7 @@ def setup(self):
                 "tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],
             },
             fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},
+            has_diag_partials=True,
         )
 
         self.add_subsystem("doubler", doubler, promotes_outputs=["*"])
diff --git a/openconcept/examples/B738_VLM_drag.py b/openconcept/examples/B738_VLM_drag.py
@@ -58,6 +58,7 @@ def setup(self):
                 "tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],
             },
             fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},
+            has_diag_partials=True,
         )
 
         self.add_subsystem("doubler", doubler, promotes_outputs=["*"])
diff --git a/openconcept/examples/B738_aerostructural.py b/openconcept/examples/B738_aerostructural.py
@@ -69,6 +69,7 @@ def setup(self):
                 "tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],
             },
             fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},
+            has_diag_partials=True,
         )
 
         self.add_subsystem("doubler", doubler, promotes_outputs=["*"])
diff --git a/openconcept/examples/minimal_integrator.py b/openconcept/examples/minimal_integrator.py
@@ -57,6 +57,7 @@ def setup(self):
                 fuel_flow={"units": "kg/s", "shape": nn},
                 TSFC={"units": "kg/N/s", "shape": 1},
                 thrust={"units": "N", "shape": nn},
+                has_diag_partials=True,
             ),
             promotes_inputs=[("TSFC", "ac|propulsion|TSFC"), "thrust"],
         )
@@ -82,6 +83,7 @@ def setup(self):
                 weight={"shape": nn},
                 TOW={"shape": 1},
                 fuel_burned={"shape": nn},
+                has_diag_partials=True,
             ),
             promotes_inputs=[("TOW", "ac|weights|TOW")],
             promotes_outputs=["weight"],
diff --git a/openconcept/mission/tests/test_trajectories.py b/openconcept/mission/tests/test_trajectories.py
@@ -165,6 +165,7 @@ def setup(self):
                     "tags": ["integrate", "state_name:f", "state_units:kg"],
                 },
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec.x")
@@ -215,6 +216,7 @@ def setup(self):
                     "tags": ["integrate", "state_name:f2", "state_units:J"],
                 },
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec2.x")
@@ -269,6 +271,7 @@ def setup(self):
                     "tags": ["integrate", "state_name:f2", "state_units:J", "state_promotes:True"],
                 },
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec2.x")
@@ -330,6 +333,7 @@ def setup(self):
                     ],
                 },
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec2.x")
@@ -378,6 +382,7 @@ def setup(self):
                 ["df = 5.1*x**3 +0.5*x-7.2"],
                 df={"val": 1.0 * np.ones((nn,)), "units": "W", "tags": ["integrate", "state_name:f2", "state_units:J"]},
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec2.x")
@@ -413,6 +418,7 @@ def setup(self):
                 ["df2 = 5.1*x**3 +0.5*x-7.2"],
                 df2={"val": 1.0 * np.ones((nn,)), "units": "W", "tags": ["integrate", "state_name:f", "state_units:J"]},
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
         )
         self.connect("iv.x", "ec2.x")
@@ -521,6 +527,7 @@ def setup(self):
                     "tags": ["integrate", "state_name:f", "state_units:kg"],
                 },
                 x={"val": 1.0 * np.ones((nn,)), "units": "s"},
+                has_diag_partials=True,
             ),
             promotes_outputs=["df"],
         )
diff --git a/openconcept/thermal/heat_exchanger.py b/openconcept/thermal/heat_exchanger.py
@@ -1,5 +1,5 @@
 import numpy as np
-from openmdao.api import ExplicitComponent, IndepVarComp, Group, AnalysisError
+from openmdao.api import ExplicitComponent, Group, AnalysisError
 from openconcept.utilities import DVLabel
 
 
@@ -1397,37 +1397,37 @@ def initialize(self):
     def setup(self):
         nn = self.options["num_nodes"]
 
-        iv = self.add_subsystem("dv", IndepVarComp(), promotes_outputs=["*"])
-        iv.add_output("case_thickness", val=2.0, units="mm")
-        iv.add_output("fin_thickness", val=0.102, units="mm")
-        iv.add_output("plate_thickness", val=0.2, units="mm")
-        iv.add_output("material_k", val=190, units="W/m/K")
-        iv.add_output("material_rho", val=2700, units="kg/m**3")
-
-        # iv.add_output('mdot_cold', val=np.ones(nn)*1.5, units='kg/s')
-        # iv.add_output('rho_cold', val=np.ones(nn)*0.5, units='kg/m**3')
-        # iv.add_output('mdot_hot', val=0.075*np.ones(nn), units='kg/s')
-        # iv.add_output('rho_hot', val=np.ones(nn)*1020.2, units='kg/m**3')
-
-        # iv.add_output('T_in_cold', val=np.ones(nn)*45, units='degC')
-        # iv.add_output('T_in_hot', val=np.ones(nn)*90, units='degC')
-        # iv.add_output('n_long_cold', val=3)
-        # iv.add_output('n_wide_cold', val=430)
-        # iv.add_output('n_tall', val=19)
-
-        iv.add_output("channel_height_cold", val=14, units="mm")
-        iv.add_output("channel_width_cold", val=1.35, units="mm")
-        iv.add_output("fin_length_cold", val=6, units="mm")
-        iv.add_output("cp_cold", val=1005, units="J/kg/K")
-        iv.add_output("k_cold", val=0.02596, units="W/m/K")
-        iv.add_output("mu_cold", val=1.789e-5, units="kg/m/s")
-
-        iv.add_output("channel_height_hot", val=1, units="mm")
-        iv.add_output("channel_width_hot", val=1, units="mm")
-        iv.add_output("fin_length_hot", val=6, units="mm")
-        iv.add_output("cp_hot", val=3801, units="J/kg/K")
-        iv.add_output("k_hot", val=0.405, units="W/m/K")
-        iv.add_output("mu_hot", val=1.68e-3, units="kg/m/s")
+        # Set the default values for promoted variables
+        self.set_input_defaults("case_thickness", val=2.0, units="mm")
+        self.set_input_defaults("fin_thickness", val=0.102, units="mm")
+        self.set_input_defaults("plate_thickness", val=0.2, units="mm")
+        self.set_input_defaults("material_k", val=190, units="W/m/K")
+        self.set_input_defaults("material_rho", val=2700, units="kg/m**3")
+
+        # self.set_input_defaults('mdot_cold', val=np.ones(nn)*1.5, units='kg/s')
+        # self.set_input_defaults('rho_cold', val=np.ones(nn)*0.5, units='kg/m**3')
+        # self.set_input_defaults('mdot_hot', val=0.075*np.ones(nn), units='kg/s')
+        # self.set_input_defaults('rho_hot', val=np.ones(nn)*1020.2, units='kg/m**3')
+
+        # self.set_input_defaults('T_in_cold', val=np.ones(nn)*45, units='degC')
+        # self.set_input_defaults('T_in_hot', val=np.ones(nn)*90, units='degC')
+        # self.set_input_defaults('n_long_cold', val=3)
+        # self.set_input_defaults('n_wide_cold', val=430)
+        # self.set_input_defaults('n_tall', val=19)
+
+        self.set_input_defaults("channel_height_cold", val=14, units="mm")
+        self.set_input_defaults("channel_width_cold", val=1.35, units="mm")
+        self.set_input_defaults("fin_length_cold", val=6, units="mm")
+        self.set_input_defaults("cp_cold", val=1005, units="J/kg/K")
+        self.set_input_defaults("k_cold", val=0.02596, units="W/m/K")
+        self.set_input_defaults("mu_cold", val=1.789e-5, units="kg/m/s")
+
+        self.set_input_defaults("channel_height_hot", val=1, units="mm")
+        self.set_input_defaults("channel_width_hot", val=1, units="mm")
+        self.set_input_defaults("fin_length_hot", val=6, units="mm")
+        self.set_input_defaults("cp_hot", val=3801, units="J/kg/K")
+        self.set_input_defaults("k_hot", val=0.405, units="W/m/K")
+        self.set_input_defaults("mu_hot", val=1.68e-3, units="kg/m/s")
 
         dvlist = [
             ["ac|propulsion|thermal|hx|n_wide_cold", "n_wide_cold", 430, None],
diff --git a/openconcept/thermal/heat_pipe.py b/openconcept/thermal/heat_pipe.py
@@ -91,7 +91,12 @@ def setup(self):
         # Used ExecComp here because multiplying vector and scalar inputs
         self.add_subsystem(
             "heat_divide",
-            ExecComp("q_div = q / n_pipes", q_div={"units": "W", "shape": (nn,)}, q={"units": "W", "shape": (nn,)}),
+            ExecComp(
+                "q_div = q / n_pipes",
+                q_div={"units": "W", "shape": (nn,)},
+                q={"units": "W", "shape": (nn,)},
+                has_diag_partials=True,
+            ),
             promotes_inputs=["q", "n_pipes"],
         )
 
@@ -123,6 +128,7 @@ def setup(self):
                 "q_max = single_pipe_q_max * n_pipes",
                 q_max={"units": "W", "shape": (nn,)},
                 single_pipe_q_max={"units": "W", "shape": (nn,)},
+                has_diag_partials=True,
             ),
             promotes_inputs=["n_pipes"],
             promotes_outputs=["q_max"],
@@ -171,6 +177,7 @@ def setup(self):
                 T_evap={"units": "degC", "shape": (nn,)},
                 q={"units": "W", "shape": (nn,)},
                 R={"units": "K/W", "shape": (nn,)},
+                has_diag_partials=True,
             ),
             promotes_inputs=["T_evap"],
             promotes_outputs=["T_cond"],
diff --git a/openconcept/thermal/tests/test_heat_exchanger.py b/openconcept/thermal/tests/test_heat_exchanger.py

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ def setup(self):`
`41`	`41`	`"tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],`
`42`	`42`	`},`
`43`	`43`	`fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},`
	`44`	`+ has_diag_partials=True,`
`44`	`45`	`)`
`45`	`46`
`46`	`47`	`self.add_subsystem("doubler", doubler, promotes_outputs=["*"])`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ def setup(self):`
`58`	`58`	`"tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],`
`59`	`59`	`},`
`60`	`60`	`fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},`
	`61`	`+ has_diag_partials=True,`
`61`	`62`	`)`
`62`	`63`
`63`	`64`	`self.add_subsystem("doubler", doubler, promotes_outputs=["*"])`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ def setup(self):`
`69`	`69`	`"tags": ["integrate", "state_name:fuel_used", "state_units:kg", "state_val:1.0", "state_promotes:True"],`
`70`	`70`	`},`
`71`	`71`	`fuel_flow_in={"val": 1.0 * np.ones((nn,)), "units": "kg/s"},`
	`72`	`+ has_diag_partials=True,`
`72`	`73`	`)`
`73`	`74`
`74`	`75`	`self.add_subsystem("doubler", doubler, promotes_outputs=["*"])`