From 1667d6ac0ac6599f6b4ebbb35f40bd3bac963ffa Mon Sep 17 00:00:00 2001 From: Ilan Upfal <103550915+iupfal@users.noreply.github.com> Date: Thu, 20 Mar 2025 16:23:20 -0400 Subject: [PATCH 1/2] default wind speed and direction to None --- MITRotor/BEMSolver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MITRotor/BEMSolver.py b/MITRotor/BEMSolver.py index 18a5c16..e726589 100644 --- a/MITRotor/BEMSolver.py +++ b/MITRotor/BEMSolver.py @@ -192,8 +192,8 @@ def residual( wdir: ArrayLike = None, ) -> Tuple[ArrayLike, ...]: an, aprime = x - U = U or np.ones(self.geometry.shape) - wdir = wdir or np.zeros(self.geometry.shape) + U = np.ones(self.geometry.shape) if U is None else U + wdir = np.zeros(self.geometry.shape) if wdir is None else wdir aero_props = self.aerodynamic_model( an = an, From a7879801354252759ae1b0135c1ffe911db3e458 Mon Sep 17 00:00:00 2001 From: Ilan Upfal <103550915+iupfal@users.noreply.github.com> Date: Thu, 20 Mar 2025 16:24:58 -0400 Subject: [PATCH 2/2] deafult wind speed and direction to None in postprocess --- MITRotor/BEMSolver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MITRotor/BEMSolver.py b/MITRotor/BEMSolver.py index e726589..b5b5722 100644 --- a/MITRotor/BEMSolver.py +++ b/MITRotor/BEMSolver.py @@ -213,8 +213,8 @@ def residual( return e_an, e_aprime def post_process(self, result: FixedPointIterationResult, pitch, tsr, yaw, U=None, wdir=None) -> BEMSolution: - U = U or np.ones(self.geometry.shape) - wdir = wdir or np.zeros(self.geometry.shape) + U = np.ones(self.geometry.shape) if U is None else U + wdir = np.zeros(self.geometry.shape) if wdir is None else wdir an, aprime = result.x aero_props = self.aerodynamic_model(an, aprime, pitch, tsr, yaw, self.rotor, self.geometry, U, wdir) aero_props.F = self.tiploss_model(aero_props, pitch, tsr, yaw, self.rotor, self.geometry)