adds forwarding for n_crit, trip locations, analysis confidence, and …

…bl outputs
peterdsharpe · Mar 12, 2024 · be0cf82 · be0cf82
1 parent 4a9c112
commit be0cf82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/aerosandbox/geometry/airfoil/airfoil.py b/aerosandbox/geometry/airfoil/airfoil.py
@@ -672,6 +672,9 @@ def get_aero_from_neuralfoil(self,
                                  alpha: Union[float, np.ndarray],
                                  Re: Union[float, np.ndarray],
                                  mach: Union[float, np.ndarray] = 0.,
+                                 n_crit: Union[float, np.ndarray] = 9.0,
+                                 xtr_upper: Union[float, np.ndarray] = 1.0,
+                                 xtr_lower: Union[float, np.ndarray] = 1.0,
                                  model_size: str = "large",
                                  control_surfaces: List["ControlSurface"] = None,
                                  include_360_deg_effects: bool = True,
@@ -689,6 +692,9 @@ def get_aero_from_neuralfoil(self,
             alpha=alpha + airfoil_normalization["rotation_angle"],
             Re=Re / airfoil_normalization["scale_factor"],
             mach=mach,
+            n_crit=n_crit,
+            xtr_upper=xtr_upper,
+            xtr_lower=xtr_lower,
             model_size=model_size,
             control_surfaces=control_surfaces,
             include_360_deg_effects=include_360_deg_effects

diff --git a/aerosandbox/geometry/airfoil/kulfan_airfoil.py b/aerosandbox/geometry/airfoil/kulfan_airfoil.py
@@ -210,6 +210,9 @@ def get_aero_from_neuralfoil(self,
                                  alpha: Union[float, np.ndarray],
                                  Re: Union[float, np.ndarray],
                                  mach: Union[float, np.ndarray] = 0.,
+                                 n_crit: Union[float, np.ndarray] = 9.0,
+                                 xtr_upper: Union[float, np.ndarray] = 1.0,
+                                 xtr_lower: Union[float, np.ndarray] = 1.0,
                                  model_size: str = "large",
                                  control_surfaces: List["ControlSurface"] = None,
                                  include_360_deg_effects: bool = True,
@@ -261,6 +264,9 @@ def get_aero_from_neuralfoil(self,
             ),
             alpha=alpha + effective_d_alpha,
             Re=Re,
+            n_crit=n_crit,
+            xtr_upper=xtr_upper,
+            xtr_lower=xtr_lower,
             model_size=model_size
         )
 
@@ -482,7 +488,10 @@ def get_aero_from_neuralfoil(self,
             0,
         )
 
+        N = len(nf.bl_x_points)
+
         return {
+            "analysis_confidence": nf_aero["analysis_confidence"],
             "CL"       : CL,
             "CD"       : CD,
             "CM"       : CM,
@@ -492,6 +501,12 @@ def get_aero_from_neuralfoil(self,
             "mach_crit": mach_crit,
             "mach_dd"  : mach_dd,
             "Cpmin_0"  : Cpmin_0,
+            **{f"upper_bl_theta_{i}": nf_aero[f"upper_bl_theta_{i}"] for i in range(N)},
+            **{f"upper_bl_H_{i}": nf_aero[f"upper_bl_H_{i}"] for i in range(N)},
+            **{f"upper_bl_ue/vinf_{i}": nf_aero[f"upper_bl_ue/vinf_{i}"] for i in range(N)},
+            **{f"lower_bl_theta_{i}": nf_aero[f"lower_bl_theta_{i}"] for i in range(N)},
+            **{f"lower_bl_H_{i}": nf_aero[f"lower_bl_H_{i}"] for i in range(N)},
+            **{f"lower_bl_ue/vinf_{i}": nf_aero[f"lower_bl_ue/vinf_{i}"] for i in range(N)},
         }
 
     def upper_coordinates(self,