Skip to content

Commit

Permalink
Merge pull request cmkaul#20 from climate-machine/master
Browse files Browse the repository at this point in the history 
Merge corrections to pressure advective drag
  • Loading branch information
@ilopezgp
ilopezgp authored Apr 1, 2020
2 parents 50acb50 + f2fd5f7 commit 00f97b9
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 57 deletions.
1 change: 0 additions & 1 deletion Turbulence_PrognosticTKE.pxd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cdef class EDMF_PrognosticTKE(ParameterizationBase):
entr_struct (*entr_detr_fp) (entr_in_struct entr_in) nogil

pressure_buoy_struct (*pressure_func_buoy) (pressure_in_struct press_in) nogil
pressure_buoy_struct (*pressure_func_buoysin) (pressure_in_struct press_in) nogil
pressure_drag_struct (*pressure_func_drag) (pressure_in_struct press_in) nogil

bint use_const_plume_spacing
Expand Down
83 changes: 43 additions & 40 deletions Turbulence_PrognosticTKE.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ cdef class EDMF_PrognosticTKE(ParameterizationBase):
if str(namelist['turbulence']['EDMF_PrognosticTKE']['pressure_closure_buoy']) == 'tan18':
self.pressure_func_buoy = pressure_tan18_buoy
elif str(namelist['turbulence']['EDMF_PrognosticTKE']['pressure_closure_buoy']) == 'normalmode':
self.pressure_func_buoy = pressure_normalmode_buoy
elif str(namelist['turbulence']['EDMF_PrognosticTKE']['pressure_closure_buoy']) == 'normalmode_buoysin':
self.pressure_func_buoy = pressure_normalmode_buoysin
self.pressure_func_buoy = pressure_normalmode_buoy
else:
print('Turbulence--EDMF_PrognosticTKE: pressure closure in namelist option is not recognized')
except:
Expand Down Expand Up @@ -1406,44 +1404,49 @@ cdef class EDMF_PrognosticTKE(ParameterizationBase):
input.a_med = np.median(self.UpdVar.Area.values[i,self.Gr.gw:self.Gr.nzg-self.Gr.gw][:alen])
for k in xrange(self.Gr.gw, self.Gr.nzg-self.Gr.gw):
input.a_kfull = interp2pt(self.UpdVar.Area.values[i,k], self.UpdVar.Area.values[i,k+1])
input.dzi = self.Gr.dzi
input.dz = self.Gr.dz
input.z_full = self.Gr.z[k]

input.a_khalf = self.UpdVar.Area.values[i,k]
input.a_kphalf = self.UpdVar.Area.values[i,k+1]
input.b_kfull = interp2pt(self.UpdVar.B.values[i,k], self.UpdVar.B.values[i,k+1])
input.rho0_kfull = self.Ref.rho0[k]
input.bcoeff_tan18 = self.pressure_buoy_coeff
input.alpha1 = self.pressure_normalmode_buoy_coeff1
input.alpha2 = self.pressure_normalmode_buoy_coeff2
input.beta1 = self.pressure_normalmode_adv_coeff
input.beta2 = self.pressure_normalmode_drag_coeff
input.rd = self.pressure_plume_spacing[i]
input.w_kfull = self.UpdVar.W.values[i,k]
input.w_khalf = interp2pt(self.UpdVar.W.values[i,k], self.UpdVar.W.values[i,k-1])
input.w_kphalf = interp2pt(self.UpdVar.W.values[i,k], self.UpdVar.W.values[i,k+1])
input.w_kenv = self.EnvVar.W.values[k]
input.drag_sign = self.drag_sign

if self.asp_label == 'z_dependent':
input.asp_ratio = input.updraft_top/2.0/sqrt(input.a_kfull)/input.rd
elif self.asp_label == 'median':
input.asp_ratio = input.updraft_top/2.0/sqrt(input.a_med)/input.rd
elif self.asp_label == 'const':
# _ret.asp_ratio = 1.72
input.asp_ratio = 1.0

if input.a_kfull>0.0:
ret_b = self.pressure_func_buoy(input)
ret_w = self.pressure_func_drag(input)
self.nh_pressure_b[i,k] = ret_b.nh_pressure_b
self.nh_pressure_adv[i,k] = ret_w.nh_pressure_adv
self.nh_pressure_drag[i,k] = ret_w.nh_pressure_drag

self.b_coeff[i,k] = ret_b.b_coeff
self.asp_ratio[i,k] = input.asp_ratio
if input.a_kfull >= self.minimum_area:
input.dzi = self.Gr.dzi
input.dz = self.Gr.dz
input.z_full = self.Gr.z[k]

