Skip to content
Snippets Groups Projects
Commit 1d288196 authored by Anna Shestakova's avatar Anna Shestakova
Browse files

check of zeta=0 in pbldia is added

parent 120cf25c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 31 additions and 6 deletions
diag/pbldia_new_sfx.f90
+ 31
− 6
View file @ 1d288196
...@@ -53,6 +53,7 @@ use sfx_sheba, only: & ...@@ -53,6 +53,7 @@ use sfx_sheba, only: &
TSTAR = AR2(9) * ARDIN(2) TSTAR = AR2(9) * ARDIN(2)
QSTAR = AR2(9) * ARDIN(3) QSTAR = AR2(9) * ARDIN(3)
if(zeta.ne.0)then
if(zeta.gt.zetalim) zeta=zetalim if(zeta.gt.zetalim) zeta=zetalim
L = HIN/zeta L = HIN/zeta
...@@ -60,10 +61,17 @@ use sfx_sheba, only: & ...@@ -60,10 +61,17 @@ use sfx_sheba, only: &
call get_psi_sheba(psi_m_hs,psi_h_hs,HIN/L) call get_psi_sheba(psi_m_hs,psi_h_hs,HIN/L)
call get_psi_sheba(psi_m,psi_h,HWIND/L) call get_psi_sheba(psi_m,psi_h,HWIND/L)
UFWIND = ALOG(hwind/HIN) - (psi_m - psi_m_hs) UFWIND = ALOG(hwind/HIN) - (psi_m - psi_m_hs)
WIND = (USTAR/kappa) * UFWIND
call get_psi_sheba(psi_m,psi_h,HTEMP/L) call get_psi_sheba(psi_m,psi_h,HTEMP/L)
UFTEMP = ALOG(HTEMP/HIN) - (psi_h - psi_h_hs) UFTEMP = ALOG(HTEMP/HIN) - (psi_h - psi_h_hs)
else
UFWIND = ALOG(HWIND/HIN)
UFTEMP = ALOG(HTEMP/HIN)
endif
WIND = (USTAR/kappa) * UFWIND
DTETA = (TSTAR/kappa) * UFTEMP DTETA = (TSTAR/kappa) * UFTEMP
DQ = (QSTAR/kappa) * UFTEMP DQ = (QSTAR/kappa) * UFTEMP
...@@ -96,16 +104,25 @@ use sfx_most, only: & ...@@ -96,16 +104,25 @@ use sfx_most, only: &
TSTAR = AR2(9) * ARDIN(2) TSTAR = AR2(9) * ARDIN(2)
QSTAR = AR2(9) * ARDIN(3) QSTAR = AR2(9) * ARDIN(3)
if(zeta.ne.0)then
if(zeta.gt.zetalim) zeta=zetalim if(zeta.gt.zetalim) zeta=zetalim
L = HIN/zeta L = HIN/zeta
call get_psi_most(psi_m_hs,psi_h_hs,HIN/L) call get_psi_most(psi_m_hs,psi_h_hs,HIN/L)
call get_psi_most(psi_m,psi_h,HWIND/L) call get_psi_most(psi_m,psi_h,HWIND/L)
UFWIND = ALOG(hwind/HIN) - (psi_m - psi_m_hs) UFWIND = ALOG(hwind/HIN) - (psi_m - psi_m_hs)
WIND = (USTAR/kappa) * UFWIND
call get_psi_most(psi_m,psi_h,HTEMP/L) call get_psi_most(psi_m,psi_h,HTEMP/L)
UFTEMP = ALOG(HTEMP/HIN) - (psi_h - psi_h_hs) UFTEMP = ALOG(HTEMP/HIN) - (psi_h - psi_h_hs)
else
UFWIND = ALOG(HWIND/HIN)
UFTEMP = ALOG(HTEMP/HIN)
endif
WIND = (USTAR/kappa) * UFWIND
DTETA = (TSTAR/kappa) * UFTEMP DTETA = (TSTAR/kappa) * UFTEMP
DQ = (QSTAR/kappa) * UFTEMP DQ = (QSTAR/kappa) * UFTEMP
...@@ -134,16 +151,24 @@ subroutine pbldia_new_esm(AR2,ARDIN,ARDOUT) ...@@ -134,16 +151,24 @@ subroutine pbldia_new_esm(AR2,ARDIN,ARDOUT)
TSTAR = AR2(9) * ARDIN(2) TSTAR = AR2(9) * ARDIN(2)
QSTAR = AR2(9) * ARDIN(3) QSTAR = AR2(9) * ARDIN(3)
if(zeta.ne.0)then
if(zeta.gt.zetalim) zeta=zetalim if(zeta.gt.zetalim) zeta=zetalim
L = HIN/zeta L = HIN/zeta
call get_psi_esm1(psi_m,psi_h,HIN,HWIND,L) call get_psi_esm1(psi_m,psi_h,HIN,HWIND,L)
UFWIND = psi_m UFWIND = psi_m
WIND = (USTAR/kappa) * UFWIND
call get_psi_esm1(psi_m,psi_h,HIN,HTEMP,L) call get_psi_esm1(psi_m,psi_h,HIN,HTEMP,L)
UFTEMP = psi_h UFTEMP = psi_h
else
UFWIND = ALOG(HWIND/HIN)
UFTEMP = ALOG(HTEMP/HIN)
endif
WIND = (USTAR/kappa) * UFWIND
DTETA = (TSTAR/kappa) * UFTEMP DTETA = (TSTAR/kappa) * UFTEMP
DQ = (QSTAR/kappa) * UFTEMP DQ = (QSTAR/kappa) * UFTEMP
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment