Update aerostruct_groups.py (#392)

* Update aerostruct_groups.py

Promote section lift coefficient

* Switched deprecated numpy asscalar to item

* Update aerostruct_groups.py

Promote CDw

* Version bump to 2.5.1

Co-authored-by: Eytan Adler <eytana@umich.edu>

Author: acmarta

openaerostruct/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.0"
+__version__ = "2.5.1"

openaerostruct/aerodynamics/pg_scale.py

@@ -205,7 +205,7 @@ def compute_partials(self, inputs, partials):
         rotational = self.options["rotational"]
 
         M = inputs["Mach_number"]
-        betaPG = np.asscalar(np.sqrt(1 - M**2))
+        betaPG = np.sqrt(1 - M**2).item()
         fact = np.array([1.0, betaPG, betaPG], M.dtype)
         fact_norm = np.array([betaPG, 1.0, 1.0], M.dtype)
         num_eval_pts = inputs["bound_vecs_w_frame"].shape[0]

openaerostruct/aerodynamics/pg_wind_rotation.py

@@ -166,10 +166,10 @@ def compute(self, inputs, outputs):
         alpha = inputs["alpha"]
         beta = inputs["beta"]
 
-        cosa = np.asscalar(np.cos(alpha))
-        sina = np.asscalar(np.sin(alpha))
-        cosb = np.asscalar(np.cos(beta))
-        sinb = np.asscalar(np.sin(beta))
+        cosa = np.cos(alpha).item()
+        sina = np.sin(alpha).item()
+        cosb = np.cos(beta).item()
+        sinb = np.sin(beta).item()
 
         # Define aero->wind rotation matrix
         Tw = np.array(
@@ -200,10 +200,10 @@ def compute_partials(self, inputs, partials):
         alpha = inputs["alpha"]
         beta = inputs["beta"]
 
-        cosa = np.asscalar(np.cos(alpha))
-        sina = np.asscalar(np.sin(alpha))
-        cosb = np.asscalar(np.cos(beta))
-        sinb = np.asscalar(np.sin(beta))
+        cosa = np.cos(alpha).item()
+        sina = np.sin(alpha).item()
+        cosb = np.cos(beta).item()
+        sinb = np.sin(beta).item()
 
         num_eval_pts = inputs["bound_vecs"].shape[0]
 
@@ -306,10 +306,10 @@ def compute(self, inputs, outputs):
         alpha = inputs["alpha"]
         beta = inputs["beta"]
 
-        cosa = np.asscalar(np.cos(alpha))
-        sina = np.asscalar(np.sin(alpha))
-        cosb = np.asscalar(np.cos(beta))
-        sinb = np.asscalar(np.sin(beta))
+        cosa = np.cos(alpha).item()
+        sina = np.sin(alpha).item()
+        cosb = np.cos(beta).item()
+        sinb = np.sin(beta).item()
 
         # Define aero->wind rotation matrix
         # wind->aero rotation matrix is given by transpose
@@ -329,10 +329,10 @@ def compute_partials(self, inputs, partials):
         alpha = inputs["alpha"]
         beta = inputs["beta"]
 
-        cosa = np.asscalar(np.cos(alpha))
-        sina = np.asscalar(np.sin(alpha))
-        cosb = np.asscalar(np.cos(beta))
-        sinb = np.asscalar(np.sin(beta))
+        cosa = np.cos(alpha).item()
+        sina = np.sin(alpha).item()
+        cosb = np.cos(beta).item()
+        sinb = np.sin(beta).item()
 
         # Define aero->wind rotation matrix
         Tw = np.array(

openaerostruct/integration/aerostruct_groups.py

@@ -164,7 +164,7 @@ def setup(self):
                 "sec_forces",
                 "t_over_c",
             ],
-            promotes_outputs=["CDv", "L", "D", "CL1", "CDi", "CD", "CL"],
+            promotes_outputs=["CDv", "CDw", "L", "D", "CL1", "CDi", "CD", "CL", "Cl"],
         )
 
         if surface["fem_model_type"] == "tube":