input.b_kfull = interp2pt(self.UpdVar.B.values[i,k], self.UpdVar.B.values[i,k+1])
input.rho0_kfull = self.Ref.rho0[k]
input.bcoeff_tan18 = self.pressure_buoy_coeff
input.alpha1 = self.pressure_normalmode_buoy_coeff1
input.alpha2 = self.pressure_normalmode_buoy_coeff2
input.beta1 = self.pressure_normalmode_adv_coeff
input.beta2 = self.pressure_normalmode_drag_coeff
input.rd = self.pressure_plume_spacing[i]
input.w_kfull = self.UpdVar.W.values[i,k]
input.w_kmfull = self.UpdVar.W.values[i,k-1]
input.w_kenv = self.EnvVar.W.values[k]
input.drag_sign = self.drag_sign

if self.asp_label == 'z_dependent':
input.asp_ratio = input.updraft_top/2.0/sqrt(input.a_kfull)/input.rd
elif self.asp_label == 'median':
input.asp_ratio = input.updraft_top/2.0/sqrt(input.a_med)/input.rd
elif self.asp_label == 'const':
# _ret.asp_ratio = 1.72
input.asp_ratio = 1.0

if input.a_kfull>0.0:
ret_b = self.pressure_func_buoy(input)
ret_w = self.pressure_func_drag(input)
self.nh_pressure_b[i,k] = ret_b.nh_pressure_b
self.nh_pressure_adv[i,k] = ret_w.nh_pressure_adv
self.nh_pressure_drag[i,k] = ret_w.nh_pressure_drag

self.b_coeff[i,k] = ret_b.b_coeff
self.asp_ratio[i,k] = input.asp_ratio

else:
self.nh_pressure_b[i,k] = 0.0
self.nh_pressure_adv[i,k] = 0.0
self.nh_pressure_drag[i,k] = 0.0

self.b_coeff[i,k] = 0.0
self.asp_ratio[i,k] = 0.0
else:
self.nh_pressure_b[i,k] = 0.0
self.nh_pressure_adv[i,k] = 0.0
Expand Down
6 changes: 1 addition & 5 deletions turbulence_functions.pxd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ cdef struct pressure_in_struct:
char *asp_label
double a_med
double a_kfull
double a_khalf
double a_kphalf
double b_kfull
double rho0_kfull
double bcoeff_tan18
Expand All @@ -80,8 +78,7 @@ cdef struct pressure_in_struct:
double beta2
double rd
double w_kfull
double w_khalf
double w_kphalf
double w_kmfull
double w_kenv
double dzi
double dz
Expand Down Expand Up @@ -112,7 +109,6 @@ cdef buoyant_stract buoyancy_sorting_mean(entr_in_struct entr_in) nogil
cdef pressure_buoy_struct pressure_tan18_buoy(pressure_in_struct press_in) nogil
cdef pressure_drag_struct pressure_tan18_drag(pressure_in_struct press_in) nogil
cdef pressure_buoy_struct pressure_normalmode_buoy(pressure_in_struct press_in) nogil
cdef pressure_buoy_struct pressure_normalmode_buoysin(pressure_in_struct press_in) nogil
cdef pressure_drag_struct pressure_normalmode_drag(pressure_in_struct press_in) nogil

cdef double get_wstar(double bflux, double zi )
Expand Down
13 changes: 2 additions & 11 deletions turbulence_functions.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,21 +279,12 @@ cdef pressure_buoy_struct pressure_normalmode_buoy(pressure_in_struct press_in)

return _ret

cdef pressure_buoy_struct pressure_normalmode_buoysin(pressure_in_struct press_in) nogil:
cdef:
pressure_buoy_struct _ret

_ret.b_coeff = press_in.alpha1 / ( 1+press_in.alpha2*press_in.asp_ratio**2 )
_ret.nh_pressure_b = -1.0 * press_in.rho0_kfull * press_in.a_kfull * press_in.b_kfull * _ret.b_coeff * sin(3.14*press_in.z_full/press_in.updraft_top)

return _ret

cdef pressure_drag_struct pressure_normalmode_drag(pressure_in_struct press_in) nogil:
cdef:
pressure_drag_struct _ret

_ret.nh_pressure_adv = press_in.rho0_kfull * press_in.a_kfull * press_in.beta1*press_in.w_kfull*(press_in.w_kphalf
-press_in.w_khalf)*press_in.dzi
_ret.nh_pressure_adv = press_in.rho0_kfull * press_in.a_kfull * press_in.beta1*press_in.w_kfull*(press_in.w_kfull
-press_in.w_kmfull)*press_in.dzi

# drag as w_dif and account for downdrafts
_ret.nh_pressure_drag = -1.0 * press_in.rho0_kfull * press_in.a_kfull * press_in.beta2 * (press_in.w_kfull -
Expand Down

0 comments on commit 00f97b9

Please sign in to comment.