diff --git a/AirSeaFluxCode.py b/AirSeaFluxCode.py index 58394a4ed5fc013e51121830f85e88035800e764..835127c84989066af3776bcf3a679ab1ef53f0d8 100644 --- a/AirSeaFluxCode.py +++ b/AirSeaFluxCode.py @@ -406,7 +406,6 @@ def AirSeaFluxCode(spd, T, SST, lat=None, hum=None, P=None, hin=18, hout=10, zo = ref_ht/np.exp(kappa/np.sqrt(cd10n)) # adjust neutral cdn at any output height cdn = np.power(kappa/np.log(hout/zo), 2) - # cd = np.power(kappa/(np.log(hout/zo)-psim), 2) cd = cd_calc(cdn, h_out[0], h_out[0], psim) # solve for zot, zoq from ct10n, cq10n zot = ref_ht/(np.exp(kappa**2/(ct10n*np.log(ref_ht/zo)))) @@ -414,8 +413,6 @@ def AirSeaFluxCode(spd, T, SST, lat=None, hum=None, P=None, hin=18, hout=10, # adjust neutral ctn, cqn at any output height ctn =np.power(kappa, 2)/(np.log(h_out[0]/zo)*np.log(h_out[1]/zot)) cqn =np.power(kappa, 2)/(np.log(h_out[0]/zo)*np.log(h_out[2]/zoq)) - # ct = np.power(kappa, 2)/((np.log(h_out[0]/zo)-psim)*(np.log(h_out[1]/zot)-psit)) - # cq = np.power(kappa, 2)/((np.log(h_out[0]/zo)-psim)*(np.log(h_out[2]/zoq)-psiq)) ct, cq = ctcq_calc(cdn, cd, ctn, cqn, h_out[1], h_out[2], h_out[1], psit, psiq) uref = (spd-usr/kappa*(np.log(h_in[0]/h_out[0])-psim + diff --git a/flux_subs.py b/flux_subs.py index f3e137f32686a83190f49cc2f7faf9ec061d94bc..bede98c89efded18643662b66503c3af5b267ee3 100755 --- a/flux_subs.py +++ b/flux_subs.py @@ -123,7 +123,7 @@ def cd_calc(cdn, hin, hout, psim): cdn : float neutral drag coefficient hin : float - wind speed height [m] + wind speed height [m] hout : float reference height [m] psim : float