From 723b94fb4d8cf3b47c2400d9614fec9a971ef616 Mon Sep 17 00:00:00 2001
From: sbiri <sbiri@noc.ac.uk>
Date: Tue, 21 Jul 2020 12:32:12 +0100
Subject: [PATCH] separated subroutines to: - get_init (for initial values
check and setting defaults) - hum_subs that includes all subroutines related
to humidity calculations - flux_subs that contains all subroutines related to
flux calculations (exchange coefficients, stability functions etc.) -
util_subs that contains utility subroutines as get_height, gc, visc_air etc.
In subroutine get_L the set up of UA option is set up to include Richardson
number instead of deriving it from virtual temperature
---
AirSeaFluxCode.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/AirSeaFluxCode.py b/AirSeaFluxCode.py
index 1dbf166..1918394 100644
--- a/AirSeaFluxCode.py
+++ b/AirSeaFluxCode.py
@@ -1,8 +1,10 @@
import numpy as np
import logging
-from flux_subs import (kappa, CtoK, get_heights, get_init, get_skin, get_gust,
- get_L, get_hum, get_strs, psim_calc, psit_calc,
- cdn_calc, cd_calc, ctcq_calc, ctcqn_calc)
+from get_init import get_init
+from hum_subs import (get_hum)
+from util_subs import (kappa, CtoK, get_heights)
+from flux_subs import (get_skin, get_gust, get_L, get_strs, psim_calc,
+ psit_calc, cdn_calc, cd_calc, ctcq_calc, ctcqn_calc)
def AirSeaFluxCode(spd, T, SST, lat=None, hum=None, P=None,
@@ -243,8 +245,8 @@ def AirSeaFluxCode(spd, T, SST, lat=None, hum=None, P=None,
qsr[ind], t10n[ind], tv10n[ind],
qair[ind], h_in[:, ind], T[ind], Ta[ind],
th[ind], tv[ind], sst[ind], dt[ind],
- dq[ind], wind[ind], np.copy(monob[ind]),
- meth)
+ dtv[ind], dq[ind], zo[ind], wind[ind],
+ np.copy(monob[ind]), meth)
psim[ind] = psim_calc(h_in[0, ind]/monob[ind], meth)
psit[ind] = psit_calc(h_in[1, ind]/monob[ind], meth)
psiq[ind] = psit_calc(h_in[2, ind]/monob[ind], meth)
--
GitLab