From 8983e89384d8622fb16d69f00ce6eefc1469e0cb Mon Sep 17 00:00:00 2001
From: sbiri <sbiri@noc.ac.uk>
Date: Wed, 17 Mar 2021 13:28:43 +0000
Subject: [PATCH] use eq. 21 in YT96 to compute cdn for all wind speeds
---
flux_subs.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/flux_subs.py b/flux_subs.py
index 02bbe34..2500897 100755
--- a/flux_subs.py
+++ b/flux_subs.py
@@ -35,14 +35,9 @@ def cdn_calc(u10n, Ta, Tp, lat, meth="S80"):
meth == "C35" or meth == "Beljaars"):
cdn = cdn_from_roughness(u10n, Ta, None, lat, meth)
elif (meth == "YT96"):
- # for u<3 YT96 convert usr in eq. 21 to cdn
- cdn = np.where((u10n < 6) & (u10n >= 3),
- (0.29+3.1/u10n+7.7/np.power(u10n, 2))*0.001,
- np.where((u10n >= 6),
- (0.60 + 0.070*u10n)*0.001,
- np.power((0.10038+u10n*2.17e-3 +
- np.power(u10n, 2)*2.78e-3 -
- np.power(u10n, 3)*4.4e-5)/u10n, 2)))
+ # convert usr in eq. 21 to cdn to expand for low wind speeds
+ cdn = np.power((0.10038+u10n*2.17e-3+np.power(u10n, 2)*2.78e-3 -
+ np.power(u10n, 3)*4.4e-5)/u10n, 2)
elif (meth == "LY04"):
cdn = np.where(u10n >= 0.5,
(0.142+(2.7/u10n)+(u10n/13.09))*0.001,
--
GitLab