diff --git a/diag/pbldia_new_sfx.f90 b/diag/pbldia_new_sfx.f90 index 3ccf023a9ba3e6470ffa5ad3391339540e1fa69f..249244aad983557355cdb79b6b2e39e74b538236 100755 --- a/diag/pbldia_new_sfx.f90 +++ b/diag/pbldia_new_sfx.f90 @@ -82,7 +82,11 @@ use sfx_most, only: & real,intent(in):: AR2(11),ARDIN(6) real,intent(out)::ARDOUT(3) +<<<<<<< HEAD real,parameter::zetalim = 1. !maximum value of z/L for stable SL +======= + real,parameter::zetalim = 2. !maximum value of z/L for stable SL +>>>>>>> 039d3258b422f93c9a44345c5152b600029afbf8 real psi_m,psi_h,psi_m_hs,psi_h_hs real hwind,htemp,ustar,tstar,qstar,& & ufwind,uftemp,dteta,dq,wind,L,HIN,zeta @@ -99,7 +103,10 @@ use sfx_most, only: & print *, zeta if(zeta.gt.zetalim) zeta=zetalim L = HIN/zeta +<<<<<<< HEAD print *, zeta +======= +>>>>>>> 039d3258b422f93c9a44345c5152b600029afbf8 call get_psi_most(psi_m_hs,psi_h_hs,HIN/L) call get_psi_most(psi_m,psi_h,HWIND/L) @@ -122,7 +129,11 @@ print *, zeta subroutine pbldia_new_esm(AR2,ARDIN,ARDOUT) real,intent(in):: AR2(11),ARDIN(6) real,intent(out)::ARDOUT(3) +<<<<<<< HEAD real,parameter::zetalim = 1. !maximum value of z/L for stable SL +======= + real,parameter::zetalim = 2. !maximum value of z/L for stable SL +>>>>>>> 039d3258b422f93c9a44345c5152b600029afbf8 real psi_m,psi_h,psi_m_hs,psi_h_hs real hwind,htemp,ustar,tstar,qstar,& & ufwind,uftemp,dteta,dq,wind,L,HIN,zeta