3DTKE EDMF GFS PBL related updates #387
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -897,7 +897,6 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_map, n_split, zvir, cp, | |
| enddo | ||
| enddo | ||
| endif | ||
| if(flagstruct%sa3dtke_dyco) then | ||
| call d_sw(vt(isd,jsd,k), delp(isd,jsd,k), ptc(isd,jsd,k), pt(isd,jsd,k), & | ||
| u(isd,jsd,k), v(isd,jsd,k), w(isd:,jsd:,k), uc(isd,jsd,k), & | ||
|
|
@@ -2206,25 +2205,16 @@ subroutine diff3d(npx, npy, npz, nq, ua, va, w, q, & | |
| real:: dudz(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real:: dvdz(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real:: dwdz(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real:: ut(bd%isd:bd%ied,bd%jsd:bd%jed) | ||
| real:: vt(bd%isd:bd%ied,bd%jsd:bd%jed) | ||
|
|
||
| integer :: sgs_tke | ||
| real :: tke_1(bd%isd:bd%ied,bd%jsd:bd%jed) | ||
| real :: kqdedy(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real :: dkqdedydy(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real :: kqdedx(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real :: dkqdedxdx(bd%isd:bd%ied,bd%jsd:bd%jed,npz) | ||
| real :: tmp, tmp1, tmp2 | ||
|
|
||
| real :: dz | ||
|
|
||
|
|
@@ -2252,61 +2242,61 @@ subroutine diff3d(npx, npy, npz, nq, ua, va, w, q, & | |
| ! KGao: make ut and vt private as suggested by Lucas | ||
|
|
||
| !$OMP parallel do default(none) shared(npz,is,ie,js,je,ua,va,w,dx,dy,rarea, & | ||
| !$OMP dudx,dudy,dvdx,dvdy,dwdx,dwdy) & | ||
| !$OMP private(ut,vt) | ||
| do k=1,npz | ||
| !------------------------------------- | ||
| ! get du/dy and dv/dx | ||
| do j=js-1,je+1 | ||
| do i=is,ie | ||
| vt(i,j) = ua(i,j,k)*dx(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is-1,ie+1 | ||
| ut(i,j) = va(i,j,k)*dy(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dudy(i,j,k) = 0.5*rarea(i,j)*(vt(i,j+1)-vt(i,j-1)) | ||
| dvdx(i,j,k) = 0.5*rarea(i,j)*(ut(i+1,j)-ut(i-1,j)) | ||
| enddo | ||
| enddo | ||
| !------------------------------------- | ||
| ! get du/dx and dv/dy | ||
| do j=js,je | ||
| do i=is-1,ie+1 | ||
| ut(i,j) = ua(i,j,k)*dy(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js-1,je+1 | ||
| do i=is,ie | ||
| vt(i,j) = va(i,j,k)*dx(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dudx(i,j,k) = 0.5*rarea(i,j)*(ut(i+1,j)-ut(i-1,j)) | ||
| dvdy(i,j,k) = 0.5*rarea(i,j)*(vt(i,j+1)-vt(i,j-1)) | ||
| enddo | ||
| enddo | ||
| !------------------------------------- | ||
| ! get dw/dx and dw/dy | ||
| do j=js,je | ||
| do i=is-1,ie+1 | ||
| ut(i,j) = w(i,j,k)*dy(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js-1,je+1 | ||
| do i=is,ie | ||
| vt(i,j) = w(i,j,k)*dx(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dwdx(i,j,k) = 0.5*rarea(i,j)*(ut(i+1,j)-ut(i-1,j)) | ||
| dwdy(i,j,k) = 0.5*rarea(i,j)*(vt(i,j+1)-vt(i,j-1)) | ||
| enddo | ||
| enddo | ||
| enddo !z loop | ||
|
|
@@ -2316,34 +2306,55 @@ subroutine diff3d(npx, npy, npz, nq, ua, va, w, q, & | |
|
|
||
| ! KGao: use Lucas's method as in compute_dudz() | ||
| !$OMP parallel do default(none) shared(npz,is,ie,js,je,ua,va,w, & | ||
| !$OMP zh,dudz,dvdz,dwdz) & | ||
| !$OMP private(dz) | ||
| do k=2,npz | ||
| do j=js,je | ||
| do i=is,ie | ||
| dz = 0.5*(zh(i,j,k-1) - zh(i,j,k+1)) | ||
| dudz(i,j,k) = (ua(i,j,k-1)-ua(i,j,k))/dz | ||
| dvdz(i,j,k) = (va(i,j,k-1)-va(i,j,k))/dz | ||
| dwdz(i,j,k) = (w(i,j,k-1)-w(i,j,k))/dz | ||
| enddo | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dudz(i,j,1) = 0. | ||
| dvdz(i,j,1) = 0. | ||
| dwdz(i,j,1) = 0. | ||
| enddo | ||
| enddo | ||
|
|
||
| !------------------------------------- | ||
| ! get deform_1 and deform_2 based on all terms | ||
|
|
||
| !$OMP parallel do default(none) shared(npz,is,ie,js,je,deform_1,deform_2, & | ||
| !$OMP dudx,dudy,dudz,dvdx,dvdy,dvdz,dwdx,dwdy,dwdz) & | ||
| !$OMP private(tmp,tmp1,tmp2) | ||
| do k=1,npz | ||
| do j=js,je | ||
| do i=is,ie | ||
| if(k > 1) then | ||
| tmp1 = 0.5*(dwdx(i,j,k-1)+dwdx(i,j,k)) | ||
| tmp2 = 0.5*(dwdy(i,j,k-1)+dwdy(i,j,k)) | ||
| tmp = tmp1*dudz(i,j,k)+tmp2*dvdz(i,j,k) | ||
| else | ||
|
Contributor
There was a problem hiding this comment. Why are the branches for the top and bottom layers needed? There was a problem hiding this comment.
@lharris4 Actually, the deform_1 value at k=1 (npz in the CCPP 3D TKE scheme) is not used in the 3D TKE scheme, but we still assign a reasonable deform_1 value at k=1 for a safety. |
||
| tmp1 = dwdx(i,j,k) | ||
| tmp2 = dwdy(i,j,k) | ||
| tmp = tmp1*dudz(i,j,k)+tmp2*dvdz(i,j,k) | ||
| endif | ||
| deform_1(i,j,k)= 2*dwdz(i,j,k)**2+ & | ||
| dudz(i,j,k)**2+dvdz(i,j,k)**2+tmp | ||
| if(k < npz) then | ||
| tmp1 = 0.5*(dudz(i,j,k)+dudz(i,j,k+1)) | ||
| tmp2 = 0.5*(dvdz(i,j,k)+dvdz(i,j,k+1)) | ||
| tmp = tmp1*dwdx(i,j,k)+tmp2*dwdy(i,j,k) | ||
| else | ||
| tmp1 = dudz(i,j,k) | ||
| tmp2 = dvdz(i,j,k) | ||
| tmp = tmp1*dwdx(i,j,k)+tmp2*dwdy(i,j,k) | ||
| endif | ||
| deform_2(i,j,k)= & | ||
| 2*(dudx(i,j,k)**2+dvdy(i,j,k)**2)+ & | ||
| (dudy(i,j,k)+dvdx(i,j,k))**2+ & | ||
|
|
@@ -2363,87 +2374,68 @@ subroutine diff3d(npx, npy, npz, nq, ua, va, w, q, & | |
| ! KGao: make the 2d temporay arrays private - as suggested by Lucas | ||
|
|
||
| !$OMP parallel do default(none) shared(npz,is,ie,js,je,ua,va,w,q,dx,dy,rarea, & | ||
| !$OMP dku3d_e,kqdedy,dkqdedydy,kqdedx,dkqdedxdx,sgs_tke) & | ||
| !$OMP private(ut,vt,tke_1,tmp) | ||
| do k=1,npz | ||
| !------------------------------------- | ||
| do j=js-1,je+1 | ||
| do i=is-1,ie+1 | ||
| tke_1(i,j)=q(i,j,k,sgs_tke) | ||
| enddo | ||
| enddo | ||
| do j=js-1,je+1 | ||
| do i=is,ie | ||
| vt(i,j)=tke_1(i,j)*dx(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js-1,je | ||
| do i=is,ie | ||
| tmp = 0.5*(dku3d_e(i,j,k)+dku3d_e(i,j+1,k)) | ||
| kqdedy(i,j,k)=rarea(i,j)*tmp*(vt(i,j+1)-vt(i,j)) | ||
| enddo | ||
| enddo | ||
| do j=js-1,je | ||
| do i=is,ie | ||
| vt(i,j)=kqdedy(i,j,k)*dx(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dkqdedydy(i,j,k)=rarea(i,j)*(vt(i,j)-vt(i,j-1)) | ||
| enddo | ||
| enddo | ||
| !------------------------------------- | ||
| do j=js,je | ||
| do i=is-1,ie+1 | ||
| ut(i,j)=tke_1(i,j)*dy(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is-1,ie | ||
| tmp = 0.5*(dku3d_e(i,j,k)+dku3d_e(i+1,j,k)) | ||
| kqdedx(i,j,k)=rarea(i,j)*tmp*(ut(i+1,j)-ut(i,j)) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is-1,ie | ||
| ut(i,j)=kqdedx(i,j,k)*dy(i,j) | ||
| enddo | ||
| enddo | ||
| do j=js,je | ||
| do i=is,ie | ||
| dkqdedxdx(i,j,k)=rarea(i,j)*(ut(i,j)-ut(i-1,j)) | ||
| enddo | ||
| enddo | ||
| enddo ! z loop | ||
| !------------------------------------- | ||
| ! get deform_3 based on all terms | ||
|
|
||
| !$OMP parallel do default(none) shared(npz,is,ie,js,je,deform_3, & | ||
| !$OMP dkqdedxdx,dkqdedydy) | ||
| do k=1,npz | ||
| do j=js,je | ||
| do i=is,ie | ||
| deform_3(i,j,k)=dkqdedxdx(i,j,k)+dkqdedydy(i,j,k) | ||
| enddo | ||
| enddo | ||
| enddo | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check closely where
dwdx, etc. are computed and whether a full-grid-length centered difference is needed here. This will computedwdxat cell centers instead of cell interfaces, and necessitates the additional interpolation ofdwdxbelow on lines 2338--2357.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lharris4 yes, dwdx is computed at cell centers (vertically at layers) and then 2 layer vertical average of dwdx is used for deform_1 computation which is defined at the interfaces